Skip to content

Commit 08a84f8

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 09144bf commit 08a84f8

File tree

2 files changed

+22
-12
lines changed

2 files changed

+22
-12
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@
201201
org.apache.maven.*;provider=m2e;mandatory:=provider,\
202202
org.codehaus.plexus.*;provider=m2e;mandatory:=provider,\
203203
org.sonatype.plexus.*;provider=m2e;mandatory:=provider,\
204-
org.eclipse.aether.*;provider=m2e;mandatory:=provider;version=${maven-resolver.version},\
205204
com.google.inject.*;provider=m2e;mandatory:=provider,\
206205
org.apache.maven.wagon.*;provider=m2e;mandatory:=provider,\
207206
org.eclipse.sisu.*;provider=m2e;mandatory:=provider;version=${maven-resolver.version}
@@ -211,6 +210,7 @@
211210
javax.inject;version="[1.0.0,2.0.0)",\
212211
javax.annotation;version="[1.2.0,2.0.0)", \
213212
org.apache.commons.cli;version="[1.4.0,2.0.0)", \
213+
org.eclipse.aether.*;version="[${maven-resolver.version},2)",\
214214
org.apache.commons.codec*, \
215215
org.apache.commons.lang3*
216216
Require-Bundle: \
@@ -316,6 +316,7 @@
316316
<phase>generate-resources</phase>
317317
<configuration>
318318
<outputDirectory>${project.basedir}/${jars.directory}</outputDirectory>
319+
<excludeArtifactIds>maven-resolver-api</excludeArtifactIds>
319320
</configuration>
320321
</execution>
321322
<execution>

target-platform/target-platform.target

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,6 @@
3232
<unit id="org.eclipse.wst.common.emf" version="0.0.0"/>
3333
<unit id="org.eclipse.wst.xsd.core" version="0.0.0"/>
3434
</location>
35-
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
36-
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.4/"/>
37-
<repository location="https://download.eclipse.org/tm4e/releases/0.11.0/"/>
38-
<repository location="https://download.eclipse.org/lsp4e/releases/0.26.0/"/>
39-
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.22.0/"/>
40-
<repository location="https://download.eclipse.org/mylyn/updates/release/4.2.0/"/>
41-
<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
42-
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
43-
</location>
4435
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
4536
<repository location="https://download.eclipse.org/cbi/updates/license/"/>
4637
<unit id="org.eclipse.license.feature.group" version="0.0.0"/>
@@ -101,8 +92,7 @@
10192
</dependency>
10293
</dependencies>
10394
</location>
104-
<location includeDependencyDepth="none" includeDependencyScopes="compile" includeSource="false" label="M2E Workspace CLI" missingManifest="error" type="Maven">
105-
<!-- Dedicated location to *NOT* include sources -->
95+
<location includeDependencyDepth="none" includeDependencyScopes="compile" label="M2E Workspace CLI" missingManifest="error" type="Maven">
10696
<dependencies>
10797
<dependency>
10898
<groupId>io.takari.m2e.workspace</groupId>
@@ -169,5 +159,24 @@ Import-Package: !*
169159
]]></instructions>
170160
</location>
171161
<location type="Target" uri="file:${project_loc:/m2e-core}/target-platform/m2e-runtimes.target"/>
162+
<location includeDependencyDepth="none" includeSource="true" label="Maven Resolver" missingManifest="generate" type="Maven">
163+
<dependencies>
164+
<dependency>
165+
<groupId>org.apache.maven.resolver</groupId>
166+
<artifactId>maven-resolver-api</artifactId>
167+
<version>1.9.20</version>
168+
<type>jar</type>
169+
</dependency>
170+
</dependencies>
171+
</location>
172+
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
173+
<repository location="https://download.eclipse.org/lsp4e/releases/0.26.0/"/>
174+
<repository location="https://download.eclipse.org/lsp4j/updates/releases/0.22.0/"/>
175+
<repository location="https://download.eclipse.org/mylyn/updates/release/4.2.0/"/>
176+
<repository location="https://download.eclipse.org/tm4e/releases/0.11.0/"/>
177+
<repository location="https://download.eclipse.org/wildwebdeveloper/releases/1.3.4/"/>
178+
<unit id="org.eclipse.lsp4e" version="0.0.0"/>
179+
<unit id="org.eclipse.wildwebdeveloper.xml.feature.feature.group" version="0.0.0"/>
180+
</location>
172181
</locations>
173182
</target>

0 commit comments

Comments
 (0)