aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames William Dumay <jdumay@apache.org>2008-07-02 01:28:43 +0000
committerJames William Dumay <jdumay@apache.org>2008-07-02 01:28:43 +0000
commit9f3eadd519895f0cda08585e2b64fe4fb32570e2 (patch)
tree4fefd513361cb22a3ca2b05145e1d5d7faf831ae
parentb4077906645e47370f8b13c8453bcdb34001a15a (diff)
downloadarchiva-9f3eadd519895f0cda08585e2b64fe4fb32570e2.tar.gz
archiva-9f3eadd519895f0cda08585e2b64fe4fb32570e2.zip
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
-rw-r--r--archiva-modules/archiva-web/archiva-webapp/pom.xml2
-rw-r--r--archiva-modules/archiva-web/archiva-webdav/pom.xml2
-rw-r--r--pom.xml8
3 files changed, 3 insertions, 9 deletions
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>