From 582e923f813056e1790e65c2ead720fd0973180a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christoph=20L=C3=A4ubrich?= <laeubi@laeubi-soft.de>
Date: Sat, 1 Jun 2024 16:48:53 +0200
Subject: [PATCH] Extract maven-resolver-api from the embedded runtime bundle

Currently we embed the maven-resolver-api jar into m2e, but the API
itself is already a bundle an we should consume it as such so we can:

1) update it independently
2) make it reusable by others without require the full runtime
3) cut down the size of the runtime bundle
---
 org.eclipse.m2e.maven.runtime/pom.xml             |  5 +++--
 org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF |  1 +
 target-platform/target-platform.target            | 10 ++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/org.eclipse.m2e.maven.runtime/pom.xml b/org.eclipse.m2e.maven.runtime/pom.xml
index 8c9c80081..93d11c007 100644
--- a/org.eclipse.m2e.maven.runtime/pom.xml
+++ b/org.eclipse.m2e.maven.runtime/pom.xml
@@ -205,8 +205,8 @@
 								org.apache.commons.cli;version="[1.4.0,2.0.0)", \
 								org.apache.commons.codec*
 							Require-Bundle: \
-								com.google.guava;bundle-version="32.2.1"
-
+								com.google.guava;bundle-version="32.2.1",
+								org.apache.maven.resolver.api;bundle-version="${maven-resolver.version}";visibility:=reexport
 							-failok: true
 							-nouses: true
 							-nodefaultversion: true
@@ -305,6 +305,7 @@
 						<phase>generate-resources</phase>
 						<configuration>
 							<outputDirectory>${project.basedir}/${jars.directory}</outputDirectory>
+							<excludeArtifactIds>maven-resolver-api</excludeArtifactIds>
 						</configuration>
 					</execution>
 					<execution>
diff --git a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF
index 37eacaf93..3b2b97fc3 100644
--- a/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.m2e.tests.common;singleton:=true
 Bundle-Version: 2.1.1.qualifier
 Require-Bundle: org.junit;bundle-version="4.0.0",
  org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)",
+ org.apache.maven.resolver.api;bundle-version="1.9.20",
  org.eclipse.m2e.maven.runtime;bundle-version="[3.9.900,4.0.0)",
  org.eclipse.m2e.jdt;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.runtime,
diff --git a/target-platform/target-platform.target b/target-platform/target-platform.target
index 8d484c284..dc08149b1 100644
--- a/target-platform/target-platform.target
+++ b/target-platform/target-platform.target
@@ -189,6 +189,16 @@ Export-Package:        org.apache.maven.*;-noimport:=true;provider=m2e;mandatory
 Import-Package:        !*
 ]]></instructions>
 		</location>
+		<location includeDependencyDepth="none" includeSource="true" label="Maven Resolver" missingManifest="generate" type="Maven">
+			<dependencies>
+				<dependency>
+					<groupId>org.apache.maven.resolver</groupId>
+					<artifactId>maven-resolver-api</artifactId>
+					<version>1.9.20</version>
+					<type>jar</type>
+				</dependency>
+			</dependencies>
+		</location>
 		<location type="Target" uri="file:${project_loc:/m2e-core}/target-platform/m2e-runtimes.target"/>
 	</locations>
 </target>