You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by gn...@apache.org on 2023/02/15 09:18:51 UTC
[maven-plugin-testing] branch master updated: [MPLUGINTESTING-80] Upgrade to maven 4.0.0-alpha-4 (#27)
This is an automated email from the ASF dual-hosted git repository.
gnodet pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-plugin-testing.git
The following commit(s) were added to refs/heads/master by this push:
new b9454c2 [MPLUGINTESTING-80] Upgrade to maven 4.0.0-alpha-4 (#27)
b9454c2 is described below
commit b9454c24f72609dd64e30d89a68c011a2f09b229
Author: Guillaume Nodet <gn...@apache.org>
AuthorDate: Wed Feb 15 10:18:46 2023 +0100
[MPLUGINTESTING-80] Upgrade to maven 4.0.0-alpha-4 (#27)
---
.../maven/api/plugin/testing/MojoExtension.java | 33 +++++++++++-----------
.../plugin/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 358180a..030e135 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.Project;
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 @@ public class MojoExtension extends PlexusExtension implements ParameterResolver
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<Dom> children = mojoParameters.stream()
- .map( mp -> new org.apache.maven.internal.xml.Xpp3Dom( mp.name(), mp.value() ) )
+ List<XmlNode> 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 @@ public class MojoExtension extends PlexusExtension implements ParameterResolver
/**
* 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 @@ public class MojoExtension extends PlexusExtension implements ParameterResolver
return mojo;
}
- private Dom finalizeConfig( Dom config, MojoDescriptor mojoDescriptor )
+ private XmlNode finalizeConfig( XmlNode config, MojoDescriptor mojoDescriptor )
{
- List<Dom> children = new ArrayList<>();
+ List<XmlNode> 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<String, String> attributes = new HashMap<>( parameterConfiguration.getAttributes() );
@@ -306,7 +307,7 @@ public class MojoExtension extends PlexusExtension implements ParameterResolver
{
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 @@ public class MojoExtension extends PlexusExtension implements ParameterResolver
}
}
}
- 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 @@ public class MojoExtension extends PlexusExtension implements ParameterResolver
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 0e01bfc..8b3dddd 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 java.util.Optional;
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 class MojoExecutionStub implements MojoExecution
}
@Override
- public Optional<Dom> getConfiguration()
+ public Optional<XmlNode> getConfiguration()
{
return Optional.ofNullable( dom );
}
diff --git a/pom.xml b/pom.xml
index a09f9e2..8fa30c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@ under the License.
<properties>
<surefire.version>3.0.0-M7</surefire.version>
- <mavenVersion>4.0.0-alpha-2</mavenVersion>
+ <mavenVersion>4.0.0-alpha-4</mavenVersion>
<maven.site.path>plugin-testing-archives/LATEST</maven.site.path>
<javaVersion>8</javaVersion>
<project.build.outputTimestamp>2020-04-07T21:04:00Z</project.build.outputTimestamp>