Update to Maven 3.3.9 (#107)

stefanseifert · web-flow · commit b8b06a64a954 · 2026-03-06T17:08:57.000+01:00
diff --git a/changes.xml b/changes.xml
@@ -24,6 +24,15 @@
     xsi:schemaLocation="http://maven.apache.org/changes/2.0.0 https://maven.apache.org/xsd/changes-2.0.0.xsd">
   <body>
 
+    <release version="3.2.2" date="not released">
+      <action type="update" dev="sseifert" issue="107">
+        Raise minimum maven version to 3.3.9, minimum java build version to Java 17.
+      </action>
+      <action type="update" dev="sseifert">
+        Update dependencies.
+      </action>
+    </release>
+
     <release version="3.2.0" date="2022-09-29">
       <action type="add" dev="jschaible">
         New parameters for to-maven goal.
diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@ under the License.
   <parent>
     <groupId>io.wcm.devops</groupId>
     <artifactId>io.wcm.devops.parent_toplevel</artifactId>
-    <version>2.0.4</version>
+    <version>2.1.2</version>
     <relativePath />
   </parent>
 
@@ -84,10 +84,10 @@ under the License.
   <properties>
     <site.url.module.prefix>maven/plugins/eclipse-maven-plugin</site.url.module.prefix>
 
-    <mavenVersion>2.2.1</mavenVersion>
+    <mavenVersion>3.3.9</mavenVersion>
     <maven.test.jvmargs>-Xmx1024m</maven.test.jvmargs>
     <surefire.version>3.5.4</surefire.version>
-    <mavenPluginToolsVersion>3.6.0</mavenPluginToolsVersion>
+    <mavenPluginToolsVersion>3.15.2</mavenPluginToolsVersion>
 
     <!-- repository settings -->
     <distribution.snapshotRepositoryId>sonatype-central-snapshots</distribution.snapshotRepositoryId>
@@ -102,7 +102,7 @@ under the License.
   <dependencies>
     <dependency>
       <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
+      <artifactId>maven-compat</artifactId>
       <version>${mavenVersion}</version>
       <scope>compile</scope>
     </dependency>
@@ -124,12 +124,6 @@ under the License.
       <version>${mavenVersion}</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact-manager</artifactId>
-      <version>${mavenVersion}</version>
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-artifact</artifactId>
diff --git a/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java b/src/main/java/org/apache/maven/plugin/ide/AbstractIdeSupportMojo.java
@@ -533,12 +533,10 @@ protected IdeDependency[] doDependencyResolution()
                                                        localRepo, project.getRemoteArtifactRepositories(),
                                                        getArtifactMetadataSource(), null, listeners );
                     }
-                    catch ( ArtifactResolutionException e )
+                    catch ( RuntimeException e )
                     {
                         getLog().debug( e.getMessage(), e );
-                        getLog().error( Messages.getString( "AbstractIdeSupportMojo.artifactresolution", new Object[] {
-                                                            e.getGroupId(), e.getArtifactId(), e.getVersion(),
-                                                                e.getMessage() } ) );
+                        getLog().error( "Artifact resolution failed: " + e.getMessage() );
 
                         // if we are here artifactResolutionResult is null, create a project without dependencies but
                         // don't fail
diff --git a/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java b/src/test/java/org/apache/maven/plugin/eclipse/it/AbstractEclipsePluginIT.java
@@ -58,7 +58,6 @@
 import org.apache.maven.shared.test.plugin.PluginTestTool;
 import org.apache.maven.shared.test.plugin.ProjectTool;
 import org.apache.maven.shared.test.plugin.TestToolsException;
-import org.codehaus.classworlds.ClassRealm;
 import org.codehaus.plexus.PlexusContainer;
 import org.codehaus.plexus.util.FileUtils;
 import org.codehaus.plexus.util.IOUtil;
@@ -223,12 +222,6 @@ protected void tearDown()
 
             if (container != null) {
                 container.dispose();
-
-                ClassRealm realm = container.getContainerRealm();
-
-                if (realm != null) {
-                    realm.getWorld().disposeRealm(realm.getId());
-                }
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -533,12 +533,10 @@ protected IdeDependency[] doDependencyResolution()`
`533`	`533`	`localRepo, project.getRemoteArtifactRepositories(),`
`534`	`534`	`getArtifactMetadataSource(), null, listeners );`
`535`	`535`	`}`
`536`		`- catch ( ArtifactResolutionException e )`
	`536`	`+ catch ( RuntimeException e )`
`537`	`537`	`{`
`538`	`538`	`getLog().debug( e.getMessage(), e );`
`539`		`- getLog().error( Messages.getString( "AbstractIdeSupportMojo.artifactresolution", new Object[] {`
`540`		`- e.getGroupId(), e.getArtifactId(), e.getVersion(),`
`541`		`- e.getMessage() } ) );`
	`539`	`+ getLog().error( "Artifact resolution failed: " + e.getMessage() );`
`542`	`540`
`543`	`541`	`// if we are here artifactResolutionResult is null, create a project without dependencies but`
`544`	`542`	`// don't fail`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,6 @@`
`58`	`58`	`import org.apache.maven.shared.test.plugin.PluginTestTool;`
`59`	`59`	`import org.apache.maven.shared.test.plugin.ProjectTool;`
`60`	`60`	`import org.apache.maven.shared.test.plugin.TestToolsException;`
`61`		`-import org.codehaus.classworlds.ClassRealm;`
`62`	`61`	`import org.codehaus.plexus.PlexusContainer;`
`63`	`62`	`import org.codehaus.plexus.util.FileUtils;`
`64`	`63`	`import org.codehaus.plexus.util.IOUtil;`
`@@ -223,12 +222,6 @@ protected void tearDown()`
`223`	`222`
`224`	`223`	`if (container != null) {`
`225`	`224`	`container.dispose();`
`226`		`-`
`227`		`- ClassRealm realm = container.getContainerRealm();`
`228`		`-`
`229`		`- if (realm != null) {`
`230`		`- realm.getWorld().disposeRealm(realm.getId());`
`231`		`- }`
`232`	`225`	`}`
`233`	`226`	`}`
`234`	`227`	`}`