Author: jdumay
Date: Tue Jul  1 18:28:43 2008
New Revision: 673257

URL: http://svn.apache.org/viewvc?rev=673257&view=rev
Log:
MRM-840 - Wagon HTTP deadlocks under high load

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


Modified:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
    archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
    archiva/trunk/pom.xml

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml?rev=673257&r1=673256&r2=673257&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp/pom.xml Tue Jul  1 
18:28:43 2008
@@ -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>

Modified: archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml?rev=673257&r1=673256&r2=673257&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webdav/pom.xml Tue Jul  1 
18:28:43 2008
@@ -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 -->

Modified: archiva/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/archiva/trunk/pom.xml?rev=673257&r1=673256&r2=673257&view=diff
==============================================================================
--- archiva/trunk/pom.xml (original)
+++ archiva/trunk/pom.xml Tue Jul  1 18:28:43 2008
@@ -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>


Reply via email to