You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2015/04/02 15:39:47 UTC
maven git commit: MNG-5797: Check to see if the user agent header is
set before trying to set it again
Repository: maven
Updated Branches:
refs/heads/master 56e6db123 -> da98af988
MNG-5797: Check to see if the user agent header is set before trying to set it again
Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/da98af98
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/da98af98
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/da98af98
Branch: refs/heads/master
Commit: da98af988d373dbf82745530ceb2caaa1197dbc4
Parents: 56e6db1
Author: Jason van Zyl <ja...@tesla.io>
Authored: Thu Apr 2 09:39:02 2015 -0400
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Thu Apr 2 09:39:02 2015 -0400
----------------------------------------------------------------------
.../repository/legacy/DefaultWagonManager.java | 44 +++++++++++++-------
1 file changed, 29 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven/blob/da98af98/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
----------------------------------------------------------------------
diff --git a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
index 78898a9..7f91d53 100644
--- a/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
+++ b/maven-compat/src/main/java/org/apache/maven/repository/legacy/DefaultWagonManager.java
@@ -84,6 +84,7 @@ public class DefaultWagonManager
//
// Retriever
//
+ @Override
public void getArtifact( Artifact artifact, ArtifactRepository repository, TransferListener downloadMonitor,
boolean force )
throws TransferFailedException, ResourceDoesNotExistException
@@ -148,6 +149,7 @@ public class DefaultWagonManager
}
}
+ @Override
public void getArtifact( Artifact artifact, List<ArtifactRepository> remoteRepositories,
TransferListener downloadMonitor, boolean force )
throws TransferFailedException, ResourceDoesNotExistException
@@ -206,6 +208,7 @@ public class DefaultWagonManager
}
}
+ @Override
public void getArtifactMetadata( ArtifactMetadata metadata, ArtifactRepository repository, File destination,
String checksumPolicy )
throws TransferFailedException, ResourceDoesNotExistException
@@ -215,6 +218,7 @@ public class DefaultWagonManager
getRemoteFile( repository, destination, remotePath, null, checksumPolicy, true );
}
+ @Override
public void getArtifactMetadataFromDeploymentRepository( ArtifactMetadata metadata, ArtifactRepository repository,
File destination, String checksumPolicy )
throws TransferFailedException, ResourceDoesNotExistException
@@ -239,22 +243,26 @@ public class DefaultWagonManager
// See org.eclipse.aether.connector.wagon.WagonRepositoryConnector.connectWagon(Wagon)
if( legacySupport.getRepositorySession() != null )
{
- Properties headers = new Properties();
-
- headers.put( "User-Agent", ConfigUtils.getString( legacySupport.getRepositorySession(), "Maven",
- ConfigurationProperties.USER_AGENT ) );
- try
- {
- Method setHttpHeaders = wagon.getClass().getMethod( "setHttpHeaders", Properties.class );
- setHttpHeaders.invoke( wagon, headers );
- }
- catch ( NoSuchMethodException e )
+ String userAgent = ConfigUtils.getString( legacySupport.getRepositorySession(), ConfigurationProperties.USER_AGENT );
+ if( userAgent == null)
{
- // normal for non-http wagons
- }
- catch ( Exception e )
- {
- logger.debug( "Could not set user agent for wagon " + wagon.getClass().getName() + ": " + e );
+ Properties headers = new Properties();
+
+ headers.put( "User-Agent", ConfigUtils.getString( legacySupport.getRepositorySession(), "Maven",
+ ConfigurationProperties.USER_AGENT ) );
+ try
+ {
+ Method setHttpHeaders = wagon.getClass().getMethod( "setHttpHeaders", Properties.class );
+ setHttpHeaders.invoke( wagon, headers );
+ }
+ catch ( NoSuchMethodException e )
+ {
+ // normal for non-http wagons
+ }
+ catch ( Exception e )
+ {
+ logger.debug( "Could not set user agent for wagon " + wagon.getClass().getName() + ": " + e );
+ }
}
}
@@ -304,6 +312,7 @@ public class DefaultWagonManager
return proxyInfo;
}
+ @Override
public void getRemoteFile( ArtifactRepository repository, File destination, String remotePath,
TransferListener downloadMonitor, String checksumPolicy, boolean force )
throws TransferFailedException, ResourceDoesNotExistException
@@ -522,6 +531,7 @@ public class DefaultWagonManager
//
// Publisher
//
+ @Override
public void putArtifact( File source, Artifact artifact, ArtifactRepository deploymentRepository,
TransferListener downloadMonitor )
throws TransferFailedException
@@ -529,6 +539,7 @@ public class DefaultWagonManager
putRemoteFile( deploymentRepository, source, deploymentRepository.pathOf( artifact ), downloadMonitor );
}
+ @Override
public void putArtifactMetadata( File source, ArtifactMetadata artifactMetadata, ArtifactRepository repository )
throws TransferFailedException
{
@@ -536,6 +547,7 @@ public class DefaultWagonManager
putRemoteFile( repository, source, repository.pathOfRemoteRepositoryMetadata( artifactMetadata ), null );
}
+ @Override
public void putRemoteFile( ArtifactRepository repository, File source, String remotePath,
TransferListener downloadMonitor )
throws TransferFailedException
@@ -774,6 +786,7 @@ public class DefaultWagonManager
}
}
+ @Override
@Deprecated
public Wagon getWagon( Repository repository )
throws UnsupportedProtocolException
@@ -781,6 +794,7 @@ public class DefaultWagonManager
return getWagon( repository.getProtocol() );
}
+ @Override
@Deprecated
public Wagon getWagon( String protocol )
throws UnsupportedProtocolException