[MPH-185] Require Maven 3.6.3

And drop the hoops and loops, just make it simple.

Author: cstamas

pom.xml

@@ -65,7 +65,7 @@
 
   <properties>
     <javaVersion>8</javaVersion>
-    <mavenVersion>3.2.5</mavenVersion>
+    <mavenVersion>3.6.3</mavenVersion>
     <project.build.outputTimestamp>2022-08-14T12:24:27Z</project.build.outputTimestamp>
   </properties>
 
@@ -86,7 +86,7 @@
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-model</artifactId>
-      <version>3.8.5</version>
+      <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -101,6 +101,12 @@
       <version>${mavenVersion}</version>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings-builder</artifactId>
+      <version>${mavenVersion}</version>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- maven plugin tools -->
     <dependency>
@@ -230,53 +236,6 @@
         </plugin>
       </plugins>
     </pluginManagement>
-    <plugins>
-      <!-- unpack old Maven core sources for maven.mdo model to be able to generate xpp3-extended-writer when not yet provided by Maven core -->
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>unpack</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <artifactItems>
-                <artifactItem>
-                  <groupId>org.apache.maven</groupId>
-                  <artifactId>apache-maven</artifactId>
-                  <version>${mavenVersion}</version>
-                  <type>tar.gz</type>
-                  <classifier>src</classifier>
-                  <outputDirectory>${project.build.directory}</outputDirectory>
-                </artifactItem>
-              </artifactItems>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>4.0.0</version>
-          <models>
-            <model>target/apache-maven-${mavenVersion}/maven-model/src/main/mdo/maven.mdo</model>
-          </models>
-          <!-- to avoid conflict with class provided by Maven core -->
-          <extendedClassnameSuffix>ExOldSupport</extendedClassnameSuffix>
-        </configuration>
-        <executions>
-          <execution>
-            <id>modello</id>
-            <goals>
-              <goal>xpp3-extended-writer</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
   </build>
 
   <profiles>

src/it/projects/effective-pom-verbose/verify.groovy

@@ -0,0 +1,23 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+String content = new File( basedir, "build.log" ).text
+
+// comments in the same line
+assert content.contains( "<groupId>org.apache.maven.its.help</groupId>  <!-- " )

src/main/java/org/apache/maven/plugins/help/EffectivePomMojo.java

@@ -20,9 +20,6 @@
 
 import java.io.IOException;
 import java.io.StringWriter;
-import java.io.Writer;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.List;
 import java.util.Properties;
@@ -31,7 +28,7 @@
 import org.apache.maven.model.InputSource;
 import org.apache.maven.model.Model;
 import org.apache.maven.model.io.xpp3.MavenXpp3Writer;
-import org.apache.maven.model.io.xpp3.MavenXpp3WriterExOldSupport;
+import org.apache.maven.model.io.xpp3.MavenXpp3WriterEx;
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.MojoExecution.Source;
 import org.apache.maven.plugin.MojoExecutionException;
@@ -43,8 +40,6 @@
 import org.codehaus.plexus.util.xml.PrettyPrintXMLWriter;
 import org.codehaus.plexus.util.xml.XMLWriter;
 import org.codehaus.plexus.util.xml.XmlWriterUtil;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
-import org.codehaus.plexus.util.xml.pull.XmlSerializer;
 
 /**
  * Displays the effective POM as an XML for this build, with the active profiles factored in, or a specified artifact.
@@ -187,11 +182,9 @@ private void writeEffectivePom(MavenProject project, XMLWriter writer) throws Mo
         StringWriter sWriter = new StringWriter();
         try {
             if (verbose) {
-                // try to use Maven core-provided xpp3 extended writer (available since Maven 3.6.1)
-                if (!writeMavenXpp3WriterEx(sWriter, pom)) {
-                    // xpp3 extended writer not provided by Maven core, use local code
-                    new EffectiveWriterExOldSupport().write(sWriter, pom);
-                }
+                MavenXpp3WriterEx mavenXpp3WriterEx = new MavenXpp3WriterEx();
+                mavenXpp3WriterEx.setStringFormatter(new InputLocationStringFormatter());
+                mavenXpp3WriterEx.write(sWriter, pom);
             } else {
                 new MavenXpp3Writer().write(sWriter, pom);
             }
@@ -218,81 +211,18 @@ private static void cleanModel(Model pom) {
         pom.setProperties(properties);
     }
 
-    private void warnWriteMavenXpp3WriterEx(Throwable t) {
-        getLog().warn(
-                        "Unexpected exception while running Maven Model Extended Writer, "
-                                + "falling back to old internal implementation.",
-                        t);
-    }
-
-    private boolean writeMavenXpp3WriterEx(Writer writer, Model model) throws IOException {
-        try {
-            Class<?> mavenXpp3WriterExClass = Class.forName("org.apache.maven.model.io.xpp3.MavenXpp3WriterEx");
-            Object mavenXpp3WriterEx =
-                    mavenXpp3WriterExClass.getDeclaredConstructor().newInstance();
-
-            Method setStringFormatter =
-                    mavenXpp3WriterExClass.getMethod("setStringFormatter", InputLocation.StringFormatter.class);
-            setStringFormatter.invoke(mavenXpp3WriterEx, new InputLocationStringFormatter());
-
-            Method write = mavenXpp3WriterExClass.getMethod("write", Writer.class, Model.class);
-            write.invoke(mavenXpp3WriterEx, writer, model);
-
-            return true;
-        } catch (ClassNotFoundException e) {
-            // MavenXpp3WriterEx not available in running Maven version
-        } catch (NoSuchMethodException
-                | SecurityException
-                | IllegalArgumentException
-                | IllegalAccessException
-                | InstantiationException e) {
-            warnWriteMavenXpp3WriterEx(e);
-        } catch (InvocationTargetException e) {
-            if (e.getTargetException() instanceof IOException) {
-                throw (IOException) e.getTargetException();
-            } else if (e.getTargetException() instanceof RuntimeException) {
-                throw (RuntimeException) e.getTargetException();
-            }
-            warnWriteMavenXpp3WriterEx(e);
-        }
-        return false;
-    }
-
-    private static String toString(InputLocation location) {
-        InputSource source = location.getSource();
-
-        String s = source.getModelId(); // by default, display modelId
-
-        if (StringUtils.isBlank(s) || s.contains("[unknown-version]")) {
-            // unless it is blank or does not provide version information
-            s = source.toString();
-        }
-
-        return '}' + s + ((location.getLineNumber() >= 0) ? ", line " + location.getLineNumber() : "") + ' ';
-    }
-
     private static class InputLocationStringFormatter extends InputLocation.StringFormatter {
-
+        @Override
         public String toString(InputLocation location) {
-            return EffectivePomMojo.toString(location);
-        }
-    }
+            InputSource source = location.getSource();
 
-    /**
-     * Xpp3 extended writer extension to improve default InputSource display
-     */
-    private static class EffectiveWriterExOldSupport extends MavenXpp3WriterExOldSupport {
+            String s = source.getLocation(); // by default, display the path
 
-        @Override
-        public String toString(InputLocation location) {
-            return EffectivePomMojo.toString(location);
-        }
+            if (s == null || s.trim().isEmpty()) {
+                s = source.getModelId();
+            }
 
-        @Override
-        protected void writeXpp3DomToSerializer(Xpp3Dom dom, XmlSerializer serializer) throws IOException {
-            // default method uses Xpp3Dom input location tracking, not available in older Maven versions
-            // use old Xpp3Dom serialization, without input location tracking
-            dom.writeToSerializer(null, serializer);
+            return '}' + s + ((location.getLineNumber() >= 0) ? ", line " + location.getLineNumber() : "") + ' ';
         }
     }
 }