Skip to content

Upgrade to Infinispan 16.0.2 #14118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
olamy wants to merge 5 commits into
base: jetty-12.1.x
Choose a base branch
from
Open

Upgrade to Infinispan 16.0.2 #14118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5111b21
Upgrade to Infinispan 16.0.2
olamy Dec 1, 2025
b40ffeb
Upgrade Lucene too
olamy Dec 1, 2025
97dfd5a
Upper bound
olamy Dec 1, 2025
70678ba
Fix resource path
olamy Dec 1, 2025
f1c40f8
hackish to get this test working
olamy Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions jetty-ee10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,29 @@
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<executions>
<execution>
<id>enforce-java</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<requireUpperBoundDeps>
<excludes combine.children="append">
<exclude>jakarta.persistence:jakarta.persistence-api</exclude>
</excludes>
</requireUpperBoundDeps>
</rules>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
5 changes: 0 additions & 5 deletions ...e10/jetty-ee10-tests/jetty-ee10-test-sessions/jetty-ee10-test-sessions-infinispan/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,6 @@
<artifactId>infinispan-query</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-remote-query-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan.protostream</groupId>
<artifactId>protostream</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions ...e11/jetty-ee11-tests/jetty-ee11-test-sessions/jetty-ee11-test-sessions-infinispan/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,6 @@
<artifactId>infinispan-query</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-remote-query-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan.protostream</groupId>
<artifactId>protostream</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions jetty-ee9/jetty-ee9-tests/jetty-ee9-test-sessions/jetty-ee9-test-sessions-infinispan/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,11 +97,6 @@
<artifactId>infinispan-query</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-remote-query-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.infinispan.protostream</groupId>
<artifactId>protostream</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions jetty-integrations/jetty-infinispan/jetty-infinispan-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-remote-query-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.infinispan.protostream</groupId>
<artifactId>protostream</artifactId>
Expand Down
23 changes: 19 additions & 4 deletions .../java/org/eclipse/jetty/session/infinispan/InfinispanSerializationContextInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

package org.eclipse.jetty.session.infinispan;

import java.io.IOException;
import java.io.UncheckedIOException;

import org.infinispan.protostream.FileDescriptorSource;
Expand All @@ -25,22 +26,36 @@
*/
public class InfinispanSerializationContextInitializer implements SerializationContextInitializer
{
@Override
public String getProtoFileName()
{
return "session.proto";
}

@Override
public String getProtoFile() throws UncheckedIOException
public void register(SerializationContext serCtx)
{
return FileDescriptorSource.getResourceAsString(getClass(), "/" + getProtoFileName());
try
{
serCtx.registerProtoFiles(FileDescriptorSource.fromResources(getProtoFileName()));
}
catch (IOException e)
{
throw new UncheckedIOException(e);
}
SerializationContextInitializer.super.register(serCtx);
}

@Override
public void registerSchema(SerializationContext serCtx)
{
serCtx.registerProtoFiles(FileDescriptorSource.fromString(getProtoFileName(), getProtoFile()));
try
{
serCtx.registerProtoFiles(FileDescriptorSource.fromResources(getProtoFileName()));
}
catch (IOException e)
{
throw new UncheckedIOException(e);
}
}

@Override
Expand Down
4 changes: 0 additions & 4 deletions jetty-integrations/jetty-infinispan/jetty-infinispan-remote-query/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,6 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-remote-query-client</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
5 changes: 0 additions & 5 deletions jetty-integrations/jetty-infinispan/jetty-infinispan-remote/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,6 @@
<artifactId>infinispan-client-hotrod</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-remote-query-client</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.infinispan.protostream</groupId>
<artifactId>protostream</artifactId>
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,11 +216,11 @@
<guice.version>7.0.0</guice.version>
<hamcrest.version>3.0</hamcrest.version>
<hazelcast.version>5.6.0</hazelcast.version>
<hibernate.search.version>7.2.4.Final</hibernate.search.version>
<hibernate.search.version>8.1.2.Final</hibernate.search.version>
<infinispan.docker.image.name>infinispan/server</infinispan.docker.image.name>
<infinispan.docker.image.version>15.2.1.Final</infinispan.docker.image.version>
Copy link
Member Author

@olamy olamy Dec 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please note the docker image is still using an older version, it's on purpose to test the new upgraded client version working with older remote server version

<infinispan.protostream.version>5.0.15.Final</infinispan.protostream.version>
<infinispan.version>15.2.6.Final</infinispan.version>
<infinispan.protostream.version>6.0.2</infinispan.protostream.version>
<infinispan.version>16.0.2</infinispan.version>
<injection.bundle.version>1.2</injection.bundle.version>
<invoker.mergeUserSettings>false</invoker.mergeUserSettings>
<it.debug>false</it.debug>
Expand Down Expand Up @@ -265,7 +265,7 @@
<localRepoPath>${project.build.directory}/local-repo</localRepoPath>
<log4j2.version>2.25.2</log4j2.version>
<logback.version>1.5.22</logback.version>
<lucene.version>9.11.1</lucene.version>
<lucene.version>9.12.2</lucene.version>
<mariadb.docker.version>10.3.6</mariadb.docker.version>
<mariadb.version>3.5.6</mariadb.version>
<maven-artifact-transfer.version>0.13.1</maven-artifact-transfer.version>
Expand Down
2 changes: 1 addition & 1 deletion ...sion-common/src/main/java/org/eclipse/jetty/session/test/tools/InfinispanTestSupport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
import org.infinispan.configuration.cache.ConfigurationBuilder;
import org.infinispan.configuration.cache.ConfigurationChildBuilder;
import org.infinispan.configuration.cache.IndexStorage;
import org.infinispan.configuration.cache.SingleFileStoreConfigurationBuilder;
import org.infinispan.configuration.cache.StorageType;
import org.infinispan.configuration.global.GlobalConfigurationBuilder;
import org.infinispan.eviction.EvictionStrategy;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.persistence.file.SingleFileStoreConfigurationBuilder;

import static org.junit.jupiter.api.Assertions.assertEquals;

Expand Down