From c7c99a46bb28862b190d08ee0bc706a5e3f3fcae Mon Sep 17 00:00:00 2001 From: Guillaume Nodet Date: Tue, 14 Feb 2023 16:11:14 +0100 Subject: [PATCH] [MPLUGINTESTING-80] Upgrade to maven 4.0.0-alpha-4 --- .../api/plugin/testing/MojoExtension.java | 33 ++++++++++--------- .../testing/stubs/MojoExecutionStub.java | 8 ++--- pom.xml | 2 +- 3 files changed, 22 insertions(+), 21 deletions(-) diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java index 358180af..030e135e 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java @@ -45,9 +45,10 @@ import org.apache.maven.api.Session; import org.apache.maven.api.plugin.Log; import org.apache.maven.api.plugin.Mojo; -import org.apache.maven.api.xml.Dom; +import org.apache.maven.api.xml.XmlNode; import org.apache.maven.configuration.internal.EnhancedComponentConfigurator; import org.apache.maven.internal.impl.DefaultLog; +import org.apache.maven.internal.xml.XmlNodeImpl; import org.apache.maven.lifecycle.internal.MojoDescriptorCreator; import org.apache.maven.plugin.PluginParameterExpressionEvaluatorV4; import org.apache.maven.plugin.descriptor.MojoDescriptor; @@ -197,15 +198,15 @@ else if ( pom.contains( "" ) ) Path path = Paths.get( getBasedir() ).resolve( pom ); pomDom = Xpp3DomBuilder.build( ReaderFactory.newXmlReader( path.toFile() ) ); } - Dom pluginConfiguration = extractPluginConfiguration( coord[1], pomDom ); + XmlNode pluginConfiguration = extractPluginConfiguration( coord[1], pomDom ); if ( !mojoParameters.isEmpty() ) { - List children = mojoParameters.stream() - .map( mp -> new org.apache.maven.internal.xml.Xpp3Dom( mp.name(), mp.value() ) ) + List children = mojoParameters.stream() + .map( mp -> new XmlNodeImpl( mp.name(), mp.value() ) ) .collect( Collectors.toList() ); - Dom config = new org.apache.maven.internal.xml.Xpp3Dom( "configuration", + XmlNode config = new XmlNodeImpl( "configuration", null, null, children, null ); - pluginConfiguration = Dom.merge( config, pluginConfiguration ); + pluginConfiguration = XmlNode.merge( config, pluginConfiguration ); } Mojo mojo = lookupMojo( coord, pluginConfiguration, descriptor ); return mojo; @@ -232,7 +233,7 @@ protected String[] mojoCoordinates( String goal ) /** * lookup the mojo while we have all of the relavent information */ - protected Mojo lookupMojo( String[] coord, Dom pluginConfiguration, PluginDescriptor descriptor ) + protected Mojo lookupMojo( String[] coord, XmlNode pluginConfiguration, PluginDescriptor descriptor ) throws Exception { // pluginkey = groupId : artifactId : version : goal @@ -283,21 +284,21 @@ protected Mojo lookupMojo( String[] coord, Dom pluginConfiguration, PluginDescri return mojo; } - private Dom finalizeConfig( Dom config, MojoDescriptor mojoDescriptor ) + private XmlNode finalizeConfig( XmlNode config, MojoDescriptor mojoDescriptor ) { - List children = new ArrayList<>(); + List children = new ArrayList<>(); if ( mojoDescriptor != null && mojoDescriptor.getParameters() != null ) { - Dom defaultConfiguration = MojoDescriptorCreator.convert( mojoDescriptor ).getDom(); + XmlNode defaultConfiguration = MojoDescriptorCreator.convert( mojoDescriptor ).getDom(); for ( Parameter parameter : mojoDescriptor.getParameters() ) { - Dom parameterConfiguration = config.getChild( parameter.getName() ); + XmlNode parameterConfiguration = config.getChild( parameter.getName() ); if ( parameterConfiguration == null ) { parameterConfiguration = config.getChild( parameter.getAlias() ); } - Dom parameterDefaults = defaultConfiguration.getChild( parameter.getName() ); - parameterConfiguration = Dom.merge( parameterConfiguration, parameterDefaults, Boolean.TRUE ); + XmlNode parameterDefaults = defaultConfiguration.getChild( parameter.getName() ); + parameterConfiguration = XmlNode.merge( parameterConfiguration, parameterDefaults, Boolean.TRUE ); if ( parameterConfiguration != null ) { Map attributes = new HashMap<>( parameterConfiguration.getAttributes() ); @@ -306,7 +307,7 @@ private Dom finalizeConfig( Dom config, MojoDescriptor mojoDescriptor ) { attributes.put( "implementation", parameter.getImplementation() ); } - parameterConfiguration = new org.apache.maven.internal.xml.Xpp3Dom( + parameterConfiguration = new XmlNodeImpl( parameter.getName(), parameterConfiguration.getValue(), attributes, parameterConfiguration.getChildren(), parameterConfiguration.getInputLocation() ); @@ -315,7 +316,7 @@ private Dom finalizeConfig( Dom config, MojoDescriptor mojoDescriptor ) } } } - return new org.apache.maven.internal.xml.Xpp3Dom( "configuration", null, null, children, null ); + return new XmlNodeImpl( "configuration", null, null, children, null ); } private boolean isEmpty( String str ) @@ -333,7 +334,7 @@ private static Stream children( Xpp3Dom element ) return Stream.of( element.getChildren() ); } - public static Dom extractPluginConfiguration( String artifactId, Xpp3Dom pomDom ) + public static XmlNode extractPluginConfiguration( String artifactId, Xpp3Dom pomDom ) throws Exception { Xpp3Dom pluginConfigurationElement = child( pomDom, "build" ) diff --git a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/MojoExecutionStub.java b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/MojoExecutionStub.java index 0e01bfc8..8b3dddde 100644 --- a/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/MojoExecutionStub.java +++ b/maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/MojoExecutionStub.java @@ -23,7 +23,7 @@ import org.apache.maven.api.MojoExecution; import org.apache.maven.api.model.Plugin; -import org.apache.maven.api.xml.Dom; +import org.apache.maven.api.xml.XmlNode; /** * Stub for {@link MojoExecution}. @@ -33,14 +33,14 @@ public class MojoExecutionStub implements MojoExecution private final String artifactId; private final String executionId; private final String goal; - private final Dom dom; + private final XmlNode dom; public MojoExecutionStub( String artifactId, String executionId, String goal ) { this( artifactId, executionId, goal, null ); } - public MojoExecutionStub( String artifactId, String executionId, String goal, Dom dom ) + public MojoExecutionStub( String artifactId, String executionId, String goal, XmlNode dom ) { this.artifactId = artifactId; this.executionId = executionId; @@ -69,7 +69,7 @@ public String getGoal() } @Override - public Optional getConfiguration() + public Optional getConfiguration() { return Optional.ofNullable( dom ); } diff --git a/pom.xml b/pom.xml index a09f9e24..8fa30c73 100644 --- a/pom.xml +++ b/pom.xml @@ -67,7 +67,7 @@ under the License. 3.0.0-M7 - 4.0.0-alpha-2 + 4.0.0-alpha-4 plugin-testing-archives/LATEST 8 2020-04-07T21:04:00Z