From 64fbf83c7dfb56e6826479a74290d575ef118e27 Mon Sep 17 00:00:00 2001 From: Katia Aresti Date: Mon, 3 Oct 2022 11:34:59 +0200 Subject: [PATCH 01/11] Updates to Infinispan 14.0.0.Final and Protostream 4.5.0.Final (cherry picked from commit b2f4b007062c7905373a1a0e639f13b1e6c286cc) --- bom/application/pom.xml | 4 ++-- jakarta/rewrite.yml | 6 ------ 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 512f855a2247c..68e8172a85ff4 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -131,8 +131,8 @@ 5.9.1 1.5.0 6.14.2 - 13.0.11.Final - 4.4.3.Final + 14.0.0.Final + 4.5.0.Final 2.9.3 4.1.86.Final 1.8.0 diff --git a/jakarta/rewrite.yml b/jakarta/rewrite.yml index f1c0c9c319d3a..a0dcbc485b0b6 100644 --- a/jakarta/rewrite.yml +++ b/jakarta/rewrite.yml @@ -849,12 +849,6 @@ type: specs.openrewrite.org/v1beta/recipe name: io.quarkus.infinispan displayName: Adjust Infinispan version and dependencies recipeList: - - org.openrewrite.maven.ChangePropertyValue: - key: infinispan.version - newValue: 14.0.0.Final - - org.openrewrite.maven.ChangePropertyValue: - key: infinispan.protostream.version - newValue: 4.5.0.Final - org.openrewrite.maven.ChangeManagedDependencyGroupIdAndArtifactId: oldGroupId: org.infinispan oldArtifactId: infinispan-core From 6aaf5a979f0ec7a2042b71f52acabcf2baf17327 Mon Sep 17 00:00:00 2001 From: Katia Aresti Date: Tue, 25 Oct 2022 14:15:59 +0200 Subject: [PATCH 02/11] Updates to Infinispan 14.0.1.Final (cherry picked from commit d34a5e83a95b6e60bb4ce5db858e666e25dabeef) --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 68e8172a85ff4..73d2c6047207a 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -131,7 +131,7 @@ 5.9.1 1.5.0 6.14.2 - 14.0.0.Final + 14.0.1.Final 4.5.0.Final 2.9.3 4.1.86.Final From 2df9a3dd0f21aee7fe8280b643027177abf92c9e Mon Sep 17 00:00:00 2001 From: Katia Aresti Date: Tue, 8 Nov 2022 11:04:54 +0100 Subject: [PATCH 03/11] Integrate the api dependency from Infinispan 14 (#ISPN-14268) * Api dependency * Updates to minor 14.0.2.Final (cherry picked from commit 2636793bf47892d04139cf54da9cb688c5a4b788) --- bom/application/pom.xml | 7 +- docs/src/main/asciidoc/infinispan-client.adoc | 125 ++++++++++++++++-- extensions/infinispan-client/runtime/pom.xml | 4 + .../io/quarkus/it/infinispan/client/Book.java | 6 + .../src/main/resources/application.properties | 3 +- .../main/resources/booksIndexedConfig.json | 16 +++ 6 files changed, 147 insertions(+), 14 deletions(-) create mode 100644 integration-tests/infinispan-client/src/main/resources/booksIndexedConfig.json diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 73d2c6047207a..0747475470086 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -131,7 +131,7 @@ 5.9.1 1.5.0 6.14.2 - 14.0.1.Final + 14.0.2.Final 4.5.0.Final 2.9.3 4.1.86.Final @@ -5214,6 +5214,11 @@ ${smallrye-reactive-messaging.version} + + org.infinispan + infinispan-api + ${infinispan.version} + org.infinispan infinispan-core diff --git a/docs/src/main/asciidoc/infinispan-client.adoc b/docs/src/main/asciidoc/infinispan-client.adoc index 1e80e747e91dc..ddbeb232ae879 100644 --- a/docs/src/main/asciidoc/infinispan-client.adoc +++ b/docs/src/main/asciidoc/infinispan-client.adoc @@ -100,7 +100,7 @@ to create it on first access, use one of the following properties: [source,properties] ---- -quarkus.infinispan-client.cache.books.configuration-uri=cacheConfig.xml <1> +quarkus.infinispan-client.cache.books.configuration-uri=cacheConfig.json <1> quarkus.infinispan-client.cache.magazine.configuration= <2> ---- <1> The file name located under the `resources` folder that contains the configuration of the 'books' cache @@ -109,15 +109,42 @@ quarkus.infinispan-client.cache.magazine.configuration= ---- +.JSON +[source,json,options="nowrap",subs=attributes+,role="secondary"] +---- +{ + "distributed-cache": { + "encoding": { + "media-type": "application/x-protostream" + } + } +} +---- + +.YAML +[source,yaml,options="nowrap",subs=attributes+,role="secondary"] +---- +distributedCache: + encoding: + mediaType: "application/x-protostream" +---- + === Authentication mechanisms You can use the following authentication mechanisms with the Infinispan client: @@ -130,10 +157,7 @@ Other authentication mechanisms, such as SCRAM and GSSAPI, are not yet verified You can find more information on configuring authentication in https://infinispan.org/docs/stable/titles/hotrod_java/hotrod_java.html#hotrod_endpoint_auth-hotrod-client-configuration[Hot Rod Endpoint Authentication Mechanisms]. -[NOTE] -==== -You must configure authentication in the `hotrod-client.properties` file if you use Dependency Injection. -==== +NOTE: You must configure authentication in the `hotrod-client.properties` file if you use Dependency Injection. == Serialization (Key Value types support) @@ -267,10 +291,12 @@ interface BookStoreSchema extends GeneratedSchema { ---- [TIP] +==== Protostream provides default Protobuf mappers for commonly used types as `BigDecimal`, included in the `org.infinispan.protostream.types` package. +==== So in this case we will automatically generate the marshaller and schemas for the included classes and -place them in the schema package automatically. The package does not have to be provided, but if you use Infinispan query capabilities, you must know the generated package. +place them in the schema package automatically. The package does not have to be provided, but if you use Infinispan search capabilities, you must know the generated package. NOTE: In Quarkus the `schemaFileName` and `schemaFilePath` attributes should NOT be set on the `AutoProtoSchemaBuilder` annotation. Setting either attributes causes native runtime errors. @@ -439,7 +465,8 @@ the field, constructor or method. In the below code we utilize field and constru this.remoteCacheManager = remoteCacheManager; } - @Inject @Remote("myCache") + @Inject + @Remote("myCache") RemoteCache cache; RemoteCacheManager remoteCacheManager; @@ -470,23 +497,97 @@ for Kubernetes deployments, Infinispan Console, https://infinispan.org/docs/stable/titles/rest/rest.html#rest_v2_protobuf_schemas[REST API] or the https://infinispan.org/docs/stable/titles/encoding/encoding.html#registering-sci-remote-caches_marshalling[Hot Rod Java Client]. - == Querying -The Infinispan client supports both indexed and non-indexed querying as long as the +The Infinispan client supports both indexed and non-indexed search as long as the `ProtoStreamMarshaller` is configured above. This allows the user to query based on the -properties of the proto schema. +properties of the proto schema. *Indexed queries are preferred for performance reasons*. + +.XML +[source,xml,options="nowrap",subs=attributes+,role="primary"] +---- + + + + + book_sample.Book + + + +---- + +.JSON +[source,json,options="nowrap",subs=attributes+,role="secondary"] +---- +{ + "books": { + "distributed-cache": { + ... + "indexing": { + "enabled": true, + "storage": "filesystem", + "startupMode": "PURGE", + "indexed-entities": [ + "book_sample.Book" + ] + } + } + } +} +---- + +.YAML +[source,yaml,options="nowrap",subs=attributes+,role="secondary"] +---- +distributedCache: + # other configuration + indexing: + enabled: "true" + storage: "filesystem" + startupMode: "PURGE" + indexedEntities: + - "book_sample.Book" +---- Query builds upon the proto definitions you can configure when setting up the `ProtoStreamMarshaller`. Either method of Serialization above will automatically register the schema with the server at startup, meaning that you will automatically gain the ability to query objects stored in the remote Infinispan Server. -You can read more about https://infinispan.org/docs/stable/titles/developing/developing.html#creating_ickle_queries-querying[querying] in the Infinispan documentation. +.Book.java +[source,java] +---- +@Indexed <1> +public class Book { + + @ProtoFactory + public Book(String title, String description, int publicationYear, Set authors) { + ... + } + + @ProtoField(number = 1) + @Text <2> + public String getTitle() { + return title; + } + + @ProtoField(number = 2) + @Keyword(projectable = true, sortable = true, normalizer = "lowercase", indexNullAs = "unnamed", norms = false) <3> + public String getDescription() { + return description; + } + ... +---- +<1> `@Indexed` annotation makes the POJO indexable +<2> `@Basic` annotation is used for indexed fields without any special transformation +<3> `@Keyword` annotation is used to apply a normalizer to a text field You can use either the Query DSL or the Ickle Query language with the Quarkus Infinispan client extension. +NOTE: You can read more about https://infinispan.org/docs/stable/titles/query/query.html[querying] in the Infinispan documentation. + + == Counters Infinispan also has a notion of counters and the Quarkus Infinispan client supports them out of diff --git a/extensions/infinispan-client/runtime/pom.xml b/extensions/infinispan-client/runtime/pom.xml index ce7a828f9cc7e..31b0e1818f749 100644 --- a/extensions/infinispan-client/runtime/pom.xml +++ b/extensions/infinispan-client/runtime/pom.xml @@ -86,6 +86,10 @@ opentelemetry-api + + org.infinispan + infinispan-api + org.infinispan infinispan-remote-query-client diff --git a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/Book.java b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/Book.java index ca404a8f7985c..45dfc48c3a002 100644 --- a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/Book.java +++ b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/Book.java @@ -4,12 +4,16 @@ import java.util.Objects; import java.util.Set; +import org.infinispan.api.annotations.indexing.Indexed; +import org.infinispan.api.annotations.indexing.Keyword; +import org.infinispan.api.annotations.indexing.Text; import org.infinispan.protostream.annotations.ProtoFactory; import org.infinispan.protostream.annotations.ProtoField; /** * @author William Burns */ +@Indexed public class Book { private final String title; private final String description; @@ -29,11 +33,13 @@ public Book(String title, String description, int publicationYear, Set a } @ProtoField(number = 1) + @Text public String getTitle() { return title; } @ProtoField(number = 2) + @Keyword(projectable = true, sortable = true, normalizer = "lowercase", indexNullAs = "unnamed", norms = false) public String getDescription() { return description; } diff --git a/integration-tests/infinispan-client/src/main/resources/application.properties b/integration-tests/infinispan-client/src/main/resources/application.properties index 3754896fb54dd..5a02e6e32f971 100644 --- a/integration-tests/infinispan-client/src/main/resources/application.properties +++ b/integration-tests/infinispan-client/src/main/resources/application.properties @@ -1,4 +1,5 @@ quarkus.infinispan-client.cache.default.configuration-uri=cacheConfig.xml +quarkus.infinispan-client.cache.books.configuration-uri=booksIndexedConfig.json quarkus.infinispan-client.cache.magazine.configuration= quarkus.infinispan-client.cache.default.near-cache-mode=INVALIDATED quarkus.infinispan-client.cache.default.near-cache-max-entries=2 @@ -6,4 +7,4 @@ quarkus.infinispan-client.cache.default.near-cache-use-bloom-filter=false quarkus.infinispan-client.cache.magazine.near-cache-mode=INVALIDATED quarkus.infinispan-client.cache.magazine.near-cache-max-entries=2 quarkus.infinispan-client.cache.magazine.near-cache-use-bloom-filter=false -quarkus.native.resources.includes=cacheConfig.xml \ No newline at end of file +quarkus.native.resources.includes=cacheConfig.xml,booksIndexedConfig.json diff --git a/integration-tests/infinispan-client/src/main/resources/booksIndexedConfig.json b/integration-tests/infinispan-client/src/main/resources/booksIndexedConfig.json new file mode 100644 index 0000000000000..6f515612766d4 --- /dev/null +++ b/integration-tests/infinispan-client/src/main/resources/booksIndexedConfig.json @@ -0,0 +1,16 @@ +{ + "distributed-cache": { + "statistics": true, + "encoding": { + "media-type": "application/x-protostream" + }, + "indexing": { + "enabled": true, + "storage": "filesystem", + "startup-mode": "Purge", + "indexed-entities": [ + "book_sample.Book" + ] + } + } +} \ No newline at end of file From cded78d5b20ba8b5988dbce5220a559cfa79db33 Mon Sep 17 00:00:00 2001 From: Katia Aresti Date: Wed, 7 Dec 2022 23:14:27 +0100 Subject: [PATCH 04/11] Updates to Infinispan 14.0.3.Final and covers more counters testing (cherry picked from commit 88d1a6c7ec80bcac232e8119d3bfcd5c1ddbae42) --- bom/application/pom.xml | 2 +- .../it/infinispan/client/TestServlet.java | 32 +++++++++++++++++-- .../InfinispanClientFunctionalityTest.java | 28 ++++++++++++++-- 3 files changed, 57 insertions(+), 5 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 0747475470086..38ec21122b5b2 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -131,7 +131,7 @@ 5.9.1 1.5.0 6.14.2 - 14.0.2.Final + 14.0.3.Final 4.5.0.Final 2.9.3 4.1.86.Final diff --git a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/TestServlet.java b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/TestServlet.java index 7352e9f637d16..c75e6cf594091 100644 --- a/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/TestServlet.java +++ b/integration-tests/infinispan-client/src/main/java/io/quarkus/it/infinispan/client/TestServlet.java @@ -4,16 +4,19 @@ import java.util.Collections; import java.util.List; import java.util.Set; +import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletionStage; import java.util.stream.Collectors; import javax.inject.Inject; import javax.ws.rs.Consumes; import javax.ws.rs.GET; +import javax.ws.rs.POST; import javax.ws.rs.PUT; import javax.ws.rs.Path; import javax.ws.rs.PathParam; import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; @@ -25,11 +28,14 @@ import org.infinispan.counter.api.CounterConfiguration; import org.infinispan.counter.api.CounterManager; import org.infinispan.counter.api.CounterType; +import org.infinispan.counter.api.Storage; import org.infinispan.counter.api.StrongCounter; +import org.infinispan.counter.api.WeakCounter; import org.infinispan.query.dsl.Query; import org.infinispan.query.dsl.QueryFactory; import io.quarkus.infinispan.client.Remote; +import io.smallrye.common.annotation.Blocking; @Path("/test") public class TestServlet { @@ -111,16 +117,38 @@ public String ickleQueryAuthorSurname(@PathParam("id") String name) { .collect(Collectors.joining(",", "[", "]")); } + @Path("counter/{id}") + @POST + @Produces(MediaType.TEXT_PLAIN) + @Blocking + public boolean defineCounter(@PathParam("id") String id, @QueryParam("type") String type, + @QueryParam("storage") String storage) { + cacheSetup.ensureStarted(); + CounterConfiguration configuration = counterManager.getConfiguration(id); + if (configuration == null) { + configuration = CounterConfiguration.builder(CounterType.valueOf(type)).storage(Storage.valueOf(storage)).build(); + return counterManager.defineCounter(id, configuration); + } + return true; + } + @Path("incr/{id}") @GET @Produces(MediaType.TEXT_PLAIN) + @Blocking public CompletionStage incrementCounter(@PathParam("id") String id) { cacheSetup.ensureStarted(); CounterConfiguration configuration = counterManager.getConfiguration(id); if (configuration == null) { - configuration = CounterConfiguration.builder(CounterType.BOUNDED_STRONG).build(); - counterManager.defineCounter(id, configuration); + return CompletableFuture.completedFuture(0L); } + + if (configuration.type() == CounterType.WEAK) { + WeakCounter weakCounter = counterManager.getWeakCounter(id); + weakCounter.sync().increment(); + return CompletableFuture.completedFuture(weakCounter.getValue()); + } + StrongCounter strongCounter = counterManager.getStrongCounter(id); return strongCounter.incrementAndGet(); } diff --git a/integration-tests/infinispan-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanClientFunctionalityTest.java b/integration-tests/infinispan-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanClientFunctionalityTest.java index 9de116a8d3964..57dd0a9291bf2 100644 --- a/integration-tests/infinispan-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanClientFunctionalityTest.java +++ b/integration-tests/infinispan-client/src/test/java/io/quarkus/it/infinispan/client/InfinispanClientFunctionalityTest.java @@ -3,6 +3,8 @@ import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; +import org.infinispan.counter.api.CounterType; +import org.infinispan.counter.api.Storage; import org.junit.jupiter.api.Test; import io.quarkus.test.junit.QuarkusTest; @@ -32,8 +34,30 @@ public void testIckleQuery() { @Test public void testCounterIncrement() { - String initialValue = RestAssured.when().get("test/incr/somevalue").body().print(); - String nextValue = RestAssured.when().get("test/incr/somevalue").body().print(); + RestAssured.given() + .queryParam("type", CounterType.BOUNDED_STRONG) + .queryParam("storage", Storage.VOLATILE) + .post("test/counter/strong-1").body().print(); + + RestAssured.given() + .queryParam("type", CounterType.WEAK) + .queryParam("storage", Storage.VOLATILE) + .post("test/counter/weak-1").body().print(); + + RestAssured.given() + .queryParam("type", CounterType.UNBOUNDED_STRONG) + .queryParam("storage", Storage.PERSISTENT) + .post("test/counter/strong-2").body().print(); + + assertCounterIncrement("strong-1"); + assertCounterIncrement("weak-1"); + assertCounterIncrement("strong-2"); + } + + private void assertCounterIncrement(String counterName) { + String initialValue = RestAssured.given() + .get("test/incr/" + counterName).body().print(); + String nextValue = RestAssured.when().get("test/incr/" + counterName).body().print(); assertEquals(Integer.parseInt(initialValue) + 1, Integer.parseInt(nextValue)); } From 12c3178cd5574bb4dd74de2b5255e980d390bfe7 Mon Sep 17 00:00:00 2001 From: Katia Aresti Date: Thu, 22 Dec 2022 14:05:41 +0100 Subject: [PATCH 05/11] Updates Infinispan dependencies * Infinispan 14.0.4.Final * Protostream 4.5.1.Final (cherry picked from commit 1a6d40d91d889ddce74627f53d048d1cfe32203f) --- bom/application/pom.xml | 4 ++-- docs/src/main/asciidoc/infinispan-client.adoc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 38ec21122b5b2..8947f399935ac 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -131,8 +131,8 @@ 5.9.1 1.5.0 6.14.2 - 14.0.3.Final - 4.5.0.Final + 14.0.4.Final + 4.5.1.Final 2.9.3 4.1.86.Final 1.8.0 diff --git a/docs/src/main/asciidoc/infinispan-client.adoc b/docs/src/main/asciidoc/infinispan-client.adoc index ddbeb232ae879..ea113be059537 100644 --- a/docs/src/main/asciidoc/infinispan-client.adoc +++ b/docs/src/main/asciidoc/infinispan-client.adoc @@ -44,9 +44,9 @@ This command adds the following dependency to your build file: .build.gradle ---- implementation 'io.quarkus:quarkus-infinispan-client' -annotationProcessor 'org.infinispan.protostream:protostream-processor:4.5.0.Final' <1> +annotationProcessor 'org.infinispan.protostream:protostream-processor:4.5.1.Final' <1> ---- -<1> Mandatory in the gradle build to enable the generation of the files in the annotation based serialization +<1> Mandatory in the Gradle build to enable the generation of the files in the annotation based serialization == Configuring the Infinispan client From 2268c28b55747df7e2c7c3fcbe936a685fa1de2e Mon Sep 17 00:00:00 2001 From: Katia Aresti Date: Fri, 13 Jan 2023 10:55:35 +0100 Subject: [PATCH 06/11] Updates to Infinispan 14.0.5.Final (cherry picked from commit 72f96a50686e8adeed1e98b9936e78601127b4c2) --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 8947f399935ac..6f1119422597a 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -131,7 +131,7 @@ 5.9.1 1.5.0 6.14.2 - 14.0.4.Final + 14.0.5.Final 4.5.1.Final 2.9.3 4.1.86.Final From 3682c5f93b4f04f1d010b9e0c83aa98b15bfabfc Mon Sep 17 00:00:00 2001 From: Katia Aresti Date: Thu, 19 Jan 2023 17:18:12 +0100 Subject: [PATCH 07/11] Updates to Infinispan 14.0.6.Final (cherry picked from commit 440a084bde783cc4f2d30b2f1ab5cda90ada3ad7) --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 6f1119422597a..7ac28982e9bda 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -131,7 +131,7 @@ 5.9.1 1.5.0 6.14.2 - 14.0.5.Final + 14.0.6.Final 4.5.1.Final 2.9.3 4.1.86.Final From a4e911b29f14768eb68bb79958f9a3e0470b1c05 Mon Sep 17 00:00:00 2001 From: Katia Aresti Date: Tue, 14 Mar 2023 11:24:16 +0100 Subject: [PATCH 08/11] Updates to Infinispan 14.0.7.Final (cherry picked from commit 7fc4e46410a07ac4832fe79ac9b79008c6c940cc) --- bom/application/pom.xml | 4 ++-- .../enforcer-rules/quarkus-banned-dependencies.xml | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index 7ac28982e9bda..df2dce8120c30 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -131,8 +131,8 @@ 5.9.1 1.5.0 6.14.2 - 14.0.6.Final - 4.5.1.Final + 14.0.7.Final + 4.6.1.Final 2.9.3 4.1.86.Final 1.8.0 diff --git a/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies.xml b/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies.xml index 805b934d866db..9c37d9cf628d4 100644 --- a/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies.xml +++ b/independent-projects/enforcer-rules/src/main/resources/enforcer-rules/quarkus-banned-dependencies.xml @@ -98,8 +98,9 @@ org.apache.tomcat.embed:tomcat-embed-core org.jboss.modules:jboss-modules - - org.javassist:javassist + + @@ -107,4 +108,4 @@ - \ No newline at end of file + From f105904c1f057a12e24028e53b0b8bd0d1f261e1 Mon Sep 17 00:00:00 2001 From: Katia Aresti Date: Fri, 14 Apr 2023 12:45:47 +0200 Subject: [PATCH 09/11] Updates to Infinispan 14.0.8.Final (cherry picked from commit badb66934c782eb82848d30d98fa24d0c3df4ead) --- bom/application/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index df2dce8120c30..fb75bd8051957 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -131,8 +131,8 @@ 5.9.1 1.5.0 6.14.2 - 14.0.7.Final - 4.6.1.Final + 14.0.8.Final + 4.6.2.Final 2.9.3 4.1.86.Final 1.8.0 From 3bc8dfdad0009498f89a018356ac1788fc2b9a8c Mon Sep 17 00:00:00 2001 From: Katia Aresti Date: Thu, 4 May 2023 09:20:26 +0200 Subject: [PATCH 10/11] Updates to Infinispan 14.0.9.Final (cherry picked from commit ede5479c757aa7df2b5adeded3d576a45b24dcde) --- bom/application/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bom/application/pom.xml b/bom/application/pom.xml index fb75bd8051957..e544ab24d8c3e 100644 --- a/bom/application/pom.xml +++ b/bom/application/pom.xml @@ -131,7 +131,7 @@ 5.9.1 1.5.0 6.14.2 - 14.0.8.Final + 14.0.9.Final 4.6.2.Final 2.9.3 4.1.86.Final From ec4fa13ba710daab20565b1c6d87c560fb2851b9 Mon Sep 17 00:00:00 2001 From: Guillaume Smet Date: Mon, 15 May 2023 16:20:33 +0200 Subject: [PATCH 11/11] Infinispan - Exclude additional testing dependency --- extensions/infinispan-client/deployment/pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/infinispan-client/deployment/pom.xml b/extensions/infinispan-client/deployment/pom.xml index ba865f639aaaf..003671c759694 100644 --- a/extensions/infinispan-client/deployment/pom.xml +++ b/extensions/infinispan-client/deployment/pom.xml @@ -84,6 +84,10 @@ org.apache.logging.log4j log4j-core + + org.slf4j + jcl-over-slf4j + org.glassfish javax.json