Update to official Guice distro

sonatype · Jun 23, 2015 · b103a21 · b103a21
1 parent 4cd5ad7
commit b103a21
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 19 deletions.
diff --git a/legacy/pom.xml b/legacy/pom.xml
@@ -27,22 +27,22 @@
   </modules>
 
   <properties>
-    <sisu-guice.version>3.2.6</sisu-guice.version>
+    <guice.version>4.0</guice.version>
   </properties>
 
   <dependencyManagement>
     <dependencies>
 
       <dependency>
-        <groupId>org.sonatype.sisu</groupId>
-        <artifactId>sisu-guice</artifactId>
-        <version>${sisu-guice.version}</version>
+        <groupId>com.google.inject</groupId>
+        <artifactId>guice</artifactId>
+        <version>${guice.version}</version>
       </dependency>
       <dependency>
-        <groupId>org.sonatype.sisu</groupId>
-        <artifactId>sisu-guice</artifactId>
+        <groupId>com.google.inject</groupId>
+        <artifactId>guice</artifactId>
         <classifier>no_aop</classifier>
-        <version>${sisu-guice.version}</version>
+        <version>${guice.version}</version>
         <exclusions>
           <exclusion>
             <groupId>aopalliance</groupId>

diff --git a/legacy/wrappers/sisu-inject-bean/pom.xml b/legacy/wrappers/sisu-inject-bean/pom.xml
@@ -31,8 +31,8 @@
       <artifactId>cdi-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.sonatype.sisu</groupId>
-      <artifactId>sisu-guice</artifactId>
+      <groupId>com.google.inject</groupId>
+      <artifactId>guice</artifactId>
       <classifier>no_aop</classifier>
     </dependency>
     <dependency>

diff --git a/...appers/sisu-inject-bean/src/test/java/org/sonatype/guice/bean/binders/BeanImportTest.java b/...appers/sisu-inject-bean/src/test/java/org/sonatype/guice/bean/binders/BeanImportTest.java
@@ -29,7 +29,6 @@
 
 import junit.framework.TestCase;
 
-import org.slf4j.Logger;
 import org.sonatype.guice.bean.reflect.ClassSpace;
 import org.sonatype.guice.bean.reflect.URLClassSpace;
 import org.sonatype.inject.BeanEntry;
@@ -136,9 +135,6 @@ static abstract class AbstractX
         @Inject
         Injector injector;
 
-        @Inject
-        Logger logger;
-
         @Inject
         ImplicitX implicitX;
 

diff --git a/...sisu-inject-plexus/src/test/java/org/codehaus/plexus/logging/CustomLoggerFactoryTest.java b/...sisu-inject-plexus/src/test/java/org/codehaus/plexus/logging/CustomLoggerFactoryTest.java
@@ -1,17 +1,12 @@
 package org.codehaus.plexus.logging;
 
-import javax.inject.Inject;
-
 import org.codehaus.plexus.PlexusTestCase;
 
 public class CustomLoggerFactoryTest
     extends PlexusTestCase
 {
     static class ComponentWithSLF4J
     {
-        @Inject
-        org.slf4j.Logger loggerDependency;
-
         org.slf4j.Logger loggerRequirement;
     }
 
@@ -22,7 +17,6 @@ public void testCustomLoggerName()
 
         final ComponentWithSLF4J component = lookup( ComponentWithSLF4J.class );
 
-        assertEquals( customName, component.loggerDependency.getName() );
         assertEquals( customName, component.loggerRequirement.getName() );
     }
 }