[maven-wagon] branch WAGON-590-any-auth updated: Apply any auth scope

[michaelo]

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch WAGON-590-any-auth
in repository https://gitbox.apache.org/repos/asf/maven-wagon.git


The following commit(s) were added to refs/heads/WAGON-590-any-auth by this 
push:
     new f385d62  Apply any auth scope
f385d62 is described below

commit f385d62a862a0465b75b7c8038e773fb02a1a748
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Mon May 4 00:24:36 2020 +0200

    Apply any auth scope
---
 .../apache/maven/wagon/shared/http/AbstractHttpClientWagon.java    | 7 +++----
 .../java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java  | 2 +-
 2 files changed, 4 insertions(+), 5 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 1d2bf0f..7ac640c 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,8 +610,7 @@ public abstract class AbstractHttpClientWagon
             {
                 Credentials creds = new UsernamePasswordCredentials( username, 
password );
 
-                AuthScope targetScope = getBasicAuthScope().getScope( 
getRepository().getHost(),
-                                                                    
getRepository().getPort() );
+                AuthScope targetScope = AuthScope.ANY;
                 credentialsProvider.setCredentials( targetScope, creds );
             }
         }
@@ -775,7 +774,7 @@ public abstract class AbstractHttpClientWagon
         // FIXME Perform only when preemptive has been configured
         Repository repo = getRepository();
         HttpHost targetHost = new HttpHost( repo.getHost(), repo.getPort(), 
repo.getProtocol() );
-        AuthScope targetScope = getBasicAuthScope().getScope( targetHost );
+        AuthScope targetScope = AuthScope.ANY;
 
         if ( credentialsProvider.getCredentials( targetScope ) != null )
         {
@@ -974,7 +973,7 @@ public abstract class AbstractHttpClientWagon
         if ( config != null && config.isUsePreemptive() )
         {
             HttpHost targetHost = new HttpHost( repo.getHost(), 
repo.getPort(), repo.getProtocol() );
-            AuthScope targetScope = getBasicAuthScope().getScope( targetHost );
+            AuthScope targetScope = AuthScope.ANY;
 
             if ( credentialsProvider.getCredentials( targetScope ) != null )
             {
diff --git 
a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
 
b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
index 2aac440..6c53166 100644
--- 
a/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
+++ 
b/wagon-providers/wagon-webdav-jackrabbit/src/main/java/org/apache/maven/wagon/providers/webdav/WebDavWagon.java
@@ -161,7 +161,7 @@ public class WebDavWagon
         // FIXME Perform only when preemptive has been configured
         Repository repo = getRepository();
         HttpHost targetHost = new HttpHost( repo.getHost(), repo.getPort(), 
repo.getProtocol() );
-        AuthScope targetScope = getBasicAuthScope().getScope( targetHost );
+        AuthScope targetScope = AuthScope.ANY;
 
         if ( getCredentialsProvider().getCredentials( targetScope ) != null )
         {