remove the now upstreamed AutoWiringModule

see https://git.opendaylight.org/gerrit/#/c/78984/
vorburger · Jan 23, 2019 · e1e70f1 · e1e70f1
1 parent 80a425a
commit e1e70f1
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 262 deletions.
diff --git a/pom.xml b/pom.xml
@@ -271,6 +271,10 @@
       <artifactId>log4j-slf4j-impl</artifactId>
     </dependency>
 
+    <dependency>
+      <groupId>org.opendaylight.infrautils</groupId>
+      <artifactId>inject.guice</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.inject.extensions</groupId>
       <artifactId>guice-multibindings</artifactId>
@@ -305,13 +309,6 @@
       <artifactId>mycila-guice-jsr250</artifactId>
       <scope>compile</scope>
     </dependency>
-
-    <!-- TODO remove when infrautils' ClasspathHellDuplicatesCheckRule pulls in classgraph, see https://git.opendaylight.org/gerrit/#/c/76625/ -->
-    <dependency>
-      <groupId>io.github.classgraph</groupId>
-      <artifactId>classgraph</artifactId>
-      <version>4.6.10</version>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/src/main/java/org/opendaylight/infrautils/inject/ClassPathScanner.java b/src/main/java/org/opendaylight/infrautils/inject/ClassPathScanner.java
diff --git a/src/main/java/org/opendaylight/infrautils/inject/guice/AutoWiringModule.java b/src/main/java/org/opendaylight/infrautils/inject/guice/AutoWiringModule.java
diff --git a/src/main/java/org/opendaylight/infrautils/inject/guice/GuiceClassPathBinder.java b/src/main/java/org/opendaylight/infrautils/inject/guice/GuiceClassPathBinder.java
diff --git a/src/test/java/org/opendaylight/infrautils/inject/tests/ClassPathScannerTest.java b/src/test/java/org/opendaylight/infrautils/inject/tests/ClassPathScannerTest.java
diff --git a/...t/java/org/opendaylight/infrautils/inject/tests/ClassPathScannerTestAnotherInterface.java b/...t/java/org/opendaylight/infrautils/inject/tests/ClassPathScannerTestAnotherInterface.java
diff --git a/...est/java/org/opendaylight/infrautils/inject/tests/ClassPathScannerTestImplementation.java b/...est/java/org/opendaylight/infrautils/inject/tests/ClassPathScannerTestImplementation.java
diff --git a/.../opendaylight/infrautils/inject/tests/ClassPathScannerTestNoInterfacesImplementation.java b/.../opendaylight/infrautils/inject/tests/ClassPathScannerTestNoInterfacesImplementation.java
diff --git a/src/test/java/org/opendaylight/infrautils/inject/tests/ClassPathScannerTestTopInterface.java b/src/test/java/org/opendaylight/infrautils/inject/tests/ClassPathScannerTestTopInterface.java