[Runtime] Embed Maven 3.9.7

Author: HannesWell

RELEASE_NOTES.md

@@ -1,5 +1,13 @@
 # Eclipse m2e - Release notes
 
+## 2.6.1
+
+* 📅 Release Date: _expected_ beginning of June 2024
+
+### Embedded and use Maven 3.9.7
+
+Updated the embedded Maven from version 3.9.6 to 3.9.7; [Maven 3.9.7 Release Notes](https://maven.apache.org/docs/3.9.7/release-notes.html).
+
 ## 2.6.0
 
 * 📅 Release Date: 21th February 2024

org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/embedder/ReadonlyMavenExecutionRequest.java

@@ -14,6 +14,8 @@
 package org.eclipse.m2e.core.internal.embedder;
 
 import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.Collections;
 import java.util.Date;
 import java.util.List;
@@ -519,7 +521,38 @@ public boolean isUseLegacyLocalRepository() {
 
   @Override
   public MavenExecutionRequest setUseLegacyLocalRepository(boolean useLegacyRepository) {
-    return request.setUseLegacyLocalRepository(useLegacyRepository);
+    throw new IllegalStateException();
+  }
+
+  private static final Method IS_IGNORE_TRANSITIVE_REPOSITORIES;
+  static {
+    Method method = null;
+    try { // Tycho somehow compiles against the oldest version making compilation fail if methods from new Maven methods are referenced.
+      method = MavenExecutionRequest.class.getMethod("isIgnoreTransitiveRepositories");
+    } catch(Exception e) {
+    }
+    IS_IGNORE_TRANSITIVE_REPOSITORIES = method;
+  }
+
+  /**
+   * @deprecated DO NOT CALL to maintain Maven 3.8 compatibility
+   */
+//  @Override
+  @Deprecated(since = "to maintain compatibility with Maven 3.8")
+  public boolean isIgnoreTransitiveRepositories() {
+    if(IS_IGNORE_TRANSITIVE_REPOSITORIES != null) {
+      try {
+        return (boolean) IS_IGNORE_TRANSITIVE_REPOSITORIES.invoke(request);
+      } catch(IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
+        throw new IllegalStateException(e);
+      }
+    }
+    throw new UnsupportedOperationException();
+  }
+
+//  @Override
+  public MavenExecutionRequest setIgnoreTransitiveRepositories(boolean ignoreTransitiveRepositories) {
+    throw new IllegalStateException();
   }
 
   @Override

org.eclipse.m2e.feature/forceQualifierUpdate.txt

@@ -1,2 +1,2 @@
 # To force a version qualifier update add the bug here
-Update build-qualifier because maven-runtime version update to Maven 3.9.6
+Update build-qualifier because maven-runtime version update to Maven 3.9.7

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

@@ -20,19 +20,19 @@
 	</parent>
 
 	<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-	<version>3.9.601-SNAPSHOT</version>
+	<version>3.9.700-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>M2E Embedded Maven Runtime (includes Incubating components)</name>
 
 	<properties>
 		<!-- maven core version -->
-		<maven-core.version>3.9.6</maven-core.version>
+		<maven-core.version>3.9.7</maven-core.version>
 		<!-- NOTE: When maven-core.version changes, this may impact the versions of the maven-resolver-*
 			jars that export the org.eclipse.aether.* packages in the org.eclipse.m2e.maven.runtime
 			bundle. So make sure the following variable has the value of the maven-resolver-* jars
 			https://bugs.eclipse.org/bugs/show_bug.cgi?id=529540 -->
-		<maven-resolver.version>1.9.18</maven-resolver.version>
+		<maven-resolver.version>1.9.20</maven-resolver.version>
 		<apache-commons-codec.version>1.16.1</apache-commons-codec.version><!-- Keep in sync with what maven includes-->
 		<!-- below are m2e-specific addons -->
 		<plexus-build-api.version>1.2.0</plexus-build-api.version>

pom.xml

@@ -102,7 +102,7 @@
 		<dependency>
 			<groupId>org.eclipse.m2e</groupId>
 			<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-			<version>3.9.601-SNAPSHOT</version>
+			<version>3.9.700-SNAPSHOT</version>
 		</dependency>
 	</dependencies>