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 2854a9f90529158e1213302e969e87473a640fbf Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Fri Sep 8 08:35:36 2023 +0100 Upgrade Quarkus to 3.5.0.CR1 --- docs/antora.yml | 2 +- pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-full-pom.xml | 8 ++++---- poms/bom/src/main/generated/flattened-reduced-pom.xml | 8 ++++---- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 8 ++++---- .../src/main/java/org/apache/camel/quarkus/test/CallbackUtil.java | 5 +++-- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 9c8115d59b..31f03770b9 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -30,7 +30,7 @@ asciidoc: # Project versions camel-version: 4.0.0 # replace ${camel.version} camel-docs-version: 4.0.x # replace ${camel.docs.components.version} - quarkus-version: 3.4.1 # replace ${quarkus.version} + quarkus-version: 999-SNAPSHOT # replace ${quarkus.version} graalvm-version: 23.0.1 # replace ${graalvm.version} graalvm-docs-version: jdk17 mapstruct-version: 1.5.5.Final # replace ${mapstruct.version} diff --git a/pom.xml b/pom.xml index 55423daade..62d1b02843 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ <quarkiverse-mybatis.version>2.1.0</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ --> <quarkiverse-pooled-jms.version>2.2.0</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ --> <quarkiverse-tika.version>2.0.2</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ --> - <quarkus.version>3.4.1</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.4.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/ --> @@ -81,7 +81,7 @@ <azure-identity.version>1.9.2</azure-identity.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-identity --> <azure-core-http-vertx.version>1.0.0-beta.3</azure-core-http-vertx.version> <!-- TODO: https://github.com/apache/camel-quarkus/issues/4181 --> <cassandra-driver-test.version>3.7.1</cassandra-driver-test.version><!-- Keep in sync with testcontainers instead of Debezium bom --> - <bouncycastle.version>1.75</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on --> + <bouncycastle.version>1.76</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on --> <brotli.version>0.1.2</brotli.version><!-- @sync org.apache.httpcomponents.client5:httpclient5-parent:${httpclient5.version} prop:brotli.version --> <caffeine.version>3.1.5</caffeine.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.github.ben-manes.caffeine:caffeine --> <commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 267a2d0f52..b8efb51904 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6518,22 +6518,22 @@ <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.75</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.76</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.75</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.76</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>bcprov-ext-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.75</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.76</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.75</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.76</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.brotli</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index b6d3e6b998..b573db4fbf 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6473,22 +6473,22 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcmail-jdk18on</artifactId> - <version>1.75</version> + <version>1.76</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpg-jdk18on</artifactId> - <version>1.75</version> + <version>1.76</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-ext-jdk18on</artifactId> - <version>1.75</version> + <version>1.76</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcutil-jdk18on</artifactId> - <version>1.75</version> + <version>1.76</version> </dependency> <dependency> <groupId>org.brotli</groupId> 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 3cf5420c74..23f3dcb933 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6473,22 +6473,22 @@ <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.75</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.76</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.75</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.76</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>bcprov-ext-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.75</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.76</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.75</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.76</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.brotli</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> 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 f01d15d7ed..e67ab30b82 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 @@ -29,8 +29,8 @@ import org.junit.jupiter.api.extension.ExecutableInvoker; import org.junit.jupiter.api.extension.ExtensionContext; import org.junit.jupiter.api.extension.TestInstances; import org.junit.jupiter.api.parallel.ExecutionMode; -import org.junit.jupiter.engine.execution.ExtensionValuesStore; import org.junit.jupiter.engine.execution.NamespaceAwareStore; +import org.junit.platform.engine.support.store.NamespacedHierarchicalStore; public class CallbackUtil { @@ -75,7 +75,8 @@ public class CallbackUtil { public MockExtensionContext(Optional<TestInstance.Lifecycle> lifecycle, String currentTestName) { this.lifecycle = lifecycle; this.currentTestName = currentTestName; - this.globalStore = new NamespaceAwareStore(new ExtensionValuesStore(null), ExtensionContext.Namespace.GLOBAL); + this.globalStore = new NamespaceAwareStore(new NamespacedHierarchicalStore<>(null), + ExtensionContext.Namespace.GLOBAL); } @Override