diff --git a/apache-maven/pom.xml b/apache-maven/pom.xml
index ce547e777e65..9794928cabb5 100644
--- a/apache-maven/pom.xml
+++ b/apache-maven/pom.xml
@@ -48,8 +48,8 @@
maven-compat
- org.sonatype.sisu
- sisu-inject-plexus
+ org.eclipse.sisu
+ org.eclipse.sisu.plexus
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 6c611771d88a..f6985d97b130 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -76,8 +76,8 @@ under the License.
test
- org.sonatype.sisu
- sisu-inject-plexus
+ org.eclipse.sisu
+ org.eclipse.sisu.plexus
org.codehaus.plexus
diff --git a/maven-compat/pom.xml b/maven-compat/pom.xml
index 3bdb1aa53c21..e098fade5311 100644
--- a/maven-compat/pom.xml
+++ b/maven-compat/pom.xml
@@ -54,8 +54,8 @@
plexus-interpolation
- org.sonatype.sisu
- sisu-inject-plexus
+ org.eclipse.sisu
+ org.eclipse.sisu.plexus
org.codehaus.plexus
diff --git a/maven-core/pom.xml b/maven-core/pom.xml
index dcc269947b5a..7dbde4a8f4c4 100644
--- a/maven-core/pom.xml
+++ b/maven-core/pom.xml
@@ -72,8 +72,8 @@
- org.sonatype.sisu
- sisu-inject-plexus
+ org.eclipse.sisu
+ org.eclipse.sisu.plexus
org.codehaus.plexus
diff --git a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
index 9d772f70b4c0..76768345cf99 100644
--- a/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
+++ b/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
@@ -58,6 +58,7 @@ public class DefaultArtifactFilterManager
artifacts.add( "plexus:plexus-container-default" );
artifacts.add( "org.sonatype.spice:spice-inject-plexus" );
artifacts.add( "org.sonatype.sisu:sisu-inject-plexus" );
+ artifacts.add( "org.eclipse.sisu:org.eclipse.sisu.plexus" );
artifacts.add( "org.apache.maven:maven-artifact" );
artifacts.add( "org.apache.maven:maven-aether-provider" );
artifacts.add( "org.apache.maven:maven-artifact-manager" );
diff --git a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
index 0db5b4b29f64..3cc027e3a3c3 100644
--- a/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
+++ b/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java
@@ -199,11 +199,10 @@ private void importMavenApi( Map imports )
imports.put( "org.codehaus.plexus.logging", coreRealm );
imports.put( "org.codehaus.plexus.personality", coreRealm );
- // javax.inject, sisu-inject (JSR-330)
+ // javax.inject (JSR-330)
imports.put( "javax.inject.*", coreRealm );
imports.put( "javax.enterprise.inject.*", coreRealm );
- imports.put( "org.sonatype.inject.*", coreRealm );
-
+
// com.google
//
// We may potentially want to export these, but right now I'm not sure that anything Guice specific needs
diff --git a/maven-embedder/pom.xml b/maven-embedder/pom.xml
index 49a7b57629a9..aaa6ff625af8 100644
--- a/maven-embedder/pom.xml
+++ b/maven-embedder/pom.xml
@@ -55,8 +55,8 @@
plexus-classworlds
- org.sonatype.sisu
- sisu-inject-plexus
+ org.eclipse.sisu
+ org.eclipse.sisu.plexus
org.codehaus.plexus
diff --git a/maven-model-builder/pom.xml b/maven-model-builder/pom.xml
index a5b1aa196fe2..c8d95c6229de 100644
--- a/maven-model-builder/pom.xml
+++ b/maven-model-builder/pom.xml
@@ -43,8 +43,8 @@
- org.sonatype.sisu
- sisu-inject-plexus
+ org.eclipse.sisu
+ org.eclipse.sisu.plexus
test
diff --git a/maven-plugin-api/pom.xml b/maven-plugin-api/pom.xml
index 227f574526cf..5b33f7767d7e 100644
--- a/maven-plugin-api/pom.xml
+++ b/maven-plugin-api/pom.xml
@@ -49,8 +49,8 @@ under the License.
- org.sonatype.sisu
- sisu-inject-plexus
+ org.eclipse.sisu
+ org.eclipse.sisu.plexus
diff --git a/pom.xml b/pom.xml
index ed976757e268..2049e9f35154 100644
--- a/pom.xml
+++ b/pom.xml
@@ -49,7 +49,10 @@
1.5.5
1.16
3.0.10
- 2.3.0
+
+ 11.0.2
+ 3.1.3
+ 0.0.0.M2
2.4
1.3
1.7
@@ -175,17 +178,26 @@
plexus-utils
${plexusUtilsVersion}
+
+ com.google.guava
+ guava
+ ${guavaVersion}
+
org.sonatype.sisu
- sisu-inject-plexus
+ sisu-guice
+ ${guiceVersion}
+
+
+ org.sonatype.sisu
+ sisu-guice
+ ${guiceVersion}
+ no_aop
+
+
+ org.eclipse.sisu
+ org.eclipse.sisu.plexus
${sisuInjectVersion}
-
-
-
- org.sonatype.sisu.inject
- cglib
-
-
org.codehaus.plexus
@@ -278,6 +290,10 @@
org.codehaus.plexus
plexus-container-default
+
+ org.sonatype.sisu
+ sisu-inject-plexus
+