Author: rafale Date: Fri Oct 10 14:43:51 2008 New Revision: 703584 URL: http://svn.apache.org/viewvc?rev=703584&view=rev Log: updated dependencies
Modified: maven/archetype/trunk/archetype-common/pom.xml maven/archetype/trunk/archetype-packaging/pom.xml maven/archetype/trunk/archetype-plugin/pom.xml maven/archetype/trunk/archetype-testing/archetype-proxy/pom.xml maven/archetype/trunk/archetype-testing/archetype-repository/pom.xml maven/archetype/trunk/pom.xml Modified: maven/archetype/trunk/archetype-common/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-common/pom.xml?rev=703584&r1=703583&r2=703584&view=diff ============================================================================== --- maven/archetype/trunk/archetype-common/pom.xml (original) +++ maven/archetype/trunk/archetype-common/pom.xml Fri Oct 10 14:43:51 2008 @@ -75,37 +75,37 @@ <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-api-container</artifactId> - <version>0.9</version> + <version>1.0-alpha-6</version> <scope>test</scope> </dependency> <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-api-util</artifactId> - <version>0.9</version> + <version>1.0-alpha-6</version> <scope>test</scope> </dependency> <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-api-generic</artifactId> - <version>0.9</version> + <version>1.0-alpha-6</version> <scope>test</scope> </dependency> <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-api-module</artifactId> - <version>0.9</version> + <version>1.0-alpha-6</version> <scope>test</scope> </dependency> <dependency> <groupId>org.codehaus.cargo</groupId> <artifactId>cargo-core-container-jetty</artifactId> - <version>0.9</version> + <version>1.0-alpha-6</version> <scope>test</scope> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> - <version>6.1.4</version> + <version>6.1.11</version> <scope>test</scope> </dependency> <dependency> @@ -115,7 +115,7 @@ <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http</artifactId> - <version>1.0-beta-2</version> + <version>1.0-beta-2</version><!-- with 1.0-beta-4 some tests fail --> <scope>test</scope> </dependency> <dependency> @@ -145,7 +145,7 @@ <plugin> <groupId>org.codehaus.modello</groupId> <artifactId>modello-maven-plugin</artifactId> - <version>1.0-alpha-14</version> + <version>1.0-alpha-21</version> <executions> <execution> <id>archetype-common</id> Modified: maven/archetype/trunk/archetype-packaging/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-packaging/pom.xml?rev=703584&r1=703583&r2=703584&view=diff ============================================================================== --- maven/archetype/trunk/archetype-packaging/pom.xml (original) +++ maven/archetype/trunk/archetype-packaging/pom.xml Fri Oct 10 14:43:51 2008 @@ -16,7 +16,6 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.1</version> <scope>test</scope> </dependency> </dependencies> Modified: maven/archetype/trunk/archetype-plugin/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-plugin/pom.xml?rev=703584&r1=703583&r2=703584&view=diff ============================================================================== --- maven/archetype/trunk/archetype-plugin/pom.xml (original) +++ maven/archetype/trunk/archetype-plugin/pom.xml Fri Oct 10 14:43:51 2008 @@ -49,23 +49,23 @@ <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-invoker</artifactId> - <version>2.0.6</version> + <version>2.0.10</version> </dependency> <dependency> <groupId>easymock</groupId> <artifactId>easymock</artifactId> - <version>1.2_Java1.3</version> + <version>1.2_Java1.3</version><!-- with 2.0 compilation failure --> <scope>test</scope> </dependency> <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2</version> + <version>3.2.1</version> </dependency> </dependencies> <properties> - <pluginPluginVersion>2.4.1</pluginPluginVersion> + <pluginPluginVersion>2.4.3</pluginPluginVersion> </properties> <build> Modified: maven/archetype/trunk/archetype-testing/archetype-proxy/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-testing/archetype-proxy/pom.xml?rev=703584&r1=703583&r2=703584&view=diff ============================================================================== --- maven/archetype/trunk/archetype-testing/archetype-proxy/pom.xml (original) +++ maven/archetype/trunk/archetype-testing/archetype-proxy/pom.xml Fri Oct 10 14:43:51 2008 @@ -22,13 +22,13 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.4</version> + <version>2.5</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>6.1.4</version> + <version>6.1.11</version> <scope>compile</scope> </dependency> </dependencies> Modified: maven/archetype/trunk/archetype-testing/archetype-repository/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/archetype-testing/archetype-repository/pom.xml?rev=703584&r1=703583&r2=703584&view=diff ============================================================================== --- maven/archetype/trunk/archetype-testing/archetype-repository/pom.xml (original) +++ maven/archetype/trunk/archetype-testing/archetype-repository/pom.xml Fri Oct 10 14:43:51 2008 @@ -22,13 +22,13 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.4</version> + <version>2.5</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-util</artifactId> - <version>6.1.4</version> + <version>6.1.11</version> <scope>compile</scope> </dependency> </dependencies> Modified: maven/archetype/trunk/pom.xml URL: http://svn.apache.org/viewvc/maven/archetype/trunk/pom.xml?rev=703584&r1=703583&r2=703584&view=diff ============================================================================== --- maven/archetype/trunk/pom.xml (original) +++ maven/archetype/trunk/pom.xml Fri Oct 10 14:43:51 2008 @@ -59,7 +59,7 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-utils</artifactId> - <version>1.4.6</version> + <version>1.5.6</version> </dependency> <dependency> <groupId>org.codehaus.plexus</groupId> @@ -69,12 +69,12 @@ <dependency> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-velocity</artifactId> - <version>1.1.3</version> + <version>1.1.3</version><!-- with 1.1.4 1.1.5 1.1.6 1.1.7 tests fail --> </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> - <version>1.3.1</version> + <version>1.4</version> </dependency> <dependency> <groupId>dom4j</groupId> @@ -99,24 +99,24 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> - <version>3.2</version> + <version>3.2.1</version> </dependency> <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>3.8.2</version> + <version>4.4</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.maven.shared</groupId> <artifactId>maven-plugin-testing-harness</artifactId> - <version>1.0-beta-1</version> + <version>1.1</version> <scope>test</scope> </dependency> <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-file</artifactId> - <version>1.0-alpha-6</version> + <version>1.0-beta-2</version><!-- with 1.0-beta-3 1.0-beta-4 all tests fail --> <scope>test</scope> </dependency> </dependencies> @@ -129,7 +129,7 @@ <activeByDefault>true</activeByDefault> </activation> <properties> - <mavenVersion>2.0.8</mavenVersion> + <mavenVersion>2.0.8</mavenVersion><!-- with 2.0.9 proxy test fails--> </properties> <dependencyManagement> <dependencies> @@ -231,7 +231,7 @@ </plugin> <plugin> <artifactId>maven-surefire-plugin</artifactId> - <version>2.3</version> + <version>2.3</version><!--With 2.4 2.4.1 2.4.2 2.4.3 test with proxy fails--> </plugin> <plugin> <artifactId>maven-clean-plugin</artifactId> @@ -243,11 +243,11 @@ </plugin> <plugin> <artifactId>maven-javadoc-plugin</artifactId> - <version>2.3</version> + <version>2.5</version> </plugin> <plugin> <artifactId>maven-deploy-plugin</artifactId> - <version>2.3</version> + <version>2.4</version> </plugin> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -259,11 +259,11 @@ </plugin> <plugin> <artifactId>maven-site-plugin</artifactId> - <version>2.0-beta-6</version> + <version>2.0-beta-7</version> </plugin> <plugin> <artifactId>maven-source-plugin</artifactId> - <version>2.0.3</version> + <version>2.0.4</version> </plugin> <plugin> <artifactId>maven-resources-plugin</artifactId> @@ -275,7 +275,7 @@ </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> - <version>1.1</version> + <version>1.2</version> </plugin> <plugin> <artifactId>maven-dependency-plugin</artifactId> @@ -283,7 +283,11 @@ </plugin> <plugin> <artifactId>maven-plugin-plugin</artifactId> - <version>2.4.1</version> + <version>2.4.3</version> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <version>2.1-alpha-2</version> </plugin> <plugin> <groupId>org.mortbay.jetty</groupId> @@ -303,7 +307,7 @@ <plugin> <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-maven-plugin</artifactId> - <version>1.3.5</version> + <version>1.3.8</version> <executions> <execution> <goals>