diff --git a/legacy/pom.xml b/legacy/pom.xml index 5f0ccb83..3c3c497f 100644 --- a/legacy/pom.xml +++ b/legacy/pom.xml @@ -27,22 +27,22 @@ - 3.2.6 + 4.0 - org.sonatype.sisu - sisu-guice - ${sisu-guice.version} + com.google.inject + guice + ${guice.version} - org.sonatype.sisu - sisu-guice + com.google.inject + guice no_aop - ${sisu-guice.version} + ${guice.version} aopalliance diff --git a/legacy/wrappers/sisu-inject-bean/pom.xml b/legacy/wrappers/sisu-inject-bean/pom.xml index 423e3d6c..f28e9f88 100644 --- a/legacy/wrappers/sisu-inject-bean/pom.xml +++ b/legacy/wrappers/sisu-inject-bean/pom.xml @@ -31,8 +31,8 @@ cdi-api - org.sonatype.sisu - sisu-guice + com.google.inject + guice no_aop diff --git a/legacy/wrappers/sisu-inject-bean/src/test/java/org/sonatype/guice/bean/binders/BeanImportTest.java b/legacy/wrappers/sisu-inject-bean/src/test/java/org/sonatype/guice/bean/binders/BeanImportTest.java index 1329d509..842643ca 100644 --- a/legacy/wrappers/sisu-inject-bean/src/test/java/org/sonatype/guice/bean/binders/BeanImportTest.java +++ b/legacy/wrappers/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/legacy/wrappers/sisu-inject-plexus/src/test/java/org/codehaus/plexus/logging/CustomLoggerFactoryTest.java b/legacy/wrappers/sisu-inject-plexus/src/test/java/org/codehaus/plexus/logging/CustomLoggerFactoryTest.java index 17ab776a..91239cc3 100644 --- a/legacy/wrappers/sisu-inject-plexus/src/test/java/org/codehaus/plexus/logging/CustomLoggerFactoryTest.java +++ b/legacy/wrappers/sisu-inject-plexus/src/test/java/org/codehaus/plexus/logging/CustomLoggerFactoryTest.java @@ -1,7 +1,5 @@ package org.codehaus.plexus.logging; -import javax.inject.Inject; - import org.codehaus.plexus.PlexusTestCase; public class CustomLoggerFactoryTest @@ -9,9 +7,6 @@ public class CustomLoggerFactoryTest { 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() ); } }