MRM-840 - Wagon HTTP deadlocks under high load

* Reverted back to using wagon-http-lightweight from commons-http based wagon-http

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

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index dabad3e9682bcc979c7bfcbc42b0fb9533c18fe4..60ecdd63b802fc0fa77a9d7256ca580e0ffecc4e 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -216,7 +216,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http</artifactId>
+      <artifactId>wagon-http-lightweight</artifactId>
       <scope>runtime</scope>
     </dependency>
     <dependency>

diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index e9f0956c4ea5c177a4c6661de5be08d2f3e0c914..228df0fee49758d9d6fbd2832f075d7ce53ed65c 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -115,7 +115,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http</artifactId>
+      <artifactId>wagon-http-lightweight</artifactId>
       <scope>test</scope>
       <exclusions>
         <!-- This triggers httpunit to use it instead, but it doesn't work -->

diff --git a/pom.xml b/pom.xml
index 2a686ee0714fb1e1be73460a2856f8537e2f3a75..4d0aa7093c6267ca8309499b3f933160d4904ee5 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -541,12 +541,6 @@
         <groupId>org.apache.maven.shared</groupId>
         <artifactId>maven-app-configuration-web</artifactId>
         <version>1.0</version>
-        <exclusions>
-          <exclusion>
-            <groupId>org.apache.maven.wagon</groupId>
-            <artifactId>wagon-http-lightweight</artifactId>
-          </exclusion>
-        </exclusions>          
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -855,7 +849,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-http</artifactId>
+        <artifactId>wagon-http-lightweight</artifactId>
         <version>${wagon.version}</version>
       </dependency>
       <dependency>