Repository: archiva Updated Branches: refs/heads/master 01f9aad61 -> 73d92ab37
[MRM-1895] upgrade to wagon 2.8 Project: http://git-wip-us.apache.org/repos/asf/archiva/repo Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/73d92ab3 Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/73d92ab3 Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/73d92ab3 Branch: refs/heads/master Commit: 73d92ab3768036ea6cb872445e08f92b6ad25889 Parents: 01f9aad Author: Olivier Lamy <[email protected]> Authored: Wed Jul 22 21:36:48 2015 +1000 Committer: Olivier Lamy <[email protected]> Committed: Wed Jul 22 21:36:48 2015 +1000 ---------------------------------------------------------------------- .../admin/DefaultArchivaAdministration.java | 15 ++++++++------- pom.xml | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/archiva/blob/73d92ab3/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/src/main/java/org/apache/archiva/admin/repository/admin/DefaultArchivaAdministration.java ---------------------------------------------------------------------- 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 a75a88e..54d26fb 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 ); } } http://git-wip-us.apache.org/repos/asf/archiva/blob/73d92ab3/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b1a48a3..63b3432 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>
