Author: chatellier Date: 2009-04-09 13:47:02 +0000 (Thu, 09 Apr 2009) New Revision: 292 Added: doxia-module-jrst/trunk/src/site/apt/ doxia-module-jrst/trunk/src/site/apt/devel.apt doxia-module-jrst/trunk/src/site/apt/index.apt Removed: doxia-module-jrst/trunk/src/site/apt/devel.rst doxia-module-jrst/trunk/src/site/apt/index.rst doxia-module-jrst/trunk/src/site/rst/ Modified: doxia-module-jrst/trunk/pom.xml Log: Move site to apt to remove cycle. Version move to 1.0.x (for doxia 1.0) Modified: doxia-module-jrst/trunk/pom.xml =================================================================== --- doxia-module-jrst/trunk/pom.xml 2009-04-09 12:36:21 UTC (rev 291) +++ doxia-module-jrst/trunk/pom.xml 2009-04-09 13:47:02 UTC (rev 292) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -15,13 +15,13 @@ </parent> <artifactId>doxia-module-jrst</artifactId> - <version>0.8.5-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version> <dependencies> <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-xdoc</artifactId> - <version>1.0</version> + <version>${doxia.version}</version> </dependency> <!-- There is a pb with xalan --> <dependency> @@ -40,7 +40,7 @@ <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-core</artifactId> <type>test-jar</type> - <version>1.0</version> + <version>${doxia.version}</version> <scope>test</scope> </dependency> </dependencies> @@ -61,6 +61,7 @@ <properties> <labs.id>54</labs.id> <labs.project>jrst</labs.project> + <doxia.version>1.0</doxia.version> </properties> <developers> @@ -101,21 +102,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <!-- Fix conf in super pom --> - <configuration> - <siteDirectory>src/site</siteDirectory> - </configuration> - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>0.8.5-SNAPSHOT</version> - </dependency> - </dependencies> - </plugin> </plugins> </build> Copied: doxia-module-jrst/trunk/src/site/apt (from rev 289, doxia-module-jrst/trunk/src/site/rst) Copied: doxia-module-jrst/trunk/src/site/apt/devel.apt (from rev 289, doxia-module-jrst/trunk/src/site/rst/devel.rst) =================================================================== --- doxia-module-jrst/trunk/src/site/apt/devel.apt (rev 0) +++ doxia-module-jrst/trunk/src/site/apt/devel.apt 2009-04-09 13:47:02 UTC (rev 292) @@ -0,0 +1,10 @@ + ------------- + Documentation + ------------- + +Documentation + + JRst doxia module, is inherited from {{{http://maven.apache.org/doxia/doxia-1.0.x/doxia-modules/doxia-module-xdoc/index.html}doxia-module-xdoc}}. + + It just intercept xdoc parser call, transform RST into xdoc, and + then send generated xdoc to XDoc parser. \ No newline at end of file Deleted: doxia-module-jrst/trunk/src/site/apt/devel.rst =================================================================== --- doxia-module-jrst/trunk/src/site/rst/devel.rst 2009-03-03 16:25:43 UTC (rev 289) +++ doxia-module-jrst/trunk/src/site/apt/devel.rst 2009-04-09 13:47:02 UTC (rev 292) @@ -1,9 +0,0 @@ -Documentation -============= - -JRst doxia module, is inherited from `doxia-module-xdoc`_. - -It just intercept xdoc parser call, transform RST into xdoc, and -then send generated xdoc to XDoc parser. - -.. _doxia-module-xdoc: http://maven.apache.org/doxia/doxia-1.0.x/doxia-modules/doxia-module-xdoc/in... \ No newline at end of file Copied: doxia-module-jrst/trunk/src/site/apt/index.apt (from rev 289, doxia-module-jrst/trunk/src/site/rst/index.rst) =================================================================== --- doxia-module-jrst/trunk/src/site/apt/index.apt (rev 0) +++ doxia-module-jrst/trunk/src/site/apt/index.apt 2009-04-09 13:47:02 UTC (rev 292) @@ -0,0 +1,27 @@ + ----------------- + Doxia Module JRst + ----------------- + +Configuration + +-------------------------------------------------- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-site-plugin</artifactId> + <version>2.0</version> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>1.0.0</version> + </dependency> + </dependencies> + </plugin> +-------------------------------------------------- + + That it ! Then run "mvn site". + + +Warning + + This version only works with doxia-1.0.x (provided by maven-site-plugin-2.0). \ No newline at end of file Deleted: doxia-module-jrst/trunk/src/site/apt/index.rst =================================================================== --- doxia-module-jrst/trunk/src/site/rst/index.rst 2009-03-03 16:25:43 UTC (rev 289) +++ doxia-module-jrst/trunk/src/site/apt/index.rst 2009-04-09 13:47:02 UTC (rev 292) @@ -1,27 +0,0 @@ -Doxia Module JRst -================= - -Configuration -------------- - -:: - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-site-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${doxia-module-jrst.version}</version> - </dependency> - </dependencies> - </plugin> - -That it ! Then run "mvn site". - - -Links ------ - - * http://docutils.sourceforge.net/ \ No newline at end of file