This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 99f7a10f1870fdf1b6aa3335ee313945ef798509 Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Mon Jun 2 14:19:06 2025 +0100 Upgrade Quarkus to 3.24.0.CR1 --- .../elasticsearch/it/ElasticsearchResource.java | 6 +----- pom.xml | 14 +++++++------- poms/bom/pom.xml | 5 +++++ poms/bom/src/main/generated/flattened-full-pom.xml | 22 +++++++++++----------- .../src/main/generated/flattened-reduced-pom.xml | 22 +++++++++++----------- .../generated/flattened-reduced-verbose-pom.xml | 22 +++++++++++----------- .../apache/camel/quarkus/test/CallbackUtil.java | 5 +++-- 7 files changed, 49 insertions(+), 47 deletions(-) diff --git a/integration-tests-jvm/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchResource.java b/integration-tests-jvm/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchResource.java index 047266cd91..4884d091d4 100644 --- a/integration-tests-jvm/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchResource.java +++ b/integration-tests-jvm/elasticsearch/src/main/java/org/apache/camel/quarkus/component/elasticsearch/it/ElasticsearchResource.java @@ -20,7 +20,6 @@ import java.net.URI; import java.util.HashMap; import java.util.Map; -import co.elastic.clients.elasticsearch._types.query_dsl.MatchPhraseQuery; import co.elastic.clients.elasticsearch.core.BulkRequest; import co.elastic.clients.elasticsearch.core.GetResponse; import co.elastic.clients.elasticsearch.core.MsearchRequest; @@ -28,7 +27,6 @@ import co.elastic.clients.elasticsearch.core.bulk.BulkOperation; import co.elastic.clients.elasticsearch.core.bulk.BulkResponseItem; import co.elastic.clients.elasticsearch.core.bulk.IndexOperation; import co.elastic.clients.elasticsearch.core.msearch.MultiSearchResponseItem; -import co.elastic.clients.elasticsearch.core.msearch.MultisearchBody; import co.elastic.clients.elasticsearch.core.msearch.MultisearchHeader; import co.elastic.clients.elasticsearch.core.msearch.RequestItem; import co.elastic.clients.elasticsearch.core.search.HitsMetadata; @@ -269,9 +267,7 @@ public class ElasticsearchResource { MsearchRequest.Builder builder = new MsearchRequest.Builder().index(indexName); for (String searchTerm : searchTerms) { builder.searches(new RequestItem.Builder().header(new MultisearchHeader.Builder().build()) - .body(new MultisearchBody.Builder().query(q -> q - .matchPhrase(new MatchPhraseQuery.Builder().field(indexKey).query(searchTerm).build())) - .build()) + .body(b -> b.query(q -> q.match(m -> m.field(indexKey).query(searchTerm)))) .build()); } diff --git a/pom.xml b/pom.xml index 42c6943166..e63a827c1d 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ <quarkiverse-minio.version>3.8.4</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ --> <quarkiverse-mybatis.version>2.4.0</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ --> <quarkiverse-pooled-jms.version>2.8.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ --> - <quarkus.version>3.23.0</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> + <quarkus.version>999-SNAPSHOT</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> <quarkus-hazelcast-client.version>4.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ --> <quarkus-qpid-jms.version>2.8.0</quarkus-qpid-jms.version><!-- This should be in sync with quarkus-platform https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ --> @@ -79,7 +79,7 @@ <azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version> <azure-core.version>1.55.3</azure-core.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-core --> <azure-identity.version>1.15.4</azure-identity.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-identity --> - <bouncycastle.version>1.80</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on --> + <bouncycastle.version>1.81</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on --> <caffeine.version>3.2.0</caffeine.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.github.ben-manes.caffeine:caffeine --> <chicory.version>${chicory-version}</chicory.version> <commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version> @@ -136,8 +136,8 @@ <jedis-client.version>${jedis-client-version}</jedis-client.version> <json-smart.version>${json-smart-version}</json-smart.version> <jxmpp.version>1.1.0</jxmpp.version><!-- @sync org.apache.camel:camel-xmpp:${camel.version} dep:org.jxmpp:jxmpp-jid --> - <kafka.version>3.9.0</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients --> - <keycloak.version>26.2.0</keycloak.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:keycloak.server.version --> + <kafka.version>4.0.0</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients --> + <keycloak.version>26.2.4</keycloak.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:keycloak.server.version --> <kudu.version>${kudu-version}</kudu.version> <kotlin.version>2.1.21</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib --> <kotlinx.version>1.4.0</kotlinx.version><!--Used by com.squareup.wire:wire-compiler referenced from aws2:kinesis --> @@ -161,7 +161,7 @@ <retrofit.version>2.9.0</retrofit.version><!-- @sync org.influxdb:influxdb-java:${influxdb.version} dep:com.squareup.retrofit2:retrofit --> <rxjava3.version>3.1.8</rxjava3.version><!-- Used by amazon-kinesis-client and infinispan-client-hotrod-jakarta --> <smallrye-fault-tolerance-standalone.version>6.9.1</smallrye-fault-tolerance-standalone.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye:smallrye-fault-tolerance --> - <smallrye.reactive.messaging.camel.version>4.27.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider --> + <smallrye.reactive.messaging.camel.version>4.28.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider --> <smooks.version>${smooks-version}</smooks.version> <snakeyaml.version>2.4</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml --> <snakeyaml-engine.version>${snakeyaml-engine-version}</snakeyaml-engine.version><!-- Resolve conflict between camel-snakeyaml & kubernetes-client --> @@ -179,7 +179,7 @@ <web3j.version>${web3j-version}</web3j.version> <web3j.quorum.version>${web3j-quorum-version}</web3j.quorum.version> <zookeeper.version>${zookeeper-version}</zookeeper.version> - <zstd-jni.version>1.5.6-4</zstd-jni.version><!-- @sync org.apache.kafka:kafka-clients:${kafka.version} dep:com.github.luben:zstd-jni --> + <zstd-jni.version>1.5.6-6</zstd-jni.version><!-- @sync org.apache.kafka:kafka-clients:${kafka.version} dep:com.github.luben:zstd-jni --> <!-- Test dependency versions (keep sorted alphabetically) --> <consul-client.version>${consul-client-version}</consul-client.version> @@ -237,7 +237,7 @@ <couchbase.container.image>mirror.gcr.io/couchbase/server:7.2.5</couchbase.container.image> <couchdb.container.image>mirror.gcr.io/couchdb:2.3.1</couchdb.container.image> <eclipse-mosquitto.container.image>mirror.gcr.io/eclipse-mosquitto:2.0.18</eclipse-mosquitto.container.image> - <elasticsearch.container.image>mirror.gcr.io/elastic/elasticsearch:8.15.1</elasticsearch.container.image> + <elasticsearch.container.image>mirror.gcr.io/elastic/elasticsearch:9.0.2</elasticsearch.container.image> <eventhubs-emulator.container.image>mcr.microsoft.com/azure-messaging/eventhubs-emulator:latest</eventhubs-emulator.container.image> <fhir.container.image.base>mirror.gcr.io/hapiproject/hapi</fhir.container.image.base> <fhir.container.image>${fhir.container.image.base}:v7.2.0</fhir.container.image> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index ef5f311c82..76b0b16cd2 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -7495,6 +7495,11 @@ <artifactId>oak-jackrabbit-api</artifactId> <version>${oak-jackrabbit-api.version}</version> </dependency> + <dependency> + <groupId>org.apache.kafka</groupId> + <artifactId>connect-json</artifactId> + <version>${kafka.version}</version> + </dependency> <dependency> <groupId>org.apache.kafka</groupId> <artifactId>connect-runtime</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 751066af59..ce4519fb53 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6748,7 +6748,7 @@ <dependency> <groupId>com.github.luben</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>zstd-jni</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.5.6-4</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.5.6-6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>com.github.mwiede</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7216,7 +7216,7 @@ <dependency> <groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.27.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.28.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>io.swagger.codegen.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7401,10 +7401,15 @@ <artifactId>oak-jackrabbit-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>1.64.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>connect-json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>connect-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>io.swagger.core.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7497,17 +7502,17 @@ <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>bcmail-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.80</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.81</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>bcpg-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.80</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.81</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>bcutil-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.80</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.81</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.eclipse.angus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -22761,11 +22766,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.kafka</groupId><!-- io.debezium:debezium-bom:3.1.0.Final --> - <artifactId>connect-json</artifactId><!-- io.debezium:debezium-bom:3.1.0.Final --> - <version>3.9.0</version><!-- io.debezium:debezium-bom:3.1.0.Final --> - </dependency> <dependency> <groupId>org.apache.kafka</groupId><!-- io.debezium:debezium-bom:3.1.0.Final --> <artifactId>connect-file</artifactId><!-- io.debezium:debezium-bom:3.1.0.Final --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index a180873473..1fe92b4c79 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6738,7 +6738,7 @@ <dependency> <groupId>com.github.luben</groupId> <artifactId>zstd-jni</artifactId> - <version>1.5.6-4</version> + <version>1.5.6-6</version> </dependency> <dependency> <groupId>com.github.mwiede</groupId> @@ -7171,7 +7171,7 @@ <dependency> <groupId>io.smallrye.reactive</groupId> <artifactId>smallrye-reactive-messaging-camel</artifactId> - <version>4.27.0</version> + <version>4.28.0</version> </dependency> <dependency> <groupId>io.swagger.codegen.v3</groupId> @@ -7346,10 +7346,15 @@ <artifactId>oak-jackrabbit-api</artifactId> <version>1.64.0</version> </dependency> + <dependency> + <groupId>org.apache.kafka</groupId> + <artifactId>connect-json</artifactId> + <version>4.0.0</version> + </dependency> <dependency> <groupId>org.apache.kafka</groupId> <artifactId>connect-runtime</artifactId> - <version>3.9.0</version> + <version>4.0.0</version> <exclusions> <exclusion> <groupId>io.swagger.core.v3</groupId> @@ -7442,17 +7447,17 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcmail-jdk18on</artifactId> - <version>1.80</version> + <version>1.81</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpg-jdk18on</artifactId> - <version>1.80</version> + <version>1.81</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcutil-jdk18on</artifactId> - <version>1.80</version> + <version>1.81</version> </dependency> <dependency> <groupId>org.eclipse.angus</groupId> @@ -8824,11 +8829,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.kafka</groupId> - <artifactId>connect-json</artifactId> - <version>3.9.0</version> - </dependency> <dependency> <groupId>org.apache.kafka</groupId> <artifactId>connect-file</artifactId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index a772371b93..031d883b72 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6738,7 +6738,7 @@ <dependency> <groupId>com.github.luben</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>zstd-jni</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.5.6-4</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.5.6-6</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>com.github.mwiede</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7171,7 +7171,7 @@ <dependency> <groupId>io.smallrye.reactive</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>smallrye-reactive-messaging-camel</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>4.27.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.28.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>io.swagger.codegen.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7346,10 +7346,15 @@ <artifactId>oak-jackrabbit-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>1.64.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>connect-json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>org.apache.kafka</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>connect-runtime</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>io.swagger.core.v3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7442,17 +7447,17 @@ <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>bcmail-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.80</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.81</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>bcpg-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.80</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.81</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>bcutil-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.80</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.81</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.eclipse.angus</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -8824,11 +8829,6 @@ </exclusion> </exclusions> </dependency> - <dependency> - <groupId>org.apache.kafka</groupId><!-- io.debezium:debezium-bom:3.1.0.Final --> - <artifactId>connect-json</artifactId><!-- io.debezium:debezium-bom:3.1.0.Final --> - <version>3.9.0</version><!-- io.debezium:debezium-bom:3.1.0.Final --> - </dependency> <dependency> <groupId>org.apache.kafka</groupId><!-- io.debezium:debezium-bom:3.1.0.Final --> <artifactId>connect-file</artifactId><!-- io.debezium:debezium-bom:3.1.0.Final --> diff --git a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java index 033d336b9f..2ca129b7ba 100644 --- a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java +++ b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java @@ -25,6 +25,8 @@ import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.engine.execution.NamespaceAwareStore; import org.junit.platform.engine.support.store.NamespacedHierarchicalStore; +import static org.junit.platform.engine.support.store.Namespace.GLOBAL; + public class CallbackUtil { private CallbackUtil() { // Utility class @@ -70,8 +72,7 @@ public class CallbackUtil { public MockExtensionContext(Optional<TestInstance.Lifecycle> lifecycle, String currentTestName) { this.lifecycle = lifecycle; this.currentTestName = currentTestName; - this.globalStore = new NamespaceAwareStore(new NamespacedHierarchicalStore<>(null), - ExtensionContext.Namespace.GLOBAL); + this.globalStore = new NamespaceAwareStore(new NamespacedHierarchicalStore<>(null), GLOBAL); } public String getDisplayName() {