Author: olamy
Date: Thu Sep 29 22:06:03 2011
New Revision: 1177447
URL: http://svn.apache.org/viewvc?rev=1177447&view=rev
Log:
fix it with an empty repo: force download locally of dependencies use in it
Modified:
maven/core-integration-testing/trunk/core-it-suite/pom.xml
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/mng-2305/pom.xml
Modified: maven/core-integration-testing/trunk/core-it-suite/pom.xml
URL:
http://svn.apache.org/viewvc/maven/core-integration-testing/trunk/core-it-suite/pom.xml?rev=1177447&r1=1177446&r2=1177447&view=diff
==============================================================================
--- maven/core-integration-testing/trunk/core-it-suite/pom.xml (original)
+++ maven/core-integration-testing/trunk/core-it-suite/pom.xml Thu Sep 29
22:06:03 2011
@@ -181,6 +181,21 @@ under the License.
</plugin>
</plugins>
</build>
+ <dependencies>
+ <!-- not really used but will force download in the local repo used -->
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-webdav-jackrabbit</artifactId>
+ <version>2.0</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.6.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
</profile>
<profile>
<id>maven-repo-local</id>
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=1177447&r1=1177446&r2=1177447&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 22:06:03 2011
@@ -97,8 +97,7 @@ 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
- // 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.setSystemProperty( "maven.artifact.threads", "1" );
verifier.executeGoal( "validate" );
verifier.verifyErrorFreeLog();
verifier.resetStreams();
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=1177447&r1=1177446&r2=1177447&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 22:06:03 2011
@@ -47,13 +47,6 @@ under the License.
</dependencies>
<build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http</artifactId>
- <version>2.0</version>
- </extension>
- </extensions>
<plugins>
<plugin>
<groupId>org.apache.maven.its.plugins</groupId>
