You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2022/04/16 16:19:31 UTC
[maven] branch master updated: [MNG-7454] Include resolver-transport-http in Maven (#720)
This is an automated email from the ASF dual-hosted git repository.
cstamas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven.git
The following commit(s) were added to refs/heads/master by this push:
new 551009ab4 [MNG-7454] Include resolver-transport-http in Maven (#720)
551009ab4 is described below
commit 551009ab492d0e8fc47d5438c876d72367bcbcd2
Author: Tamas Cservenak <ta...@cservenak.net>
AuthorDate: Sat Apr 16 18:19:23 2022 +0200
[MNG-7454] Include resolver-transport-http in Maven (#720)
Addendum to be2b7f890d98af20eb0753650b6605a68a97ac05:
* fix property name to align with existing ones
* fix logging configuration as no more shaded httpClient
* fix constant names
---
.../maven/conf/logging/simplelogger.properties | 6 ++--
.../DefaultRepositorySystemSessionFactory.java | 35 +++++++++++-----------
2 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/apache-maven/src/assembly/maven/conf/logging/simplelogger.properties b/apache-maven/src/assembly/maven/conf/logging/simplelogger.properties
index 64b331b45..8c4a5d1e4 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 80c6ba794..323dfe87e 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 @@ import org.slf4j.LoggerFactory;
@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 );
@@ -261,23 +261,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() );