Skip to content

Restore compatibility on SettingsBuilder, ToolchainsBuilder and MojoDescriptorCreator #820

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
gnodet merged 1 commit into from
Oct 11, 2022
Merged

Restore compatibility on SettingsBuilder, ToolchainsBuilder and MojoDescriptorCreator #820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public AuthenticationInfo getAuthenticationInfo( String id )
if ( id.equalsIgnoreCase( server.getId() ) )
{
SettingsDecryptionResult result = settingsDecrypter.decrypt(
new DefaultSettingsDecryptionRequest( server.getDelegate() ) );
server = new Server( result.getServer() );
new DefaultSettingsDecryptionRequest( server ) );
server = result.getServer();

AuthenticationInfo authInfo = new AuthenticationInfo();
authInfo.setUserName( server.getUsername() );
Expand Down Expand Up @@ -125,8 +125,8 @@ public ProxyInfo getProxy( String protocol )
if ( proxy.isActive() && protocol.equalsIgnoreCase( proxy.getProtocol() ) )
{
SettingsDecryptionResult result = settingsDecrypter.decrypt(
new DefaultSettingsDecryptionRequest( proxy.getDelegate() ) );
proxy = new Proxy( result.getProxy() );
new DefaultSettingsDecryptionRequest( proxy ) );
proxy = result.getProxy();

ProxyInfo proxyInfo = new ProxyInfo();
proxyInfo.setHost( proxy.getHost() );
Expand Down
8 changes: 4 additions & 4 deletions maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,9 +563,9 @@ public void injectAuthentication( List<ArtifactRepository> repositories, List<Se

if ( server != null )
{
SettingsDecryptionRequest request = new DefaultSettingsDecryptionRequest( server.getDelegate() );
SettingsDecryptionRequest request = new DefaultSettingsDecryptionRequest( server );
SettingsDecryptionResult result = settingsDecrypter.decrypt( request );
server = new Server( result.getServer() );
server = result.getServer();

if ( logger.isDebugEnabled() )
{
Expand Down Expand Up @@ -670,9 +670,9 @@ public void injectProxy( List<ArtifactRepository> repositories, List<org.apache.

if ( proxy != null )
{
SettingsDecryptionRequest request = new DefaultSettingsDecryptionRequest( proxy.getDelegate() );
SettingsDecryptionRequest request = new DefaultSettingsDecryptionRequest( proxy );
SettingsDecryptionResult result = settingsDecrypter.decrypt( request );
proxy = new org.apache.maven.settings.Proxy( result.getProxy() );
proxy = result.getProxy();

if ( logger.isDebugEnabled() )
{
Expand Down
10 changes: 5 additions & 5 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 @@ -194,8 +194,8 @@ public DefaultRepositorySystemSession newRepositorySession( MavenExecutionReques
request.getWorkspaceReader() != null ? request.getWorkspaceReader() : workspaceRepository );

DefaultSettingsDecryptionRequest decrypt = new DefaultSettingsDecryptionRequest();
decrypt.setProxies( Proxy.proxyToApiV4( request.getProxies() ) );
decrypt.setServers( Server.serverToApiV4( request.getServers() ) );
decrypt.setProxies( request.getProxies() );
decrypt.setServers( request.getServers() );
SettingsDecryptionResult decrypted = settingsDecrypter.decrypt( decrypt );

if ( logger.isDebugEnabled() )
Expand All @@ -215,7 +215,7 @@ public DefaultRepositorySystemSession newRepositorySession( MavenExecutionReques
session.setMirrorSelector( mirrorSelector );

DefaultProxySelector proxySelector = new DefaultProxySelector();
for ( org.apache.maven.api.settings.Proxy proxy : decrypted.getProxies() )
for ( Proxy proxy : decrypted.getProxies() )
{
AuthenticationBuilder authBuilder = new AuthenticationBuilder();
authBuilder.addUsername( proxy.getUsername() ).addPassword( proxy.getPassword() );
Expand All @@ -226,7 +226,7 @@ public DefaultRepositorySystemSession newRepositorySession( MavenExecutionReques
session.setProxySelector( proxySelector );

DefaultAuthenticationSelector authSelector = new DefaultAuthenticationSelector();
for ( org.apache.maven.api.settings.Server server : decrypted.getServers() )
for ( Server server : decrypted.getServers() )
{
AuthenticationBuilder authBuilder = new AuthenticationBuilder();
authBuilder.addUsername( server.getUsername() ).addPassword( server.getPassword() );
Expand All @@ -235,7 +235,7 @@ public DefaultRepositorySystemSession newRepositorySession( MavenExecutionReques

if ( server.getConfiguration() != null )
{
Dom dom = server.getConfiguration();
Dom dom = ( ( org.codehaus.plexus.util.xml.Xpp3Dom ) server.getConfiguration() ).getDom();
List<Dom> children = dom.getChildren().stream()
.filter( c -> !"wagonProvider".equals( c.getName() ) )
.collect( Collectors.toList() );
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,9 +371,9 @@ private void finalizeMojoConfiguration( MojoExecution mojoExecution )
mojoExecution.setConfiguration( finalConfiguration );
}

private Xpp3Dom getMojoConfiguration( MojoDescriptor mojoDescriptor )
private Dom getMojoConfiguration( MojoDescriptor mojoDescriptor )
{
return MojoDescriptorCreator.convert( mojoDescriptor );
return MojoDescriptorCreator.convert( mojoDescriptor ).getDom();
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ private Plugin findPlugin( String groupId, String artifactId, Collection<Plugin>
return null;
}

public static Xpp3Dom convert( MojoDescriptor mojoDescriptor )
public static org.codehaus.plexus.util.xml.Xpp3Dom convert( MojoDescriptor mojoDescriptor )
{
PlexusConfiguration c = mojoDescriptor.getMojoConfiguration();

Expand All @@ -125,7 +125,7 @@ public static Xpp3Dom convert( MojoDescriptor mojoDescriptor )
}

Xpp3Dom dom = new Xpp3Dom( "configuration", null, null, children, null );
return dom;
return new org.codehaus.plexus.util.xml.Xpp3Dom( dom );
}

// org.apache.maven.plugins:maven-remote-resources-plugin:1.0:process@executionId
Expand Down
1 change: 0 additions & 1 deletion maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import javax.inject.Named;
import javax.inject.Singleton;

import org.apache.maven.api.settings.Settings;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.properties.internal.SystemProperties;
import org.apache.maven.settings.building.DefaultSettingsBuildingRequest;
Expand Down
1 change: 0 additions & 1 deletion maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import java.io.File;
import java.io.IOException;

import org.apache.maven.api.settings.Settings;
import org.apache.maven.execution.MavenExecutionRequest;
import org.codehaus.plexus.util.xml.pull.XmlPullParserException;

Expand Down
1 change: 1 addition & 0 deletions maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
import org.apache.maven.rtinfo.RuntimeInformation;
import org.apache.maven.session.scope.internal.SessionScope;
import org.apache.maven.toolchain.DefaultToolchainManagerPrivate;
import org.apache.maven.toolchain.building.ToolchainsBuilder;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.testing.PlexusTest;
import org.eclipse.aether.RepositorySystem;
Expand Down
2 changes: 1 addition & 1 deletion maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ public void testPluginConfigurationCreation()
MojoDescriptor mojoDescriptor =
mojoDescriptorCreator.getMojoDescriptor( "org.apache.maven.its.plugins:maven-it-plugin:0.1:java", session,
session.getCurrentProject() );
Dom dom = MojoDescriptorCreator.convert( mojoDescriptor );
Dom dom = MojoDescriptorCreator.convert( mojoDescriptor ).getDom();
System.out.println( dom );
}

Expand Down
3 changes: 1 addition & 2 deletions maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
import org.apache.maven.toolchain.building.DefaultToolchainsBuildingRequest;
import org.apache.maven.toolchain.building.ToolchainsBuilder;
import org.apache.maven.toolchain.building.ToolchainsBuildingResult;
import org.apache.maven.toolchain.model.PersistedToolchains;
import org.codehaus.plexus.ContainerConfiguration;
import org.codehaus.plexus.DefaultContainerConfiguration;
import org.codehaus.plexus.DefaultPlexusContainer;
Expand Down Expand Up @@ -1335,7 +1334,7 @@ void toolchains( CliRequest cliRequest )
eventSpyDispatcher.onEvent( toolchainsResult );

executionRequestPopulator.populateFromToolchains( cliRequest.request,
new PersistedToolchains( toolchainsResult.getEffectiveToolchains() ) );
toolchainsResult.getEffectiveToolchains() );

if ( !toolchainsResult.getProblems().isEmpty() && slf4jLogger.isWarnEnabled() )
{
Expand Down
27 changes: 14 additions & 13 deletions ...r/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,12 @@
import org.apache.maven.cli.CliRequest;
import org.apache.maven.execution.MavenExecutionRequest;
import org.apache.maven.execution.MavenExecutionRequestPopulationException;
import org.apache.maven.api.settings.Mirror;
import org.apache.maven.api.settings.Proxy;
import org.apache.maven.api.settings.Repository;
import org.apache.maven.api.settings.Server;
import org.apache.maven.api.settings.Settings;
import org.apache.maven.settings.Mirror;
import org.apache.maven.settings.Profile;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Repository;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;
import org.apache.maven.settings.SettingsUtils;
import org.apache.maven.settings.building.DefaultSettingsBuildingRequest;
import org.apache.maven.settings.building.SettingsBuilder;
Expand Down Expand Up @@ -188,7 +189,7 @@ private MavenExecutionRequest populateFromSettings( MavenExecutionRequest reques

for ( Server server : settings.getServers() )
{
request.addServer( new org.apache.maven.settings.Server( server ) );
request.addServer( server );
}

// <proxies>
Expand All @@ -210,7 +211,7 @@ private MavenExecutionRequest populateFromSettings( MavenExecutionRequest reques
continue;
}

request.addProxy( new org.apache.maven.settings.Proxy( proxy ) );
request.addProxy( proxy );
}

// <mirrors>
Expand All @@ -223,14 +224,14 @@ private MavenExecutionRequest populateFromSettings( MavenExecutionRequest reques

for ( Mirror mirror : settings.getMirrors() )
{
request.addMirror( new org.apache.maven.settings.Mirror( mirror ) );
request.addMirror( mirror );
}

request.setActiveProfiles( settings.getActiveProfiles() );

for ( org.apache.maven.api.settings.Profile rawProfile : settings.getProfiles() )
for ( Profile rawProfile : settings.getProfiles() )
{
request.addProfile( SettingsUtils.convertFromSettingsProfile( rawProfile ) );
request.addProfile( SettingsUtils.convertFromSettingsProfile( rawProfile.getDelegate() ) );

if ( settings.getActiveProfiles().contains( rawProfile.getId() ) )
{
Expand All @@ -239,8 +240,8 @@ private MavenExecutionRequest populateFromSettings( MavenExecutionRequest reques
{
try
{
request.addRemoteRepository( MavenRepositorySystem.buildArtifactRepository(
new org.apache.maven.settings.Repository( remoteRepository ) ) );
request.addRemoteRepository(
MavenRepositorySystem.buildArtifactRepository( remoteRepository ) );
}
catch ( InvalidRepositoryException e )
{
Expand All @@ -254,7 +255,7 @@ private MavenExecutionRequest populateFromSettings( MavenExecutionRequest reques
try
{
request.addPluginArtifactRepository( MavenRepositorySystem.buildArtifactRepository(
new org.apache.maven.settings.Repository( pluginRepository ) ) );
pluginRepository ) );
}
catch ( InvalidRepositoryException e )
{
Expand Down
5 changes: 3 additions & 2 deletions ...ings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
import org.apache.maven.building.FileSource;
import org.apache.maven.building.Source;
import org.apache.maven.api.settings.Settings;
import org.apache.maven.api.settings.TrackableBase;
import org.apache.maven.settings.TrackableBase;
import org.apache.maven.settings.io.SettingsParseException;
import org.apache.maven.settings.io.SettingsReader;
import org.apache.maven.settings.io.SettingsWriter;
Expand Down Expand Up @@ -128,7 +128,8 @@ public SettingsBuildingResult build( SettingsBuildingRequest request )
throw new SettingsBuildingException( problems.getProblems() );
}

return new DefaultSettingsBuildingResult( userSettings, problems.getProblems() );
return new DefaultSettingsBuildingResult( new org.apache.maven.settings.Settings( userSettings ),
problems.getProblems() );
}

private boolean hasErrors( List<SettingsProblem> problems )
Expand Down
2 changes: 1 addition & 1 deletion ...ilder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.ArrayList;
import java.util.List;

import org.apache.maven.api.settings.Settings;
import org.apache.maven.settings.Settings;

/**
* Collects the output of the settings builder.
Expand Down
2 changes: 1 addition & 1 deletion ...ings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import java.util.List;

import org.apache.maven.api.settings.Settings;
import org.apache.maven.settings.Settings;

/**
* Collects the output of the settings builder.
Expand Down
12 changes: 7 additions & 5 deletions ...ings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import javax.inject.Named;
import javax.inject.Singleton;

import org.apache.maven.api.settings.Proxy;
import org.apache.maven.api.settings.Server;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.building.DefaultSettingsProblem;
import org.apache.maven.settings.building.SettingsProblem;
import org.apache.maven.settings.building.SettingsProblem.Severity;
Expand Down Expand Up @@ -61,9 +61,11 @@ public SettingsDecryptionResult decrypt( SettingsDecryptionRequest request )

for ( Server server : request.getServers() )
{
server = server.clone();

try
{
server = server.withPassword( decrypt( server.getPassword() ) );
server.setPassword( decrypt( server.getPassword() ) );
}
catch ( SecDispatcherException e )
{
Expand All @@ -73,7 +75,7 @@ public SettingsDecryptionResult decrypt( SettingsDecryptionRequest request )

try
{
server = server.withPassphrase( decrypt( server.getPassphrase() ) );
server.setPassphrase( decrypt( server.getPassphrase() ) );
}
catch ( SecDispatcherException e )
{
Expand All @@ -90,7 +92,7 @@ public SettingsDecryptionResult decrypt( SettingsDecryptionRequest request )
{
try
{
proxy = proxy.withPassword( decrypt( proxy.getPassword() ) );
proxy.setPassword( decrypt( proxy.getPassword() ) );
}
catch ( SecDispatcherException e )
{
Expand Down
6 changes: 3 additions & 3 deletions ...lder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
import java.util.Arrays;
import java.util.List;

import org.apache.maven.api.settings.Proxy;
import org.apache.maven.api.settings.Server;
import org.apache.maven.api.settings.Settings;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.Settings;

/**
* Collects parameters that control the decryption of settings.
Expand Down
4 changes: 2 additions & 2 deletions ...ilder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import java.util.ArrayList;
import java.util.List;

import org.apache.maven.api.settings.Proxy;
import org.apache.maven.api.settings.Server;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.building.SettingsProblem;

/**
Expand Down
4 changes: 2 additions & 2 deletions ...ngs-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

import java.util.List;

import org.apache.maven.api.settings.Proxy;
import org.apache.maven.api.settings.Server;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;

/**
* Collects parameters that control the decryption of settings.
Expand Down
4 changes: 2 additions & 2 deletions ...ings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@

import java.util.List;

import org.apache.maven.api.settings.Proxy;
import org.apache.maven.api.settings.Server;
import org.apache.maven.settings.Proxy;
import org.apache.maven.settings.Server;
import org.apache.maven.settings.building.SettingsProblem;

/**
Expand Down
4 changes: 2 additions & 2 deletions ...n-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@ public ToolchainsBuildingResult build( ToolchainsBuildingRequest request )
throw new ToolchainsBuildingException( problems.getProblems() );
}


return new DefaultToolchainsBuildingResult( merged, problems.getProblems() );
return new DefaultToolchainsBuildingResult(
new org.apache.maven.toolchain.model.PersistedToolchains( merged ), problems.getProblems() );
}

private PersistedToolchains interpolate( PersistedToolchains toolchains, ProblemCollector problems )
Expand Down
2 changes: 1 addition & 1 deletion ...er/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import java.util.List;

import org.apache.maven.building.Problem;
import org.apache.maven.api.toolchain.PersistedToolchains;
import org.apache.maven.toolchain.model.PersistedToolchains;

/**
* Holds the result of the merged toolchains and holds the problems during this build, if any.
Expand Down
2 changes: 1 addition & 1 deletion ...n-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import java.util.List;

import org.apache.maven.building.Problem;
import org.apache.maven.api.toolchain.PersistedToolchains;
import org.apache.maven.toolchain.model.PersistedToolchains;

/**
* Collects the output of the toolchains builder.
Expand Down
Loading