Skip to content

Commit 4aaf80e

Browse files
committed
Upgrade to 16.0 and 3.27
1 parent f256419 commit 4aaf80e

File tree

10 files changed

+17
-193
lines changed

10 files changed

+17
-193
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
:project-version: 1.2.0
2-
:infinispan-version: 15.0.19.Final
1+
:project-version: 2.0.0
2+
:infinispan-version: 16.0.0.Dev04
33
:examples-dir: ./../examples/

docs/modules/ROOT/pages/includes/quarkus-infinispan-embedded_quarkus.infinispan-embedded.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ Environment variable: `+++QUARKUS_INFINISPAN_EMBEDDED_CLUSTERED+++`
4747
endif::add-copy-button-to-env-var[]
4848
--
4949
|boolean
50-
|`true`
50+
|`+++true+++`
5151

5252
|===
5353

extension/deployment/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
<artifactId>quarkus-caffeine-deployment</artifactId>
2525
</dependency>
2626
<dependency>
27-
<groupId>io.quarkus</groupId>
28-
<artifactId>quarkus-micrometer-registry-prometheus-deployment</artifactId>
27+
<groupId>io.quarkiverse.micrometer.registry</groupId>
28+
<artifactId>quarkus-micrometer-registry-prometheus-v1-deployment</artifactId>
29+
<version>${quarkus-micrometer-registry-prometheus-v1.version}</version>
30+
<optional>true</optional>
2931
</dependency>
3032
<dependency>
3133
<groupId>io.quarkus</groupId>

extension/deployment/src/main/java/io/quarkiverse/infinispan/embedded/deployment/InfinispanEmbeddedProcessor.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
import jakarta.enterprise.inject.Default;
1818

1919
import org.infinispan.AdvancedCache;
20-
import org.infinispan.commons.marshall.AbstractExternalizer;
21-
import org.infinispan.commons.marshall.AdvancedExternalizer;
2220
import org.infinispan.configuration.cache.AbstractModuleConfigurationBuilder;
2321
import org.infinispan.configuration.cache.StoreConfiguration;
2422
import org.infinispan.configuration.cache.StoreConfigurationBuilder;
@@ -30,7 +28,6 @@
3028
import org.infinispan.interceptors.AsyncInterceptor;
3129
import org.infinispan.manager.EmbeddedCacheManager;
3230
import org.infinispan.notifications.Listener;
33-
import org.infinispan.persistence.spi.CacheWriter;
3431
import org.infinispan.persistence.spi.NonBlockingStore;
3532
import org.infinispan.protostream.BaseMarshaller;
3633
import org.infinispan.protostream.EnumMarshaller;
@@ -161,7 +158,6 @@ ProtobufInitializers setup(BuildProducer<ReflectiveClassBuildItem> reflectiveCla
161158
// We need to use the CombinedIndex for these interfaces in order to discover implementations of the various
162159
// subclasses.
163160
addReflectionForClass(CacheLoader.class, combinedIndex, reflectiveClass, excludedClasses);
164-
addReflectionForClass(CacheWriter.class, combinedIndex, reflectiveClass, excludedClasses);
165161
addReflectionForClass(NonBlockingStore.class, combinedIndex, reflectiveClass, excludedClasses);
166162
addReflectionForName(AsyncInterceptor.class.getName(), true, combinedIndex, reflectiveClass, false, true,
167163
excludedClasses);
@@ -181,11 +177,6 @@ ProtobufInitializers setup(BuildProducer<ReflectiveClassBuildItem> reflectiveCla
181177
}
182178
}
183179

184-
// We only register the app advanced externalizers as all of the Infinispan ones are explicitly defined
185-
addReflectionForClass(AdvancedExternalizer.class, appOnlyIndex, reflectiveClass, Collections.emptySet());
186-
// Due to the index not containing AbstractExternalizer it doesn't know that it implements AdvancedExternalizer
187-
// thus we also have to include classes that extend AbstractExternalizer
188-
addReflectionForClass(AbstractExternalizer.class, appOnlyIndex, reflectiveClass, Collections.emptySet());
189180
addReflectionForClass(CacheHealth.class, appOnlyIndex, reflectiveClass, Collections.emptySet());
190181
addReflectionForClass(ClusterHealth.class, appOnlyIndex, reflectiveClass, Collections.emptySet());
191182

extension/runtime/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
<artifactId>quarkus-caffeine</artifactId>
2727
</dependency>
2828
<dependency>
29-
<groupId>io.quarkus</groupId>
30-
<artifactId>quarkus-micrometer-registry-prometheus</artifactId>
29+
<groupId>io.quarkiverse.micrometer.registry</groupId>
30+
<artifactId>quarkus-micrometer-registry-prometheus-v1</artifactId>
31+
<version>${quarkus-micrometer-registry-prometheus-v1.version}</version>
32+
<optional>true</optional>
3133
</dependency>
3234
<dependency>
3335
<groupId>io.quarkus</groupId>

extension/runtime/src/main/java/io/quarkiverse/infinispan/embedded/runtime/InfinispanEmbeddedProducer.java

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
import java.io.IOException;
66
import java.io.InputStream;
7-
import java.io.UncheckedIOException;
87
import java.util.List;
98
import java.util.Map;
109

@@ -125,16 +124,6 @@ private static class QuarkusContextInitializer implements SerializationContextIn
125124

126125
}
127126

128-
@Override
129-
public String getProtoFileName() {
130-
return schema.getName();
131-
}
132-
133-
@Override
134-
public String getProtoFile() throws UncheckedIOException {
135-
return schema.toString();
136-
}
137-
138127
@Override
139128
public void registerSchema(SerializationContext serCtx) {
140129
serCtx.registerProtoFiles(fromString(schema.getName(), schema.toString()));

integration-tests/src/main/java/io/quarkiverse/infinispan/embedded/it/extension/AbstractSerializationContextInitializer.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package io.quarkiverse.infinispan.embedded.it.extension;
22

3-
import java.io.UncheckedIOException;
4-
53
import org.infinispan.protostream.SerializationContext;
64
import org.infinispan.protostream.SerializationContextInitializer;
75

@@ -48,12 +46,6 @@
4846
*/
4947
public abstract class AbstractSerializationContextInitializer implements SerializationContextInitializer {
5048

51-
@Override
52-
public abstract String getProtoFileName();
53-
54-
@Override
55-
public abstract String getProtoFile() throws UncheckedIOException;
56-
5749
@Override
5850
public abstract void registerSchema(SerializationContext serCtx);
5951

integration-tests/src/main/java/io/quarkiverse/infinispan/embedded/it/extension/TestAdvancedExternalizer.java

Lines changed: 0 additions & 79 deletions
This file was deleted.

integration-tests/src/main/java/io/quarkiverse/infinispan/embedded/it/extension/TestCacheLoader.java

Lines changed: 0 additions & 67 deletions
This file was deleted.

pom.xml

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,13 @@
2121
<tag>HEAD</tag>
2222
</scm>
2323
<properties>
24-
<quarkus.version>3.20.1</quarkus.version>
25-
<quarkus-antora.version>1.2.0</quarkus-antora.version>
26-
<infinispan.version>15.0.19.Final</infinispan.version>
24+
<quarkus.version>3.27.0</quarkus.version>
25+
<quarkus-antora.version>3.25.0</quarkus-antora.version>
26+
<quarkus-build-reporter.version>3.12.1</quarkus-build-reporter.version>
27+
<quarkus-micrometer-registry-prometheus-v1.version>3.4.1</quarkus-micrometer-registry-prometheus-v1.version>
28+
<infinispan.version>16.0.0.Dev04</infinispan.version>
2729
<jgroups.raft.version>1.0.14.Final</jgroups.raft.version>
2830
<assertj.version>3.26.3</assertj.version>
29-
<hibernate-search.version>7.1.2.Final</hibernate-search.version>
3031
</properties>
3132
<licenses>
3233
<license>
@@ -44,13 +45,6 @@
4445
<type>pom</type>
4546
<scope>import</scope>
4647
</dependency>
47-
<dependency>
48-
<groupId>org.hibernate.search</groupId>
49-
<artifactId>hibernate-search-bom</artifactId>
50-
<version>${hibernate-search.version}</version>
51-
<type>pom</type>
52-
<scope>import</scope>
53-
</dependency>
5448
<dependency>
5549
<groupId>io.quarkus</groupId>
5650
<artifactId>quarkus-bom</artifactId>
@@ -75,7 +69,7 @@
7569
<extension>
7670
<groupId>io.quarkus.bot</groupId>
7771
<artifactId>build-reporter-maven-extension</artifactId>
78-
<version>3.9.6</version>
72+
<version>${quarkus-build-reporter.version}</version>
7973
</extension>
8074
</extensions>
8175
<pluginManagement>

0 commit comments

Comments
 (0)