Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2014-08-15 10:46:32 -0400
committerIgor Fedorenko2014-08-15 10:47:14 -0400
commit08d98da9544e4567d2b4496c6e9d68158bccc762 (patch)
treee63573f834b60f4dd5f1bdcb3467e3fb438b3c46
parent75d4cc73239ccad3f45cd2452f14aaa5d019752c (diff)
downloadm2e-core-08d98da9544e4567d2b4496c6e9d68158bccc762.tar.gz
m2e-core-08d98da9544e4567d2b4496c6e9d68158bccc762.tar.xz
m2e-core-08d98da9544e4567d2b4496c6e9d68158bccc762.zip
411944 don't embed javax.inject jar in m2e maven runtime
Change-Id: Idae44808775f3d86e2dbc583616cbcfb0ebda3b0 Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>
-rw-r--r--m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml6
-rw-r--r--org.eclipse.m2e.core/META-INF/MANIFEST.MF1
-rw-r--r--org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/launch/MavenEmbeddedRuntime.java2
3 files changed, 4 insertions, 5 deletions
diff --git a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
index 8f77a8b6..53f8e3a4 100644
--- a/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
+++ b/m2e-maven-runtime/org.eclipse.m2e.maven.runtime/pom.xml
@@ -137,7 +137,7 @@
<configuration>
<instructions>
<Embed-Dependency>
- *;scope=compile|runtime;artifactId=!aopalliance|apache-maven|slf4j-api
+ *;scope=compile|runtime;artifactId=!aopalliance|apache-maven|slf4j-api|javax.inject
</Embed-Dependency>
<Embed-Directory>jars</Embed-Directory>
@@ -149,7 +149,6 @@
org.sonatype.plexus.*;provider=m2e;mandatory:=provider,
org.eclipse.aether.*;provider=m2e;mandatory:=provider,
com.google.inject.*;provider=m2e;mandatory:=provider,
- javax.inject.*;provider=m2e;mandatory:=provider,
com.squareup.okhttp.*;provider=m2e;mandatory:=provider,
io.tesla.*;provider=m2e;mandatory:=provider,
io.takari.*;provider=m2e;mandatory:=provider,
@@ -160,7 +159,8 @@
</Import-Package>
<Require-Bundle>
org.slf4j.api;bundle-version="1.6.2",
- org.eclipse.m2e.maven.runtime.slf4j.simple;bundle-version="[1.6.0,1.7.0)"
+ org.eclipse.m2e.maven.runtime.slf4j.simple;bundle-version="[1.6.0,1.7.0)",
+ javax.inject;bundle-version="1.0.0";visibility:=reexport
</Require-Bundle>
<Bundle-ClassPath>.,{maven-dependencies}</Bundle-ClassPath>
diff --git a/org.eclipse.m2e.core/META-INF/MANIFEST.MF b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
index 07efd385..ce33b8ab 100644
--- a/org.eclipse.m2e.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.core/META-INF/MANIFEST.MF
@@ -51,4 +51,3 @@ Export-Package: org.eclipse.m2e.core,
org.eclipse.m2e.core.repository
MavenArtifact-GroupId: org.eclipse.m2e
MavenArtifact-ArtifactId: org.eclipse.m2e.core
-Import-Package: javax.inject;provider=m2e
diff --git a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/launch/MavenEmbeddedRuntime.java b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/launch/MavenEmbeddedRuntime.java
index 48d331f0..0e19768d 100644
--- a/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/launch/MavenEmbeddedRuntime.java
+++ b/org.eclipse.m2e.core/src/org/eclipse/m2e/core/internal/launch/MavenEmbeddedRuntime.java
@@ -114,7 +114,7 @@ public class MavenEmbeddedRuntime extends AbstractMavenRuntime {
addBundleClasspathEntries(allentries, mavenRuntimeBundle);
// find and add more bundles
- for(String sname : new String[] {"org.slf4j.api", "org.eclipse.m2e.maven.runtime.slf4j.simple"}) {
+ for(String sname : new String[] {"org.slf4j.api", "org.eclipse.m2e.maven.runtime.slf4j.simple", "javax.inject"}) {
Bundle dependency = Bundles.findDependencyBundle(mavenRuntimeBundle, sname);
if(dependency != null) {
addBundleClasspathEntries(allentries, dependency);

Back to the top