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/19 10:37:26 UTC
svn commit: r1172517 - in /maven/maven-3/trunk: apache-maven/pom.xml
maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml pom.xml
Author: olamy
Date: Mon Sep 19 08:37:25 2011
New Revision: 1172517
URL: http://svn.apache.org/viewvc?rev=1172517&view=rev
Log:
[MNG-5175] replace wagon http lightweight with wagon http 2.0 (SNAPSHOT currently)
Modified:
maven/maven-3/trunk/apache-maven/pom.xml
maven/maven-3/trunk/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
maven/maven-3/trunk/pom.xml
Modified: maven/maven-3/trunk/apache-maven/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/apache-maven/pom.xml?rev=1172517&r1=1172516&r2=1172517&view=diff
==============================================================================
--- maven/maven-3/trunk/apache-maven/pom.xml (original)
+++ maven/maven-3/trunk/apache-maven/pom.xml Mon Sep 19 08:37:25 2011
@@ -58,7 +58,14 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
+ <artifactId>wagon-http</artifactId>
+ <classifier>shaded</classifier>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-http-shared4</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
Modified: maven/maven-3/trunk/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml?rev=1172517&r1=1172516&r2=1172517&view=diff
==============================================================================
--- maven/maven-3/trunk/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml (original)
+++ maven/maven-3/trunk/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml Mon Sep 19 08:37:25 2011
@@ -394,7 +394,7 @@ under the License.
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
+ <artifactId>wagon-http</artifactId>
<version>${wagonVersion}</version>
</dependency>
<dependency>
Modified: maven/maven-3/trunk/pom.xml
URL: http://svn.apache.org/viewvc/maven/maven-3/trunk/pom.xml?rev=1172517&r1=1172516&r2=1172517&view=diff
==============================================================================
--- maven/maven-3/trunk/pom.xml (original)
+++ maven/maven-3/trunk/pom.xml Mon Sep 19 08:37:25 2011
@@ -45,7 +45,7 @@
<plexusInterpolationVersion>1.14</plexusInterpolationVersion>
<plexusUtilsVersion>2.0.6</plexusUtilsVersion>
<sisuInjectVersion>2.1.1</sisuInjectVersion>
- <wagonVersion>1.0</wagonVersion>
+ <wagonVersion>2.0-SNAPSHOT</wagonVersion>
<securityDispatcherVersion>1.3</securityDispatcherVersion>
<cipherVersion>1.7</cipherVersion>
<modelloVersion>1.4.1</modelloVersion>
@@ -283,8 +283,9 @@
</dependency>
<dependency>
<groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-http-lightweight</artifactId>
+ <artifactId>wagon-http</artifactId>
<version>${wagonVersion}</version>
+ <classifier>shaded</classifier>
<exclusions>
<exclusion>
<groupId>commons-logging</groupId>