From ecab9f0496e5cce0d1b3a8af3fae1d959d25bceb Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 14 Apr 2022 21:44:22 +0200 Subject: [PATCH 1/4] [MNG-7454] Include resolver-transport-http in Maven Addendum: * fix property name to align with existing ones * fix logging configuration as no more shaded httpClient --- .../src/assembly/maven/conf/logging/simplelogger.properties | 6 ++---- .../aether/DefaultRepositorySystemSessionFactory.java | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apache-maven/src/assembly/maven/conf/logging/simplelogger.properties b/apache-maven/src/assembly/maven/conf/logging/simplelogger.properties index 64b331b4592c..8c4a5d1e4b0d 100644 --- a/apache-maven/src/assembly/maven/conf/logging/simplelogger.properties +++ b/apache-maven/src/assembly/maven/conf/logging/simplelogger.properties @@ -26,7 +26,5 @@ org.slf4j.simpleLogger.log.Sisu=info org.slf4j.simpleLogger.warnLevelString=WARNING # MNG-6181: mvn -X also prints all debug logging from HttpClient -# Be aware that the shaded packages are used -# org.apache.http -> org.apache.maven.wagon.providers.http.httpclient -org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient=off -org.slf4j.simpleLogger.log.org.apache.maven.wagon.providers.http.httpclient.wire=off +org.slf4j.simpleLogger.log.org.apache.http=off +org.slf4j.simpleLogger.log.org.apache.http.wire=off diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java index 80c6ba794687..4146fca79549 100644 --- a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java +++ b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java @@ -78,7 +78,7 @@ @Named public class DefaultRepositorySystemSessionFactory { - private static final String MAVEN_TRANSPORT_KEY = "maven.transport"; + private static final String MAVEN_TRANSPORT_KEY = "maven.resolver.transport"; private static final String MAVEN_TRANSPORT_WAGON = "wagon"; From d826b7c78ccf3edcb9ea365480c2cfff2332c335 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Thu, 14 Apr 2022 21:58:38 +0200 Subject: [PATCH 2/4] More adjustments and alignements --- ...DefaultRepositorySystemSessionFactory.java | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java index 4146fca79549..529672bfd57b 100644 --- a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java +++ b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java @@ -78,19 +78,19 @@ @Named public class DefaultRepositorySystemSessionFactory { - private static final String MAVEN_TRANSPORT_KEY = "maven.resolver.transport"; + private static final String MAVEN_RESOLVER_TRANSPORT_KEY = "maven.resolver.transport"; - private static final String MAVEN_TRANSPORT_WAGON = "wagon"; + private static final String MAVEN_RESOLVER_TRANSPORT_WAGON = "wagon"; - private static final String MAVEN_TRANSPORT_RESOLVER = "resolver"; + private static final String MAVEN_RESOLVER_TRANSPORT_NATIVE = "native"; - private static final String MAVEN_TRANSPORT_AUTO = "auto"; + private static final String MAVEN_RESOLVER_TRANSPORT_AUTO = "auto"; - private static final String WAGON_TRANSPORTER_KEY_PRIORITY_KEY = "aether.priority.WagonTransporterFactory"; + private static final String WAGON_TRANSPORTER_PRIORITY_KEY = "aether.priority.WagonTransporterFactory"; - private static final String RESOLVER_HTTP_TRANSPORTER_PRIORITY_KEY = "aether.priority.HttpTransporterFactory"; + private static final String NATIVE_HTTP_TRANSPORTER_PRIORITY_KEY = "aether.priority.HttpTransporterFactory"; - private static final String RESOLVER_FILE_TRANSPORTER_PRIORITY_KEY = "aether.priority.FileTransporterFactory"; + private static final String NATIVE_FILE_TRANSPORTER_PRIORITY_KEY = "aether.priority.FileTransporterFactory"; private static final String RESOLVER_MAX_PRIORITY = String.valueOf( Float.MAX_VALUE ); @@ -261,23 +261,24 @@ else if ( request.isUpdateSnapshots() ) } session.setAuthenticationSelector( authSelector ); - String transport = request.getUserProperties().getProperty( MAVEN_TRANSPORT_KEY, MAVEN_TRANSPORT_WAGON ); - if ( MAVEN_TRANSPORT_RESOLVER.equals( transport ) ) + String transport = request.getUserProperties() + .getProperty( MAVEN_RESOLVER_TRANSPORT_KEY, MAVEN_RESOLVER_TRANSPORT_WAGON ); + if ( MAVEN_RESOLVER_TRANSPORT_NATIVE.equals( transport ) ) { // Make sure (whatever extra priority is set) that resolver native is selected - configProps.put( RESOLVER_FILE_TRANSPORTER_PRIORITY_KEY, RESOLVER_MAX_PRIORITY ); - configProps.put( RESOLVER_HTTP_TRANSPORTER_PRIORITY_KEY, RESOLVER_MAX_PRIORITY ); + configProps.put( NATIVE_FILE_TRANSPORTER_PRIORITY_KEY, RESOLVER_MAX_PRIORITY ); + configProps.put( NATIVE_HTTP_TRANSPORTER_PRIORITY_KEY, RESOLVER_MAX_PRIORITY ); } - else if ( MAVEN_TRANSPORT_WAGON.equals( transport ) ) + else if ( MAVEN_RESOLVER_TRANSPORT_WAGON.equals( transport ) ) { // Make sure (whatever extra priority is set) that wagon is selected - configProps.put( WAGON_TRANSPORTER_KEY_PRIORITY_KEY, RESOLVER_MAX_PRIORITY ); + configProps.put( WAGON_TRANSPORTER_PRIORITY_KEY, RESOLVER_MAX_PRIORITY ); } - else if ( !MAVEN_TRANSPORT_AUTO.equals( transport ) ) + else if ( !MAVEN_RESOLVER_TRANSPORT_AUTO.equals( transport ) ) { throw new IllegalArgumentException( "Unknown maven.transport=" + transport - + ". Supported ones are: " + MAVEN_TRANSPORT_WAGON + ", " - + MAVEN_TRANSPORT_RESOLVER + " and " + MAVEN_TRANSPORT_AUTO ); + + ". Supported ones are: " + MAVEN_RESOLVER_TRANSPORT_WAGON + ", " + + MAVEN_RESOLVER_TRANSPORT_NATIVE + " and " + MAVEN_RESOLVER_TRANSPORT_AUTO ); } session.setTransferListener( request.getTransferListener() ); From df2bbc9c57fb6584c792538a5b7c2fc9eece91b6 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 15 Apr 2022 19:58:43 +0200 Subject: [PATCH 3/4] Improve exception message --- .../aether/DefaultRepositorySystemSessionFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java index 529672bfd57b..a7d4da0b2bce 100644 --- a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java +++ b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java @@ -276,9 +276,9 @@ else if ( MAVEN_RESOLVER_TRANSPORT_WAGON.equals( transport ) ) } else if ( !MAVEN_RESOLVER_TRANSPORT_AUTO.equals( transport ) ) { - throw new IllegalArgumentException( "Unknown maven.transport=" + transport + throw new IllegalArgumentException( "Unknown " + MAVEN_RESOLVER_TRANSPORT_KEY + "=" + transport + ". Supported ones are: " + MAVEN_RESOLVER_TRANSPORT_WAGON + ", " - + MAVEN_RESOLVER_TRANSPORT_NATIVE + " and " + MAVEN_RESOLVER_TRANSPORT_AUTO ); + + MAVEN_RESOLVER_TRANSPORT_NATIVE + ", " + MAVEN_RESOLVER_TRANSPORT_AUTO ); } session.setTransferListener( request.getTransferListener() ); From 4e544e30abd341216033ab602e2aa9fa212ebfe3 Mon Sep 17 00:00:00 2001 From: Tamas Cservenak Date: Fri, 15 Apr 2022 20:11:48 +0200 Subject: [PATCH 4/4] Tweak message --- .../aether/DefaultRepositorySystemSessionFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java index a7d4da0b2bce..323dfe87e2f2 100644 --- a/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java +++ b/maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java @@ -276,8 +276,8 @@ else if ( MAVEN_RESOLVER_TRANSPORT_WAGON.equals( transport ) ) } else if ( !MAVEN_RESOLVER_TRANSPORT_AUTO.equals( transport ) ) { - throw new IllegalArgumentException( "Unknown " + MAVEN_RESOLVER_TRANSPORT_KEY + "=" + transport - + ". Supported ones are: " + MAVEN_RESOLVER_TRANSPORT_WAGON + ", " + throw new IllegalArgumentException( "Unknown resolver transport '" + transport + + "'. Supported transports are: " + MAVEN_RESOLVER_TRANSPORT_WAGON + ", " + MAVEN_RESOLVER_TRANSPORT_NATIVE + ", " + MAVEN_RESOLVER_TRANSPORT_AUTO ); }