[02/50] git commit: Avoid mixing two flavours of Guice on the classpath.

[ah...@apache.org]

Avoid mixing two flavours of Guice on the classpath.

Note: the main blocker to using Google-Guice for Maven3 is the lack of a release with the new ProvisionListener API, which is needed to support Plexus lifecycles. While there are other fixes/features in Sisu-Guice that are nice-to-have (such as removal of the big global singleton lock) they aren't strictly required for Maven3.

Signed-off-by: Jason van Zyl <ja...@tesla.io>


Project: http://git-wip-us.apache.org/repos/asf/maven/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven/commit/c5f161a8
Tree: http://git-wip-us.apache.org/repos/asf/maven/tree/c5f161a8
Diff: http://git-wip-us.apache.org/repos/asf/maven/diff/c5f161a8

Branch: refs/heads/slf4j-log4j2
Commit: c5f161a8d6855222be1bc3cb167d46bb18aaf167
Parents: f50ae7b
Author: Stuart McCulloch <mc...@gmail.com>
Authored: Tue Mar 19 01:12:21 2013 +0000
Committer: Jason van Zyl <ja...@tesla.io>
Committed: Tue Mar 19 10:16:40 2013 -0700

----------------------------------------------------------------------
 maven-aether-provider/pom.xml |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/maven/blob/c5f161a8/maven-aether-provider/pom.xml
----------------------------------------------------------------------
diff --git a/maven-aether-provider/pom.xml b/maven-aether-provider/pom.xml
index 926c51e..35daff1 100644
--- a/maven-aether-provider/pom.xml
+++ b/maven-aether-provider/pom.xml
@@ -88,9 +88,8 @@ under the License.
       <artifactId>plexus-utils</artifactId>
     </dependency>
     <dependency>
-      <groupId>com.google.inject</groupId>
-      <artifactId>guice</artifactId>
-      <version>3.0</version>
+      <groupId>org.sonatype.sisu</groupId>
+      <artifactId>sisu-guice</artifactId>
       <classifier>no_aop</classifier>
       <optional>true</optional>
       <exclusions>