From: James William Dumay <jdumay@apache.org>
Date: Wed, 2 Jul 2008 01:28:43 +0000 (+0000)
Subject: MRM-840 - Wagon HTTP deadlocks under high load
X-Git-Tag: archiva-r676265~40
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9f3eadd519895f0cda08585e2b64fe4fb32570e2;p=archiva.git

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 dabad3e96..60ecdd63b 100644
--- 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 e9f0956c4..228df0fee 100644
--- 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 2a686ee07..4d0aa7093 100644
--- 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>