[MPLUGINTESTING-80] Upgrade to maven 4.0.0-alpha-4

Author: gnodet

maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/MojoExtension.java

@@ -44,9 +44,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;
@@ -176,13 +177,13 @@ private Mojo lookupMojo(
             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", null, null, children, null);
-            pluginConfiguration = Dom.merge(config, pluginConfiguration);
+            XmlNode config = new XmlNodeImpl("configuration", null, null, children, null);
+            pluginConfiguration = XmlNode.merge(config, pluginConfiguration);
         }
         Mojo mojo = lookupMojo(coord, pluginConfiguration, descriptor);
         return mojo;
@@ -204,7 +205,8 @@ protected String[] mojoCoordinates(String goal) throws Exception {
     /**
      * lookup the mojo while we have all of the relavent information
      */
-    protected Mojo lookupMojo(String[] coord, Dom pluginConfiguration, PluginDescriptor descriptor) throws Exception {
+    protected Mojo lookupMojo(String[] coord, XmlNode pluginConfiguration, PluginDescriptor descriptor)
+            throws Exception {
         // pluginkey = groupId : artifactId : version : goal
         Mojo mojo = lookup(Mojo.class, coord[0] + ":" + coord[1] + ":" + coord[2] + ":" + coord[3]);
         for (MojoDescriptor mojoDescriptor : descriptor.getMojos()) {
@@ -244,25 +246,25 @@ protected Mojo lookupMojo(String[] coord, Dom pluginConfiguration, PluginDescrip
         return mojo;
     }
 
-    private Dom finalizeConfig(Dom config, MojoDescriptor mojoDescriptor) {
-        List<Dom> children = new ArrayList<>();
+    private XmlNode finalizeConfig(XmlNode config, MojoDescriptor mojoDescriptor) {
+        List<XmlNode> children = new ArrayList<>();
         if (mojoDescriptor != null && mojoDescriptor.getParameters() != null) {
-            Dom defaultConfiguration =
+            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());
                     if (isEmpty(parameterConfiguration.getAttribute("implementation"))
                             && !isEmpty(parameter.getImplementation())) {
                         attributes.put("implementation", parameter.getImplementation());
                     }
-                    parameterConfiguration = new org.apache.maven.internal.xml.Xpp3Dom(
+                    parameterConfiguration = new XmlNodeImpl(
                             parameter.getName(),
                             parameterConfiguration.getValue(),
                             attributes,
@@ -273,7 +275,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) {
@@ -288,7 +290,7 @@ private static Stream<Xpp3Dom> children(Xpp3Dom element) {
         return Stream.of(element.getChildren());
     }
 
-    public static Dom extractPluginConfiguration(String artifactId, Xpp3Dom pomDom) throws Exception {
+    public static XmlNode extractPluginConfiguration(String artifactId, Xpp3Dom pomDom) throws Exception {
         Xpp3Dom pluginConfigurationElement = child(pomDom, "build")
                 .flatMap(buildElement -> child(buildElement, "plugins"))
                 .map(MojoExtension::children)

maven-plugin-testing-harness/src/main/java/org/apache/maven/api/plugin/testing/stubs/MojoExecutionStub.java

@@ -22,7 +22,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}.
@@ -31,13 +31,13 @@ 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;
         this.goal = goal;
@@ -60,7 +60,7 @@ public String getGoal() {
     }
 
     @Override
-    public Optional<Dom> getConfiguration() {
+    public Optional<XmlNode> getConfiguration() {
         return Optional.ofNullable(dom);
     }
 }

pom.xml

@@ -65,7 +65,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>