Merge pull request #2894 from jamezp/RESTEASY-2999

[RESTEASY-2999] Remove the resteasy-cache and move to the resteasy-ex…
resteasy · Sep 3, 2021 · cd4813a · cd4813a
2 parents 81b186f + b613b45
commit cd4813a
Show file tree

Hide file tree

Showing 29 changed files with 24 additions and 2,268 deletions.
diff --git a/distribution/assembly.xml b/distribution/assembly.xml
@@ -41,7 +41,6 @@
                 <include>org.jboss.resteasy:resteasy-json-p-provider</include>
                 <include>org.jboss.resteasy:resteasy-json-binding-provider</include>
                 <include>org.jboss.resteasy:resteasy-jackson2-provider</include>
-                <include>org.jboss.resteasy:resteasy-cache-core</include>
                 <include>org.jboss.resteasy:resteasy-cdi</include>
                 <include>org.jboss.resteasy:resteasy-jsapi</include>
                 <include>org.jboss.resteasy:resteasy-links</include>

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

diff --git a/docbook/reference/en/en-US/modules/Cache_NoCache_CacheControl.xml b/docbook/reference/en/en-US/modules/Cache_NoCache_CacheControl.xml
@@ -133,13 +133,13 @@ String rtn = target.resolveTemplate("id", "1").request().get(String.class);
           via your Application getSingletons() or getClasses() methods.  The underlying cache is Infinispan.  By default,
           RESTEasy will create an Infinispan cache for you.  Alternatively, you can create and pass in an instance
           of your cache to the ServerCacheFeature constructor.  You can also configure Infinispan by specifying
-          various parameters.  First, if you are using Maven you must depend on the resteasy-cache-core artifact:</para>
+          various parameters.  First, if you are using Maven you must depend on the cache-core artifact:</para>
 <programlisting>
 <![CDATA[
 <dependency>
-   <groupId>org.jboss.resteasy</groupId>
-   <artifactId>resteasy-cache-core</artifactId>
-   <version>5.0.0-SNAPSHOT</version>
+   <groupId>org.jboss.resteasy.cache</groupId>
+   <artifactId>cache-core</artifactId>
+   <version>${version.org.jboss.resteasy.cache}</version>
 </dependency>
 ]]>
 </programlisting>

diff --git a/docbook/reference/en/en-US/modules/I18N.xml b/docbook/reference/en/en-US/modules/I18N.xml
@@ -82,7 +82,7 @@
          </row>
          <row>
             <entry align="left">10000-10499</entry>
-            <entry align="left">resteasy-cache-core</entry>
+            <entry align="left">cache-core</entry>
          </row>
          <row>
             <entry align="left">10500-10999</entry>

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

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

diff --git a/resteasy-cache/pom.xml b/resteasy-cache/pom.xml
diff --git a/resteasy-cache/resteasy-cache-core/pom.xml b/resteasy-cache/resteasy-cache-core/pom.xml
diff --git a/...steasy-cache-core/src/main/java/org/jboss/resteasy/plugins/cache/server/HeaderHolder.java b/...steasy-cache-core/src/main/java/org/jboss/resteasy/plugins/cache/server/HeaderHolder.java