Use Maven 4 as the runtime for m2eclipse

Maven 4 will soon be released and should be able to execute Maven 3
projects as well. We should therefore upgrade m2e to use Maven 4 from
now on.

For users that require Maven 3.9 line we can offer the latest 3.9.11
maven runtime as an additional install option like we already did for
Maven 3.9.6

Author: laeubi

RELEASE_NOTES.md

@@ -1,5 +1,14 @@
 # Eclipse m2e - Release notes
 
+## 2.10.0 (Planned)
+
+* 📅 Release Date: TBD
+
+### Embed and use Maven 4.0.0-rc-4
+
+Updated the embedded Maven from version 3.9.11 to 4.0.0-rc-4, the first Maven 4 release candidate.
+Maven 4 includes the maven-compat module for backward compatibility with Maven 3 builds.
+
 ## 2.9.1
 
 * 📅 Release Date: 02nd September 2025

org.eclipse.m2e.feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.m2e.feature"
       label="%featureName"
-      version="2.9.200.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.m2e.core"
       license-feature="org.eclipse.license"

org.eclipse.m2e.maven.runtime/pom.xml

@@ -21,14 +21,16 @@
 	</parent>
 
 	<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-	<version>3.9.1100-SNAPSHOT</version>
+	<version>4.0.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>M2E Embedded Maven Runtime (includes Incubating components)</name>
 
 	<properties>
 		<!-- maven core version -->
-		<maven-core.version>3.9.11</maven-core.version>
+		<maven-core.version>4.0.0-rc-4</maven-core.version>
+		<!-- Maven 4 uses resolver 2.0.9 -->
+		<resolver.version>2.0.9</resolver.version>
 		<!-- below are m2e-specific addons -->
 		<plexus-build-api.version>1.2.0</plexus-build-api.version>
 		<jars.directory>target/jars</jars.directory>
@@ -77,22 +79,27 @@
 		<dependency>
 			<groupId>org.apache.maven.resolver</groupId>
 			<artifactId>maven-resolver-impl</artifactId>
+			<version>${resolver.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven.resolver</groupId>
 			<artifactId>maven-resolver-connector-basic</artifactId>
+			<version>${resolver.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven.resolver</groupId>
 			<artifactId>maven-resolver-transport-wagon</artifactId>
+			<version>${resolver.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven.resolver</groupId>
 			<artifactId>maven-resolver-transport-file</artifactId>
+			<version>${resolver.version}</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.maven.resolver</groupId>
-			<artifactId>maven-resolver-transport-http</artifactId>
+			<artifactId>maven-resolver-transport-jdk</artifactId>
+			<version>${resolver.version}</version>
 			<exclusions>
 				<exclusion>
 					<groupId>commons-codec</groupId>
@@ -109,14 +116,14 @@
 			<artifactId>wagon-file</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.fusesource.jansi</groupId>
-			<artifactId>jansi</artifactId>
+			<groupId>org.jline</groupId>
+			<artifactId>jansi-core</artifactId>
 		</dependency>
 		<dependency>
 			<!-- SLF4J-binding only used by a launched Maven-runtime.
 				Keep the BND-instructions below in sync with this jar's name. -->
 			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-slf4j-provider</artifactId>
+			<artifactId>maven-logging</artifactId>
 		</dependency>
 		<!-- globally excluded transitive dependencies (set their scope to 'provided') -->
 		<dependency>
@@ -135,6 +142,7 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>failureaccess</artifactId>
+			<version>1.0.1</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -181,7 +189,7 @@
 							# However when the this Maven runtime is used within the Eclipse-IDE(-JVM) we don't want it to use the embedded SLF4J-binding
 							# but instead use the SLF4J-binding provided by the Eclipse runtime. This is achived by making the embedded SLF4J-binding invisible
 							# for OSGi, by simply NOT placing the binding's jar on the Bundle-ClassPath.
-							slf4jBinding=maven-slf4j-provider-${maven-core.version}.jar
+							slf4jBinding=maven-logging-${maven-core.version}.jar
 							M2E-SLF4JBinding=jars/${slf4jBinding}
 							-includeresource: \
 								jars/=${jars.directory}/;recursive:=false;lib:=true;filter:=!${slf4jBinding},\

org.eclipse.m2e.maven.runtime/src/main/java/org/eclipse/m2e/slf4j2/provider/MavenSLF4JProvider.java

@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.m2e.sdk.feature"
       label="%featureName"
-      version="2.9.200.qualifier"
+      version="3.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -23,40 +23,20 @@
          id="org.eclipse.m2e.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.m2e.feature.source"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.m2e.lemminx.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.m2e.lemminx.feature.source"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.m2e.logback.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.m2e.logback.feature.source"
-         version="0.0.0"/>
-
    <includes
          id="org.eclipse.m2e.pde.feature"
          version="0.0.0"/>
 
-   <includes
-         id="org.eclipse.m2e.pde.feature.source"
-         version="0.0.0"/>
-
    <plugin
          id="org.eclipse.m2e.tests.common"
          version="0.0.0"/>
 
-   <plugin
-         id="org.eclipse.m2e.tests.common.source"
-         version="0.0.0"/>
-
 </feature>

org.eclipse.m2e.maven.runtime/src/main/resources/META-INF/services/org.slf4j.spi.SLF4JServiceProvider

@@ -99,7 +99,7 @@
 		<dependency>
 			<groupId>org.eclipse.m2e</groupId>
 			<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-			<version>3.9.1100-SNAPSHOT</version>
+			<version>4.0.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

org.eclipse.m2e.sdk.feature/feature.xml

@@ -3,8 +3,12 @@
 <target name="m2e-runtimes">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/technology/m2e/releases/2.2.1/"/>
+			<repository location="https://archive.eclipse.org/technology/m2e/releases/2.2.1/"/>
 			<unit id="org.eclipse.m2e.maven.runtime" version="3.8.701.20230209-1606"/>
 		</location>
+		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="slicer" includeSource="false" type="InstallableUnit">
+			<repository location="https://download.eclipse.org/technology/m2e/releases/2.9.1"/>
+			<unit id="org.eclipse.m2e.maven.runtime" version="3.9.1100.20250811-2018"/>
+		</location>
 	</locations>
 </target>