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

Author: laeubi

org.eclipse.m2e.feature/feature.xml

@@ -2,7 +2,11 @@
 <feature
       id="org.eclipse.m2e.feature"
       label="%featureName"
+<<<<<<< Upstream, based on main
       version="2.8.0.qualifier"
+=======
+      version="2.6.2.qualifier"
+>>>>>>> 9df7271 Extract maven-resolver-api from the embedded runtime bundle
       provider-name="%providerName"
       plugin="org.eclipse.m2e.core"
       license-feature="org.eclipse.license"

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>

org.eclipse.m2e.tests.common/META-INF/MANIFEST.MF

@@ -2,10 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: M2E Testing Helpers
 Bundle-SymbolicName: org.eclipse.m2e.tests.common;singleton:=true
+<<<<<<< Upstream, based on main
 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.eclipse.m2e.maven.runtime;bundle-version="[3.9.900,4.0.0)",
+=======
+Bundle-Version: 2.0.7.qualifier
+Require-Bundle: org.apache.maven.resolver.api;bundle-version="1.9.20",
+ org.eclipse.m2e.maven.runtime;bundle-version="[3.8.6,4.0.0)",
+ org.junit;bundle-version="4.0.0",
+ org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)",
+>>>>>>> 9df7271 Extract maven-resolver-api from the embedded runtime bundle
  org.eclipse.m2e.jdt;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.core.runtime,
  org.eclipse.jdt.core,

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>