From 73d92ab3768036ea6cb872445e08f92b6ad25889 Mon Sep 17 00:00:00 2001
From: Olivier Lamy <olamy@apache.org>
Date: Wed, 22 Jul 2015 21:36:48 +1000
Subject: [PATCH] [MRM-1895] upgrade to wagon 2.8

---
 .../admin/DefaultArchivaAdministration.java       | 15 ++++++++-------
 pom.xml                                           |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
index a75a88e11..54d26fb5e 100644
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java
@@ -33,6 +33,7 @@ import org.apache.archiva.configuration.WebappConfiguration;
 import org.apache.archiva.metadata.model.facets.AuditEvent;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.impl.conn.PoolingClientConnectionManager;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.maven.wagon.providers.http.HttpWagon;
 import org.springframework.stereotype.Service;
 
@@ -51,7 +52,7 @@ public class DefaultArchivaAdministration
     implements ArchivaAdministration
 {
 
-    private PoolingClientConnectionManager poolingClientConnectionManager;
+    private PoolingHttpClientConnectionManager poolingClientConnectionManager;
 
     @PostConstruct
     public void initialize()
@@ -413,20 +414,20 @@ public class DefaultArchivaAdministration
         if ( networkConfiguration == null )
         {
             // back to default values
-            HttpWagon.setUseClientManagerPooled( true );
-            poolingClientConnectionManager = new PoolingClientConnectionManager();
+            HttpWagon.setPersistentPool( true );
+            poolingClientConnectionManager = new PoolingHttpClientConnectionManager();
             poolingClientConnectionManager.setDefaultMaxPerRoute( 30 );
             poolingClientConnectionManager.setMaxTotal( 30 );
-            HttpWagon.setConnectionManagerPooled( poolingClientConnectionManager );
+            HttpWagon.setPoolingHttpClientConnectionManager( poolingClientConnectionManager );
 
         }
         else
         {
-            HttpWagon.setUseClientManagerPooled( networkConfiguration.isUsePooling() );
-            poolingClientConnectionManager = new PoolingClientConnectionManager();
+            HttpWagon.setPersistentPool( networkConfiguration.isUsePooling() );
+            poolingClientConnectionManager = new PoolingHttpClientConnectionManager();
             poolingClientConnectionManager.setDefaultMaxPerRoute( networkConfiguration.getMaxTotalPerHost() );
             poolingClientConnectionManager.setMaxTotal( networkConfiguration.getMaxTotal() );
-            HttpWagon.setConnectionManagerPooled( poolingClientConnectionManager );
+            HttpWagon.setPoolingHttpClientConnectionManager( poolingClientConnectionManager );
         }
     }
 
diff --git a/pom.xml b/pom.xml
index b1a48a330..63b3432ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -63,7 +63,7 @@
 
     <maven-model-converter.version>2.1</maven-model-converter.version>
     <maven.indexer.version>5.1.1</maven.indexer.version>
-    <wagon.version>2.5</wagon.version>
+    <wagon.version>2.9</wagon.version>
     <redback.version>2.4-SNAPSHOT</redback.version>
     <redback.cache.version>2.2</redback.cache.version>
     <redback.quartz.version>2.1</redback.quartz.version>
-- 
2.39.5