You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2020/05/02 21:46:05 UTC
[maven-wagon] branch master updated: Apply consistent naming for
auth scopes
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git
The following commit(s) were added to refs/heads/master by this push:
new 34253e3 Apply consistent naming for auth scopes
34253e3 is described below
commit 34253e3d56e306a5dc1708e84f75bfbdefef1109
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sat May 2 23:45:53 2020 +0200
Apply consistent naming for auth scopes
---
.../maven/wagon/shared/http/AbstractHttpClientWagon.java | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
index 51d24cf..1d2bf0f 100644
--- a/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
+++ b/wagon-providers/wagon-http-shared/src/main/java/org/apache/maven/wagon/shared/http/AbstractHttpClientWagon.java
@@ -610,10 +610,9 @@ public abstract class AbstractHttpClientWagon
{
Credentials creds = new UsernamePasswordCredentials( username, password );
- String host = getRepository().getHost();
- int port = getRepository().getPort();
-
- credentialsProvider.setCredentials( getBasicAuthScope().getScope( host, port ), creds );
+ AuthScope targetScope = getBasicAuthScope().getScope( getRepository().getHost(),
+ getRepository().getPort() );
+ credentialsProvider.setCredentials( targetScope, creds );
}
}
@@ -639,10 +638,8 @@ public abstract class AbstractHttpClientWagon
creds = new UsernamePasswordCredentials( proxyUsername, proxyPassword );
}
- int proxyPort = proxyInfo.getPort();
-
- AuthScope authScope = getProxyBasicAuthScope().getScope( proxyHost, proxyPort );
- credentialsProvider.setCredentials( authScope, creds );
+ AuthScope proxyScope = getProxyBasicAuthScope().getScope( proxyHost, proxyInfo.getPort() );
+ credentialsProvider.setCredentials( proxyScope, creds );
}
}
}