Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Migrate to latest container

  • Loading branch information...
commit f34cc368901088d543e1d0c7dbadee2f4d8931da 1 parent 20f9236
@mcculls mcculls authored
View
10 eventbus/pom.xml
@@ -40,13 +40,13 @@
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
- <scope>provided</scope>
+ <optional>true</optional>
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-bean</artifactId>
- <scope>provided</scope>
+ <groupId>javax.inject</groupId>
+ <artifactId>javax.inject</artifactId>
+ <optional>true</optional>
</dependency>
<dependency>
@@ -56,4 +56,4 @@
</dependency>
</dependencies>
-</project>
+</project>
View
13 inject/pom.xml
@@ -38,15 +38,8 @@
-->
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-bean</artifactId>
- <exclusions>
- <!-- exclude non-aop guice version that inject-bean includes -->
- <exclusion>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guice</artifactId>
- </exclusion>
- </exclusions>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.inject</artifactId>
</dependency>
<dependency>
@@ -71,4 +64,4 @@
</dependency>
</dependencies>
-</project>
+</project>
View
3  inject/src/main/java/org/sonatype/sisu/goodies/inject/converter/TypeConverterSupport.java
@@ -13,11 +13,10 @@
package org.sonatype.sisu.goodies.inject.converter;
-import org.sonatype.guice.bean.converters.AbstractTypeConverter;
-
import com.google.inject.ProvisionException;
import com.google.inject.TypeLiteral;
import com.google.inject.spi.TypeConverter;
+import org.eclipse.sisu.wire.AbstractTypeConverter;
/**
* Support for {@link TypeConverter} implementations.
View
2  inject/src/main/java/org/sonatype/sisu/goodies/inject/properties/PropertiesModule.java
@@ -17,12 +17,12 @@
import java.util.Properties;
import java.util.Set;
-import org.sonatype.guice.bean.binders.ParameterKeys;
import org.sonatype.sisu.goodies.common.Properties2;
import org.sonatype.sisu.goodies.inject.ModuleSupport;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
+import org.eclipse.sisu.wire.ParameterKeys;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
View
8 jmx/src/test/java/org/sonatype/sisu/goodies/jmx/MBeanExporterGuiceTrial.java
@@ -19,10 +19,6 @@
import javax.inject.Named;
import javax.management.MBeanServer;
-import org.sonatype.guice.bean.binders.SpaceModule;
-import org.sonatype.guice.bean.binders.WireModule;
-import org.sonatype.guice.bean.reflect.URLClassSpace;
-import org.sonatype.inject.BeanScanning;
import org.sonatype.sisu.litmus.testsupport.TestSupport;
import com.google.common.collect.Lists;
@@ -30,6 +26,10 @@
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
+import org.eclipse.sisu.space.BeanScanning;
+import org.eclipse.sisu.space.SpaceModule;
+import org.eclipse.sisu.space.URLClassSpace;
+import org.eclipse.sisu.wire.WireModule;
import org.junit.Before;
import org.junit.Test;
import org.weakref.jmx.Flatten;
View
23 pom.xml
@@ -47,7 +47,7 @@
</prerequisites>
<properties>
- <sisu-guice.version>3.1.4</sisu-guice.version>
+ <sisu-guice.version>3.1.8</sisu-guice.version>
</properties>
<dependencyManagement>
@@ -77,22 +77,15 @@
</dependency>
<dependency>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-inject-bean</artifactId>
- <version>2.3.4</version>
+ <groupId>org.eclipse.sisu</groupId>
+ <artifactId>org.eclipse.sisu.inject</artifactId>
+ <version>0.1.1</version>
</dependency>
<dependency>
<groupId>org.sonatype.sisu</groupId>
<artifactId>sisu-guice</artifactId>
<version>${sisu-guice.version}</version>
- <exclusions>
- <!-- Exclude sisu-guava, use stock guava 10+ instead -->
- <exclusion>
- <groupId>org.sonatype.sisu</groupId>
- <artifactId>sisu-guava</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -116,7 +109,7 @@
<dependency>
<groupId>org.sonatype.sisu.litmus</groupId>
<artifactId>litmus-testsupport</artifactId>
- <version>1.6</version>
+ <version>1.8-SNAPSHOT</version>
</dependency>
<dependency>
@@ -300,8 +293,10 @@
<bannedDependencies>
<searchTransitive>true</searchTransitive>
<excludes>
- <!-- Keep junit out, use junit-dep instead -->
- <exclude>junit:junit</exclude>
+ <!-- Keep old junits out -->
+ <exclude>junit:junit:(,4.10]</exclude>
+ <exclude>junit:junit-dep</exclude>
+
<!-- Keep all JCL out, use jcl-over-slf4j instead -->
<exclude>commons-logging:commons-logging</exclude>
<exclude>commons-logging:commons-logging-api</exclude>
View
9 servlet/src/main/java/org/sonatype/sisu/goodies/servlet/sisu/SisuServletContextListener.java
@@ -18,16 +18,15 @@
import javax.servlet.ServletContext;
import javax.servlet.ServletContextEvent;
-import org.sonatype.guice.bean.binders.SpaceModule;
-import org.sonatype.guice.bean.binders.WireModule;
-import org.sonatype.guice.bean.reflect.URLClassSpace;
-import org.sonatype.inject.BeanScanning;
-
import com.google.common.collect.Lists;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.Module;
import com.google.inject.servlet.GuiceServletContextListener;
+import org.eclipse.sisu.space.BeanScanning;
+import org.eclipse.sisu.space.SpaceModule;
+import org.eclipse.sisu.space.URLClassSpace;
+import org.eclipse.sisu.wire.WireModule;
import org.jetbrains.annotations.NonNls;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

0 comments on commit f34cc36

Please sign in to comment.
Something went wrong with that request. Please try again.