Skip to content

[MNG-7478] Transport selection should use config properties #739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cstamas merged 2 commits into from
May 17, 2022
Merged

[MNG-7478] Transport selection should use config properties #739

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a085ed0
[MNG-7478] Transport selection should use config properties
cstamas May 13, 2022
ea2d3a6
Tidy up comment
cstamas May 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 24 additions & 3 deletions ...src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ public class DefaultRepositorySystemSessionFactory
{
private static final String MAVEN_RESOLVER_TRANSPORT_KEY = "maven.resolver.transport";

private static final String MAVEN_RESOLVER_TRANSPORT_DEFAULT = "default";

private static final String MAVEN_RESOLVER_TRANSPORT_WAGON = "wagon";

private static final String MAVEN_RESOLVER_TRANSPORT_NATIVE = "native";
Expand Down Expand Up @@ -261,9 +263,28 @@ else if ( request.isUpdateSnapshots() )
}
session.setAuthenticationSelector( authSelector );

String transport = request.getUserProperties()
.getProperty( MAVEN_RESOLVER_TRANSPORT_KEY, MAVEN_RESOLVER_TRANSPORT_WAGON );
if ( MAVEN_RESOLVER_TRANSPORT_NATIVE.equals( transport ) )
Object transport = configProps.getOrDefault( MAVEN_RESOLVER_TRANSPORT_KEY, MAVEN_RESOLVER_TRANSPORT_DEFAULT );
if ( MAVEN_RESOLVER_TRANSPORT_DEFAULT.equals( transport ) )
{
// The "default" mode (user did not set anything) needs to tweak resolver default priorities
// that are coded like this (default values):
//
// org.eclipse.aether.transport.http.HttpTransporterFactory.priority = 5.0f;
// org.eclipse.aether.transport.wagon.WagonTransporterFactory.priority = -1.0f;
//
// Hence, as both are present on classpath, HttpTransport would be selected, while
// we want to retain "default" behaviour of Maven and use Wagon. To achieve that,
// we set explicitly priority of WagonTransport to 6.0f (just above of HttpTransport),
// to make it "win" over HttpTransport. We do this to NOT interfere with possibly
// installed OTHER transports and their priorities, as unlike "wagon" or "native"
// transport setting, that sets priorities to MAX, hence prevents any 3rd party
// transport to get into play (inhibits them), in default mode we want to retain
// old behavior. Also, this "default" mode is different from "auto" setting,
// as it does not alter resolver priorities at all, and uses priorities as is.

configProps.put( WAGON_TRANSPORTER_PRIORITY_KEY, "6" );
}
else if ( MAVEN_RESOLVER_TRANSPORT_NATIVE.equals( transport ) )
{
// Make sure (whatever extra priority is set) that resolver native is selected
configProps.put( NATIVE_FILE_TRANSPORTER_PRIORITY_KEY, RESOLVER_MAX_PRIORITY );
Expand Down