summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-05-14 13:29:59 +0200
committergjoranv <gv@verizonmedia.com>2022-06-08 11:45:21 +0200
commitf726fe79b84279fe2a80e857125a467f551854ed (patch)
tree9380accb6fd4bd4f844173aa6d19e90e4b91d653
parent5da809318217b36a990ec030145a547e9eebaef8 (diff)
Remove guice-multibindings, which is now empty and included in
.. the main guice artifact.
-rw-r--r--cloud-tenant-base-dependencies-enforcer/pom.xml1
-rw-r--r--container-dependencies-enforcer/pom.xml1
-rw-r--r--container-dependency-versions/pom.xml5
-rw-r--r--jdisc_core/pom.xml15
4 files changed, 1 insertions, 21 deletions
diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 87ea36f06fc..1e0a87ef86e 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -101,7 +101,6 @@
<include>com.google.j2objc:j2objc-annotations:[1.1]:jar:provided</include>
<include>com.google.inject.extensions:guice-assistedinject:[${guice.version}]:jar:provided</include>
- <include>com.google.inject.extensions:guice-multibindings:[${guice.version}]:jar:provided</include>
<include>com.google.inject:guice:[${guice.version}]:jar:provided:no_aop</include>
<include>com.sun.activation:javax.activation:[1.2.0]:jar:provided</include>
<include>com.sun.xml.bind:jaxb-core:[${jaxb.version}]:jar:provided</include>
diff --git a/container-dependencies-enforcer/pom.xml b/container-dependencies-enforcer/pom.xml
index 8f4c59eed5a..d716bba60ae 100644
--- a/container-dependencies-enforcer/pom.xml
+++ b/container-dependencies-enforcer/pom.xml
@@ -79,7 +79,6 @@
<include>com.google.j2objc:j2objc-annotations:[1.1]:jar:provided</include>
<include>com.google.inject.extensions:guice-assistedinject:[${guice.version}]:jar:provided</include>
- <include>com.google.inject.extensions:guice-multibindings:[${guice.version}]:jar:provided</include>
<include>com.google.inject:guice:[${guice.version}]:jar:provided:no_aop</include>
<include>com.sun.activation:javax.activation:[1.2.0]:jar:provided</include>
<include>com.sun.xml.bind:jaxb-core:[${jaxb.version}]:jar:provided</include>
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index 3f9b9a0c81b..d4dc8d026de 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -112,11 +112,6 @@
<version>${guice.version}</version>
</dependency>
<dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-multibindings</artifactId>
- <version>${guice.version}</version>
- </dependency>
- <dependency>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
<version>${guice.version}</version>
diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml
index 1943e2905fa..97b9db4462d 100644
--- a/jdisc_core/pom.xml
+++ b/jdisc_core/pom.xml
@@ -83,19 +83,7 @@
<artifactId>guice-assistedinject</artifactId>
<scope>compile</scope>
<exclusions>
- <!-- Depends on AOP version of Guice 3.0, which is not Java 8 compatible -->
- <exclusion>
- <groupId>com.google.inject</groupId>
- <artifactId>guice</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.inject.extensions</groupId>
- <artifactId>guice-multibindings</artifactId>
- <scope>compile</scope>
- <exclusions>
- <!-- Depends on AOP version of Guice 3.0, which is not Java 8 compatible -->
+ <!-- Depends on AOP version of Guice, which is not Java 8 compatible -->
<exclusion>
<groupId>com.google.inject</groupId>
<artifactId>guice</artifactId>
@@ -245,7 +233,6 @@
<argument>__REPLACE_VERSION__${project.build.directory}/dependency/guava.jar</argument>
<argument>${project.build.directory}/dependency/guice-no_aop.jar</argument>
<argument>${project.build.directory}/dependency/guice-assistedinject.jar</argument>
- <argument>${project.build.directory}/dependency/guice-multibindings.jar</argument>
<argument>${project.build.directory}/dependency/javax.annotation-api.jar</argument>
<argument>${project.build.directory}/dependency/org.apache.felix.log.jar</argument>
<argument>${project.build.directory}/dependency/slf4j-api.jar</argument>