Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Restore compatibility on SettingsBuilder, ToolchainsBuilder and MojoDescriptorCreator (#820)

This commit is contained in:
Guillaume Nodet 2022-10-11 16:31:57 +02:00 committed by GitHub
parent 3bc2cf6a7a
commit 3f90e7028e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 61 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maven-compat/src/main/java/org/apache/maven/artifact/manager/DefaultWagonManager.java
View File

@ -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() );
@ -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() );

8
maven-compat/src/main/java/org/apache/maven/repository/legacy/LegacyRepositorySystem.java
View File

@ -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() )
{
@ -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() )
{

10
maven-core/src/main/java/org/apache/maven/internal/aether/DefaultRepositorySystemSessionFactory.java
View File

@ -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() )
@ -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() );
@ -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() );
@ -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() );

4
maven-core/src/main/java/org/apache/maven/lifecycle/internal/DefaultLifecycleExecutionPlanCalculator.java
View File

@ -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

4
maven-core/src/main/java/org/apache/maven/lifecycle/internal/MojoDescriptorCreator.java
View File

@ -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();
@ -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

1
maven-core/src/main/java/org/apache/maven/settings/DefaultMavenSettingsBuilder.java
View File

@ -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;

1
maven-core/src/main/java/org/apache/maven/settings/MavenSettingsBuilder.java
View File

@ -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;

1
maven-core/src/test/java/org/apache/maven/internal/impl/TestApi.java
View File

@ -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;

2
maven-core/src/test/java/org/apache/maven/lifecycle/LifecycleExecutorTest.java
View File

@ -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 );
}

3
maven-embedder/src/main/java/org/apache/maven/cli/MavenCli.java
View File

@ -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;
@ -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() )
{

27
maven-embedder/src/main/java/org/apache/maven/cli/configuration/SettingsXmlConfigurationProcessor.java
View File

@ -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;
@ -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>
@ -210,7 +211,7 @@ private MavenExecutionRequest populateFromSettings( MavenExecutionRequest reques
continue;
}
request.addProxy( new org.apache.maven.settings.Proxy( proxy ) );
request.addProxy( proxy );
}
// <mirrors>
@ -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() ) )
{
@ -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 )
{
@ -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 )
{

5
maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuilder.java
View File

@ -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;
@ -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 )

2
maven-settings-builder/src/main/java/org/apache/maven/settings/building/DefaultSettingsBuildingResult.java
View File

@ -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.

2
maven-settings-builder/src/main/java/org/apache/maven/settings/building/SettingsBuildingResult.java
View File

@ -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.

12
maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecrypter.java
View File

@ -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;
@ -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 )
{
@ -73,7 +75,7 @@ public SettingsDecryptionResult decrypt( SettingsDecryptionRequest request )
try
{
server = server.withPassphrase( decrypt( server.getPassphrase() ) );
server.setPassphrase( decrypt( server.getPassphrase() ) );
}
catch ( SecDispatcherException e )
{
@ -90,7 +92,7 @@ public SettingsDecryptionResult decrypt( SettingsDecryptionRequest request )
{
try
{
proxy = proxy.withPassword( decrypt( proxy.getPassword() ) );
proxy.setPassword( decrypt( proxy.getPassword() ) );
}
catch ( SecDispatcherException e )
{

6
maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionRequest.java
View File

@ -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.

4
maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/DefaultSettingsDecryptionResult.java
View File

@ -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;
/**

4
maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionRequest.java
View File

@ -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.

4
maven-settings-builder/src/main/java/org/apache/maven/settings/crypto/SettingsDecryptionResult.java
View File

@ -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;
/**

4
maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilder.java
View File

@ -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 )

2
maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/DefaultToolchainsBuildingResult.java
View File

@ -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.

2
maven-toolchain-builder/src/main/java/org/apache/maven/toolchain/building/ToolchainsBuildingResult.java
View File

@ -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.

4
maven-toolchain-builder/src/test/java/org/apache/maven/toolchain/building/DefaultToolchainsBuilderTest.java
View File

@ -39,7 +39,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@ -240,7 +239,8 @@ public void testEnvironmentVariablesAreInterpolated()
ToolchainsBuildingResult result = toolchainBuilder.build( request );
String interpolatedValue = "testValue";
assertEquals(interpolatedValue, result.getEffectiveToolchains().getToolchains().get(0).getProvides().get( "key" ) );
Xpp3Dom toolchainConfiguration = (Xpp3Dom) result.getEffectiveToolchains().getToolchains().get(0).getConfiguration();
org.codehaus.plexus.util.xml.Xpp3Dom toolchainConfiguration =
(org.codehaus.plexus.util.xml.Xpp3Dom) result.getEffectiveToolchains().getToolchains().get(0).getConfiguration();
assertEquals(interpolatedValue, toolchainConfiguration.getChild("jdkHome").getValue());
assertNotNull( result.getProblems() );
assertEquals( 0, result.getProblems().size() );