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 /org.eclipse.m2e.core
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>
Diffstat (limited to 'org.eclipse.m2e.core')
-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
2 files changed, 1 insertions, 2 deletions
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