[MRM-1503] use wagon-http instead of wagon-http-lightweight (as it change proxy network system properties)

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1160694 13f79535-47bb-0310-9956-ffa450edef68

archiva-modules/archiva-base/archiva-artifact-converter/pom.xml

@@ -44,6 +44,14 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact-manager</artifactId>
+      <!-- olamy : weird enforcer doesn't have it but failed IMHO issue in enforcer plugin !!
+      <exclusions>
+        <exclusion>
+          <groupId>org.apache.maven.wagon</groupId>
+          <artifactId>wagon-provider-api</artifactId>
+        </exclusion>
+      </exclusions>
+      -->
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>

archiva-modules/archiva-base/archiva-proxy-common/pom.xml

@@ -9,9 +9,6 @@
   </parent>
   <artifactId>archiva-proxy-common</artifactId>
   <name>Archiva Base :: Proxy Common</name>
-  <properties>
-    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-  </properties>
   <dependencies>
     <dependency>
       <groupId>org.apache.archiva</groupId>
@@ -28,8 +25,14 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
+      <artifactId>wagon-http</artifactId>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>

archiva-modules/archiva-base/archiva-proxy/pom.xml

@@ -109,9 +109,15 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
+      <artifactId>wagon-http</artifactId>
       <version>${wagon.version}</version>
       <scope>test</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>commons-logging</groupId>
+          <artifactId>commons-logging</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

archiva-modules/archiva-web/archiva-webapp/pom.xml

@@ -348,7 +348,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
+      <artifactId>wagon-http</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>

archiva-modules/archiva-web/archiva-webdav/pom.xml

@@ -134,7 +134,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
+      <artifactId>wagon-http</artifactId>
       <scope>test</scope>
       <exclusions>
         <!-- This triggers httpunit to use it instead, but it doesn't work -->

pom.xml

@@ -996,12 +996,12 @@
       </dependency>
       <dependency>
         <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-http-lightweight</artifactId>
+        <artifactId>wagon-http</artifactId>
         <version>${wagon.version}</version>
         <exclusions>
           <exclusion>
-            <groupId>nekohtml</groupId>
+            <groupId>commons-logging</groupId>
-            <artifactId>xercesMinimal</artifactId>
+            <artifactId>commons-logging</artifactId>
           </exclusion>
         </exclusions>
       </dependency>
@@ -1331,6 +1331,7 @@
                     <exclude>org.codehaus.plexus.registry:plexus-registry-api</exclude>
                     <exclude>org.codehaus.plexus.registry:plexus-registry-commons</exclude>
                     <exclude>>org.codehaus.plexus:plexus-taskqueue</exclude>
+                    <exclude>org.apache.maven.wagon:wagon-http-lightweight</exclude>
                   </excludes>
                 </bannedDependencies>
               </rules>