diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index 9b8d3276e6..cd0b55733a 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -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>
diff --git a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
index a01b7cedbd..5a6b9d9534 100644
--- a/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
+++ b/maven-core/src/test/resources/org/apache/maven/lifecycle/pom.xml
@@ -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>
diff --git a/pom.xml b/pom.xml
index e003c20440..8a9b256647 100644
--- a/pom.xml
+++ b/pom.xml
@@ -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>