You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by ol...@apache.org on 2015/01/29 11:27:15 UTC
[1/2] archiva git commit: use spring 4.1.4
Repository: archiva
Updated Branches:
refs/heads/master 623a5f450 -> 1040ab6f7
use spring 4.1.4
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/1d2408e1
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/1d2408e1
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/1d2408e1
Branch: refs/heads/master
Commit: 1d2408e1fd088d3fbf9e71a3784077f86b89aa0b
Parents: 623a5f4
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Jan 29 16:47:30 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Jan 29 16:47:30 2015 +1100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/1d2408e1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 2b94fea..60ba74c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
<slf4j.version>1.7.7</slf4j.version>
<log4j.version>2.1</log4j.version>
- <spring.version>4.1.2.RELEASE</spring.version>
+ <spring.version>4.1.4.RELEASE</spring.version>
<javax.jcr.version>2.0</javax.jcr.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
[2/2] archiva git commit: formatting
Posted by ol...@apache.org.
formatting
Project: http://git-wip-us.apache.org/repos/asf/archiva/repo
Commit: http://git-wip-us.apache.org/repos/asf/archiva/commit/1040ab6f
Tree: http://git-wip-us.apache.org/repos/asf/archiva/tree/1040ab6f
Diff: http://git-wip-us.apache.org/repos/asf/archiva/diff/1040ab6f
Branch: refs/heads/master
Commit: 1040ab6f74be7824731912ecae1eec1de495ae19
Parents: 1d2408e
Author: Olivier Lamy <ol...@apache.org>
Authored: Thu Jan 29 16:47:38 2015 +1100
Committer: Olivier Lamy <ol...@apache.org>
Committed: Thu Jan 29 16:47:38 2015 +1100
----------------------------------------------------------------------
.../DefaultRemoteRepositoriesService.java | 21 +++++++-------------
1 file changed, 7 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/archiva/blob/1040ab6f/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
----------------------------------------------------------------------
diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
index 92508bf..64b8043 100644
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultRemoteRepositoriesService.java
@@ -25,26 +25,20 @@ import org.apache.archiva.admin.model.beans.RemoteRepository;
import org.apache.archiva.admin.model.networkproxy.NetworkProxyAdmin;
import org.apache.archiva.admin.model.remote.RemoteRepositoryAdmin;
import org.apache.archiva.proxy.common.WagonFactory;
-import org.apache.archiva.proxy.common.WagonFactoryException;
import org.apache.archiva.proxy.common.WagonFactoryRequest;
import org.apache.archiva.rest.api.services.ArchivaRestServiceException;
import org.apache.archiva.rest.api.services.RemoteRepositoriesService;
import org.apache.commons.lang.StringUtils;
-import org.apache.maven.wagon.ResourceDoesNotExistException;
-import org.apache.maven.wagon.StreamWagon;
import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.Wagon;
-import org.apache.maven.wagon.authorization.AuthorizationException;
import org.apache.maven.wagon.providers.http.AbstractHttpClientWagon;
import org.apache.maven.wagon.providers.http.HttpConfiguration;
import org.apache.maven.wagon.providers.http.HttpMethodConfiguration;
-import org.apache.maven.wagon.providers.http.HttpWagon;
import org.apache.maven.wagon.repository.Repository;
import org.springframework.stereotype.Service;
import javax.inject.Inject;
import javax.ws.rs.core.Response;
-import java.net.MalformedURLException;
import java.net.URL;
import java.util.Collections;
import java.util.List;
@@ -172,9 +166,9 @@ public class DefaultRemoteRepositoriesService
String wagonProtocol = new URL( remoteRepository.getUrl() ).getProtocol();
- final Wagon wagon = wagonFactory.getWagon(
- new WagonFactoryRequest( wagonProtocol, remoteRepository.getExtraHeaders() ).networkProxy(
- networkProxy ) );
+ final Wagon wagon =
+ wagonFactory.getWagon( new WagonFactoryRequest( wagonProtocol, remoteRepository.getExtraHeaders() ) //
+ .networkProxy( networkProxy ) );
// hardcoded value as it's a check of the remote repo connectivity
wagon.setReadTimeout( 4000 );
@@ -182,11 +176,10 @@ public class DefaultRemoteRepositoriesService
if ( wagon instanceof AbstractHttpClientWagon )
{
- HttpConfiguration httpConfiguration = new HttpConfiguration();
- HttpMethodConfiguration httpMethodConfiguration = new HttpMethodConfiguration();
- httpMethodConfiguration.setUsePreemptive( true );
- httpMethodConfiguration.setReadTimeout( 4000 );
- httpConfiguration.setGet( httpMethodConfiguration );
+ HttpMethodConfiguration httpMethodConfiguration = new HttpMethodConfiguration() //
+ .setUsePreemptive( true ) //
+ .setReadTimeout( 4000 );
+ HttpConfiguration httpConfiguration = new HttpConfiguration().setGet( httpMethodConfiguration );
AbstractHttpClientWagon.class.cast( wagon ).setHttpConfiguration( httpConfiguration );
}