Merge pull request #2878 from jamezp/RESTEASY-2967

[RESTEASY-2967] Remove the Google Guice integration.
resteasy · Jul 29, 2021 · 8e64b06 · 8e64b06
2 parents 30519d4 + 974a35e
commit 8e64b06
Show file tree

Hide file tree

Showing 31 changed files with 0 additions and 1,829 deletions.
diff --git a/distribution/assembly.xml b/distribution/assembly.xml
@@ -51,7 +51,6 @@
                 <include>org.jboss.resteasy:resteasy-json-binding-provider</include>
                 <include>org.jboss.resteasy:resteasy-jackson2-provider</include>
                 <include>org.jboss.resteasy:resteasy-spring</include>
-                <include>org.jboss.resteasy:resteasy-guice</include>
                 <include>org.jboss.resteasy:resteasy-cache-core</include>
                 <include>org.jboss.resteasy:resteasy-cdi</include>
                 <include>org.jboss.resteasy:resteasy-jsapi</include>

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -98,11 +98,6 @@
             <artifactId>resteasy-spring</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-guice</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-cache-core</artifactId>

diff --git a/docbook/reference/en/en-US/master.xml b/docbook/reference/en/en-US/master.xml
@@ -50,7 +50,6 @@
                 <!ENTITY Json SYSTEM "modules/Json.xml">
                 <!ENTITY Json-p SYSTEM "modules/Json-p.xml">
                 <!ENTITY Jaxb SYSTEM "modules/Jaxb.xml">
-                <!ENTITY Guice SYSTEM "modules/Guice.xml">
                 <!ENTITY Interceptors SYSTEM "modules/Interceptors.xml">
                 <!ENTITY Books SYSTEM "modules/Books.xml">
                 <!ENTITY CDI SYSTEM "modules/CDI.xml">
@@ -150,7 +149,6 @@ This one is short
    &RESTEasy_EJB_Integration;
    &RESTEasy_Spring_Integration;
    &CDI;
-    &Guice;
    &RESTEasy_Client_Framework;
    &MicroProfile_Rest_Client;
    &AJAX_Client;

diff --git a/docbook/reference/en/en-US/modules/Guice.xml b/docbook/reference/en/en-US/modules/Guice.xml
diff --git a/docbook/reference/en/en-US/modules/I18N.xml b/docbook/reference/en/en-US/modules/I18N.xml
@@ -88,10 +88,6 @@
             <entry align="left">10500-10999</entry>
             <entry align="left">resteasy-cdi</entry>
          </row>
-         <row>
-            <entry align="left">11000-11499</entry>
-            <entry align="left">resteasy-guice</entry>
-         </row>
          <row>
             <entry align="left">11500-11999</entry>
             <entry align="left">resteasy-jsapi</entry>

diff --git a/pom.xml b/pom.xml
@@ -113,7 +113,6 @@
                 <module>resteasy-client-reactor-netty</module>
                 <module>providers</module>
                 <module>resteasy-cache</module>
-                <module>resteasy-guice</module>
                 <module>security</module>
                 <module>resteasy-links</module>
                 <module>resteasy-jsapi</module>

diff --git a/resteasy-bom/pom.xml b/resteasy-bom/pom.xml
@@ -31,11 +31,6 @@
                 <artifactId>resteasy-cache-core</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.jboss.resteasy</groupId>
-                <artifactId>resteasy-guice</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-html</artifactId>

diff --git a/resteasy-dependencies-bom/pom.xml b/resteasy-dependencies-bom/pom.xml
@@ -19,7 +19,6 @@
         <version.com.fasterxml.jackson>2.12.3</version.com.fasterxml.jackson>
         <version.com.google.guava>30.1.1-jre</version.com.google.guava>
         <version.com.google.guava.failureaccess>1.0.1</version.com.google.guava.failureaccess>
-        <version.com.google.inject.guice>5.0.1</version.com.google.inject.guice>
         <version.com.io7m.xom>1.2.10</version.com.io7m.xom>
         <version.jakarta.mail>1.6.5</version.jakarta.mail>
         <version.org.glassfish.jaxb.jaxb>2.3.3-b02</version.org.glassfish.jaxb.jaxb>
@@ -489,17 +488,6 @@
                 <artifactId>failureaccess</artifactId>
                 <version>${version.com.google.guava.failureaccess}</version>
             </dependency>
-            <dependency>
-                <groupId>com.google.inject</groupId>
-                <artifactId>guice</artifactId>
-                <version>${version.com.google.inject.guice}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.inject</groupId>
-                        <artifactId>javax.inject</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>jakarta.inject</groupId>
                 <artifactId>jakarta.inject-api</artifactId>