From 5f55f5b3a5fba64696b5276a5b5b458e27aebe90 Mon Sep 17 00:00:00 2001
From: Hannes Wellmann <wellmann.hannes1@gmx.net>
Date: Mon, 8 May 2023 22:54:21 +0200
Subject: [PATCH] [Runtime] Embed Maven 3.9.4

---
 org.eclipse.m2e.feature/forceQualifierUpdate.txt | 1 +
 org.eclipse.m2e.maven.runtime/pom.xml            | 8 ++++----
 pom.xml                                          | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/org.eclipse.m2e.feature/forceQualifierUpdate.txt b/org.eclipse.m2e.feature/forceQualifierUpdate.txt
index c7f19ff299..7017c0075e 100644
--- a/org.eclipse.m2e.feature/forceQualifierUpdate.txt
+++ b/org.eclipse.m2e.feature/forceQualifierUpdate.txt
@@ -2,3 +2,4 @@
 Update build-qualifier because maven-runtime components currently use the committer's time-zone for their qualifier and don't align with the other projects that use UTC.
 Update build-qualifier because maven-runtime components now use again UTC+0-based qualifiers.
 Move o.e.m2e.maven.runtime to m2e's git-repo root 
+Update build-qualifier because maven-runtime version update to Maven 3.9.4
diff --git a/org.eclipse.m2e.maven.runtime/pom.xml b/org.eclipse.m2e.maven.runtime/pom.xml
index fb054c24c9..c70ccb6653 100644
--- a/org.eclipse.m2e.maven.runtime/pom.xml
+++ b/org.eclipse.m2e.maven.runtime/pom.xml
@@ -20,19 +20,19 @@
 	</parent>
 
 	<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-	<version>3.9.101-SNAPSHOT</version>
+	<version>3.9.400-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>M2E Embedded Maven Runtime (includes Incubating components)</name>
 
 	<properties>
 		<!-- maven core version -->
-		<maven-core.version>3.9.1</maven-core.version>
+		<maven-core.version>3.9.4</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.7</maven-resolver.version>
+		<maven-resolver.version>1.9.14</maven-resolver.version>
 		<!-- below are m2e-specific addons -->
 		<plexus-build-api.version>0.0.7</plexus-build-api.version>
 		<okhttp-connector.version>0.17.8</okhttp-connector.version>
@@ -195,7 +195,7 @@
 								javax.annotation;version="[1.2.0,2.0.0)", \
 								org.apache.commons.cli;version="[1.4.0,2.0.0)"
 							Require-Bundle: \
-								com.google.guava
+								com.google.guava;version="32.0.1"
 
 							-failok: true
 							-nouses: true
diff --git a/pom.xml b/pom.xml
index 709e9609ce..c290d11e55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,7 +103,7 @@
 		<dependency>
 			<groupId>org.eclipse.m2e</groupId>
 			<artifactId>org.eclipse.m2e.maven.runtime</artifactId>
-			<version>3.9.101-SNAPSHOT</version>
+			<version>3.9.400-SNAPSHOT</version>
 		</dependency>
 	</dependencies>