This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch maven-3.9.x
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/maven-3.9.x by this push:
new 85caf9802 [MNG-7454] Include resolver-transport-http in Maven (#720)
85caf9802 is described below
commit 85caf98029e43066579fc671f3138ea17e473224
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Sat Apr 16 18:21:48 2022 +0200
[MNG-7454] Include resolver-transport-http in Maven (#720)
Addendum to 1ad5a1b1e9bb0a17fc12bbe0314564a616078602:
* fix property name to align with existing ones
* fix logging configuration as no more shaded httpClient
* fix constant names
---
.../src/conf/logging/simplelogger.properties | 6 ++--
.../DefaultRepositorySystemSessionFactory.java | 35 +++++++++++-----------
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/apache-maven/src/conf/logging/simplelogger.properties
b/apache-maven/src/conf/logging/simplelogger.properties
index 64b331b45..8c4a5d1e4 100644
--- a/apache-maven/src/conf/logging/simplelogger.properties
+++ b/apache-maven/src/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 5616743d1..e0db581db 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
@@ -63,19 +63,19 @@ import java.util.Map;
@Named
public class DefaultRepositorySystemSessionFactory
{
- private static final String MAVEN_TRANSPORT_KEY = "maven.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 );
@@ -241,23 +241,24 @@ public class DefaultRepositorySystemSessionFactory
}
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 );
+ throw new IllegalArgumentException( "Unknown resolver transport '"
+ transport
+ + "'. Supported transports are: " +
MAVEN_RESOLVER_TRANSPORT_WAGON + ", "
+ + MAVEN_RESOLVER_TRANSPORT_NATIVE + ", " +
MAVEN_RESOLVER_TRANSPORT_AUTO );
}
session.setTransferListener( request.getTransferListener() );
