Author: vsiveton Date: Sat May 9 11:33:09 2009 New Revision: 773204 URL: http://svn.apache.org/viewvc?rev=773204&view=rev Log: o ordering dependencies
Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml maven/doxia/doxia-sitetools/trunk/pom.xml Modified: maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml?rev=773204&r1=773203&r2=773204&view=diff ============================================================================== --- maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-doc-renderer/pom.xml Sat May 9 11:33:09 2009 @@ -48,6 +48,7 @@ </developers> <dependencies> + <!-- doxia --> <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-core</artifactId> @@ -61,15 +62,6 @@ <artifactId>doxia-sink-api</artifactId> </dependency> <dependency> - <groupId>com.lowagie</groupId> - <artifactId>itext</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </dependency> - <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-itext</artifactId> <version>${doxiaVersion}</version> @@ -79,15 +71,6 @@ <artifactId>doxia-module-fo</artifactId> <version>${doxiaVersion}</version> </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.0</version> - </dependency> <!-- The modules are not in doxia core anymore so you have to state a dependency so that the component descriptor gets picked up. --> <dependency> @@ -106,6 +89,28 @@ <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-module-xhtml</artifactId> </dependency> + + <!-- plexus --> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> + + <!-- misc --> + <dependency> + <groupId>com.lowagie</groupId> + <artifactId>itext</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.0</version> + </dependency> <dependency> <groupId>xml-apis</groupId> <artifactId>xml-apis</artifactId> Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml?rev=773204&r1=773203&r2=773204&view=diff ============================================================================== --- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml (original) +++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml Sat May 9 11:33:09 2009 @@ -46,6 +46,7 @@ </contributors> <dependencies> + <!-- doxia --> <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-core</artifactId> @@ -59,6 +60,37 @@ <artifactId>doxia-sink-api</artifactId> </dependency> <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-decoration-model</artifactId> + </dependency> + <!-- The modules are not in doxia core anymore so you have to state a dependency so that + the component descriptor gets picked up. --> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-apt</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-docbook-simple</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-xdoc</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-xhtml</artifactId> + </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-fml</artifactId> + </dependency> + + <!-- plexus --> + <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-i18n</artifactId> </dependency> @@ -86,15 +118,17 @@ </exclusions> </dependency> <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> + + <!-- misc --> + <dependency> <groupId>org.apache.velocity</groupId> <artifactId>velocity</artifactId> <version>1.5</version> </dependency> <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-decoration-model</artifactId> - </dependency> - <dependency> <groupId>htmlunit</groupId> <artifactId>htmlunit</artifactId> <version>1.13</version> @@ -105,34 +139,5 @@ <artifactId>commons-collections</artifactId> <version>3.2</version> </dependency> - <!-- The modules are not in doxia core anymore so you have to state a dependency so that - the component descriptor gets picked up. --> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-module-apt</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-module-docbook-simple</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-module-xdoc</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-module-xhtml</artifactId> - </dependency> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-module-fml</artifactId> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> </dependencies> </project> Modified: maven/doxia/doxia-sitetools/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/pom.xml?rev=773204&r1=773203&r2=773204&view=diff ============================================================================== --- maven/doxia/doxia-sitetools/trunk/pom.xml (original) +++ maven/doxia/doxia-sitetools/trunk/pom.xml Sat May 9 11:33:09 2009 @@ -120,6 +120,7 @@ <dependencyManagement> <dependencies> + <!-- doxia --> <dependency> <groupId>org.apache.maven.doxia</groupId> <artifactId>doxia-logging-api</artifactId>