Cache: solve the split-package problem

mkouba · mkouba · commit c10d27026cd2 · 2025-10-17T14:09:02.000+02:00
- move the classes from the quarkus-cache-runtime-spi artifact to
quarkus-cache
- get rid of the quarkus-cache-runtime-spi artifact
- move CacheManagerInfoBuildItem to the quarkus-cache-deployment
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -3394,11 +3394,6 @@
                 <artifactId>quarkus-cache-deployment-spi</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            <dependency>
-                <groupId>io.quarkus</groupId>
-                <artifactId>quarkus-cache-runtime-spi</artifactId>
-                <version>${project.version}</version>
-            </dependency>
             <dependency>
                 <groupId>io.quarkus</groupId>
                 <artifactId>quarkus-google-cloud-functions</artifactId>
diff --git a/extensions/cache/deployment-spi/pom.xml b/extensions/cache/deployment-spi/pom.xml
@@ -18,10 +18,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-core-deployment</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-cache-runtime-spi</artifactId>
-        </dependency>
     </dependencies>
     
 </project>
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheManagerInfoBuildItem.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheManagerInfoBuildItem.java
@@ -1,4 +1,4 @@
-package io.quarkus.cache.deployment.spi;
+package io.quarkus.cache.deployment;
 
 import io.quarkus.builder.item.MultiBuildItem;
 import io.quarkus.cache.CacheManagerInfo;
diff --git a/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheProcessor.java b/extensions/cache/deployment/src/main/java/io/quarkus/cache/deployment/CacheProcessor.java
@@ -54,7 +54,6 @@
 import io.quarkus.cache.deployment.exception.UnsupportedRepeatedAnnotationException;
 import io.quarkus.cache.deployment.exception.VoidReturnTypeTargetException;
 import io.quarkus.cache.deployment.spi.AdditionalCacheNameBuildItem;
-import io.quarkus.cache.deployment.spi.CacheManagerInfoBuildItem;
 import io.quarkus.cache.deployment.spi.CacheTypeBuildItem;
 import io.quarkus.cache.runtime.CacheBuildConfig;
 import io.quarkus.cache.runtime.CacheInvalidateAllInterceptor;
diff --git a/extensions/cache/pom.xml b/extensions/cache/pom.xml
@@ -19,7 +19,6 @@
         <module>deployment</module>
         <module>deployment-spi</module>
         <module>runtime</module>
-        <module>runtime-spi</module>
         <module>runtime-dev</module>
     </modules>
 </project>
diff --git a/extensions/cache/runtime-spi/pom.xml b/extensions/cache/runtime-spi/pom.xml
diff --git a/extensions/cache/runtime/pom.xml b/extensions/cache/runtime/pom.xml
@@ -31,10 +31,6 @@
             <groupId>io.quarkus</groupId>
             <artifactId>quarkus-vertx</artifactId>
         </dependency>
-        <dependency>
-            <groupId>io.quarkus</groupId>
-            <artifactId>quarkus-cache-runtime-spi</artifactId>
-        </dependency>
         <dependency>
             <groupId>io.vertx</groupId>
             <artifactId>vertx-web</artifactId>
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/Cache.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/Cache.java
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheManager.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheManager.java
diff --git a/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheManagerInfo.java b/extensions/cache/runtime/src/main/java/io/quarkus/cache/CacheManagerInfo.java
diff --git a/extensions/infinispan-cache/deployment/src/main/java/io/quarkus/cache/infinispan/deployment/InfinispanCacheProcessor.java b/extensions/infinispan-cache/deployment/src/main/java/io/quarkus/cache/infinispan/deployment/InfinispanCacheProcessor.java
@@ -8,7 +8,7 @@
 import io.quarkus.arc.deployment.SyntheticBeanBuildItem;
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.cache.CompositeCacheKey;
-import io.quarkus.cache.deployment.spi.CacheManagerInfoBuildItem;
+import io.quarkus.cache.deployment.CacheManagerInfoBuildItem;
 import io.quarkus.cache.infinispan.runtime.CompositeKeyMarshallerBean;
 import io.quarkus.cache.infinispan.runtime.InfinispanCacheBuildRecorder;
 import io.quarkus.cache.infinispan.runtime.InfinispanCachesBuildTimeConfig;
diff --git a/extensions/redis-cache/deployment/src/main/java/io/quarkus/cache/redis/deployment/RedisCacheProcessor.java b/extensions/redis-cache/deployment/src/main/java/io/quarkus/cache/redis/deployment/RedisCacheProcessor.java
@@ -25,8 +25,8 @@
 import io.quarkus.arc.deployment.UnremovableBeanBuildItem;
 import io.quarkus.cache.CompositeCacheKey;
 import io.quarkus.cache.deployment.CacheDeploymentConstants;
+import io.quarkus.cache.deployment.CacheManagerInfoBuildItem;
 import io.quarkus.cache.deployment.CacheNamesBuildItem;
-import io.quarkus.cache.deployment.spi.CacheManagerInfoBuildItem;
 import io.quarkus.cache.redis.runtime.RedisCacheBuildRecorder;
 import io.quarkus.cache.redis.runtime.RedisCacheBuildTimeConfig;
 import io.quarkus.cache.redis.runtime.RedisCachesBuildTimeConfig;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.quarkus.cache.deployment.spi;`
	`1`	`+package io.quarkus.cache.deployment;`
`2`	`2`
`3`	`3`	`import io.quarkus.builder.item.MultiBuildItem;`
`4`	`4`	`import io.quarkus.cache.CacheManagerInfo;`