Skip to content

Commit 582e923

Browse files
committed
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
1 parent 19c8f09 commit 582e923

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,8 @@
205205
org.apache.commons.cli;version="[1.4.0,2.0.0)", \
206206
org.apache.commons.codec*
207207
Require-Bundle: \
208-
com.google.guava;bundle-version="32.2.1"
209-
208+
com.google.guava;bundle-version="32.2.1",
209+
org.apache.maven.resolver.api;bundle-version="${maven-resolver.version}";visibility:=reexport
210210
-failok: true
211211
-nouses: true
212212
-nodefaultversion: true
@@ -305,6 +305,7 @@
305305
<phase>generate-resources</phase>
306306
<configuration>
307307
<outputDirectory>${project.basedir}/${jars.directory}</outputDirectory>
308+
<excludeArtifactIds>maven-resolver-api</excludeArtifactIds>
308309
</configuration>
309310
</execution>
310311
<execution>

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ Bundle-SymbolicName: org.eclipse.m2e.tests.common;singleton:=true
55
Bundle-Version: 2.1.1.qualifier
66
Require-Bundle: org.junit;bundle-version="4.0.0",
77
org.eclipse.m2e.core;bundle-version="[2.0.0,3.0.0)",
8+
org.apache.maven.resolver.api;bundle-version="1.9.20",
89
org.eclipse.m2e.maven.runtime;bundle-version="[3.9.900,4.0.0)",
910
org.eclipse.m2e.jdt;bundle-version="[2.0.0,3.0.0)",
1011
org.eclipse.core.runtime,

target-platform/target-platform.target

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,16 @@ Export-Package: org.apache.maven.*;-noimport:=true;provider=m2e;mandatory
189189
Import-Package: !*
190190
]]></instructions>
191191
</location>
192+
<location includeDependencyDepth="none" includeSource="true" label="Maven Resolver" missingManifest="generate" type="Maven">
193+
<dependencies>
194+
<dependency>
195+
<groupId>org.apache.maven.resolver</groupId>
196+
<artifactId>maven-resolver-api</artifactId>
197+
<version>1.9.20</version>
198+
<type>jar</type>
199+
</dependency>
200+
</dependencies>
201+
</location>
192202
<location type="Target" uri="file:${project_loc:/m2e-core}/target-platform/m2e-runtimes.target"/>
193203
</locations>
194204
</target>

0 commit comments

Comments
 (0)