You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2011/09/29 22:34:16 UTC
svn commit: r1177422 - in /maven/core-integration-testing/trunk:
core-it-suite/src/test/java/org/apache/maven/it/
core-it-suite/src/test/resources/bootstrap/group-6/
core-it-suite/src/test/resources/mng-2305/
core-it-suite/src/test/resources/mng-3599/ ...
Author: olamy
Date: Thu Sep 29 20:34:15 2011
New Revision: 1177422
URL: http://svn.apache.org/viewvc?rev=1177422&view=rev
Log:
upgrade to last wagon version in some places
Modified:
maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2305/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3599/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-project/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/pom.xml
maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4360/jackrabbit/pom.xml
maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java?rev=1177422&r1=1177421&r2=1177422&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/java/org/apache/maven/it/MavenITmng2305MultipleProxiesTest.java Thu Sep 29 20:34:15 2011
@@ -97,7 +97,8 @@ public class MavenITmng2305MultipleProxi
verifier.setSystemProperty( "javax.net.ssl.trustStore", storePath );
verifier.setSystemProperty( "javax.net.ssl.trustStorePassword", storePwd );
// disable concurrent downloading as not all wagons (e.g. wagon-lightweight-http) are thread-safe regarding proxy settings
- verifier.setSystemProperty( "maven.artifact.threads", "1" );
+ // olamy restore concurrent as wagon-http is now thread safe regarding and add an extension in the it pom
+ verifier.setSystemProperty( "maven.artifact.threads", "3" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml?rev=1177422&r1=1177421&r2=1177422&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/bootstrap/group-6/pom.xml Thu Sep 29 20:34:15 2011
@@ -42,7 +42,7 @@ under the License.
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>1.0-beta-3</version>
+ <version>2.0</version>
<scope>runtime</scope>
</dependency>
<dependency>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2305/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2305/pom.xml?rev=1177422&r1=1177421&r2=1177422&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2305/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-2305/pom.xml Thu Sep 29 20:34:15 2011
@@ -32,6 +32,16 @@ under the License.
this checks HTTPS tunneling over a web proxy.
</description>
+ <build>
+ <extensions>
+ <extension>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http</artifactId>
+ <version>2.0</version>
+ </extension>
+ </extensions>
+ </build>
+
<dependencies>
<dependency>
<groupId>org.apache.maven.its.mng2305</groupId>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3599/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3599/pom.xml?rev=1177422&r1=1177421&r2=1177422&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3599/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3599/pom.xml Thu Sep 29 20:34:15 2011
@@ -15,7 +15,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>1.0-beta-3</version>
+ <version>2.0</version>
</extension>
</extensions>
</build>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-project/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-project/pom.xml?rev=1177422&r1=1177421&r2=1177422&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-project/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-3652/test-project/pom.xml Thu Sep 29 20:34:15 2011
@@ -25,7 +25,7 @@
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>1.0-beta-3</version>
+ <version>2.0</version>
</extension>
</extensions>
</build>
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/pom.xml?rev=1177422&r1=1177421&r2=1177422&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4207/pom.xml Thu Sep 29 20:34:15 2011
@@ -38,7 +38,7 @@ under the License.
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>1.0-beta-5</version>
+ <version>2.0</version>
</extension>
<!--
FWIW, adding the extension below would make the test pass but it has to work with the bundled wagon, too.
Modified: maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4360/jackrabbit/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4360/jackrabbit/pom.xml?rev=1177422&r1=1177421&r2=1177422&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4360/jackrabbit/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/src/test/resources/mng-4360/jackrabbit/pom.xml Thu Sep 29 20:34:15 2011
@@ -47,7 +47,7 @@ under the License.
<extension>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-webdav-jackrabbit</artifactId>
- <version>1.0-beta-3</version>
+ <version>2.0</version>
</extension>
</extensions>
<plugins>
Modified: maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/pom.xml
URL: http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/pom.xml?rev=1177422&r1=1177421&r2=1177422&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-support/core-it-plugins/maven-it-plugin-uses-wagon/pom.xml Thu Sep 29 20:34:15 2011
@@ -58,12 +58,12 @@ under the License.
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-ssh</artifactId>
- <version>1.0-beta-2</version>
+ <version>2.0</version>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
<artifactId>wagon-file</artifactId>
- <version>1.0-beta-2</version>
+ <version>2.0</version>
</dependency>
</dependencies>
</project>