This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 6a63a2eb1edfb9e0056f6657824f74eba489c4a3
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 +-
.../csimple/deployment/CSimpleProcessor.java | 3 ++-
.../dsl/jsh/deployment/JshDslProcessor.java | 3 ++-
.../dsl/kotlin/deployment/KotlinDslProcessor.java | 3 ++-
.../resources/container-license-acceptance.txt | 2 +-
integration-tests/camel-k-runtime/pom.xml | 3 ---
.../kafka/sasl/KafkaSaslSslTestResource.java | 27 +++++++++++-----------
.../quarkus/kafka/sasl/KafkaSaslTestResource.java | 25 ++++++++++----------
.../quarkus/kafka/ssl/KafkaSslTestResource.java | 27 +++++++++++-----------
integration-tests/kubernetes/pom.xml | 3 ---
integration-tests/master-openshift/pom.xml | 3 ---
pom.xml | 8 +++----
poms/bom/src/main/generated/flattened-full-pom.xml | 14 +++++------
.../src/main/generated/flattened-reduced-pom.xml | 10 ++++----
.../generated/flattened-reduced-verbose-pom.xml | 10 ++++----
.../apache/camel/quarkus/test/CallbackUtil.java | 5 ++--
16 files changed, 70 insertions(+), 78 deletions(-)
diff --git a/docs/antora.yml b/docs/antora.yml
index 712a77e3b7..d4fcac0519 100644
--- a/docs/antora.yml
+++ b/docs/antora.yml
@@ -30,7 +30,7 @@ asciidoc:
# Project versions
camel-version: 4.1.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: 3.5.0.CR1 # 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/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
index 16e1946651..f680a9378d 100644
---
a/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
+++
b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java
@@ -268,7 +268,8 @@ class CSimpleProcessor {
"11",
"11",
Collections.emptyList(),
- Collections.emptyList());
+ Collections.emptyList(),
+ null);
}
}
diff --git
a/extensions/jsh-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/jsh/deployment/JshDslProcessor.java
b/extensions/jsh-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/jsh/deployment/JshDslProcessor.java
index 2c8e5f53f8..44ebf785be 100644
---
a/extensions/jsh-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/jsh/deployment/JshDslProcessor.java
+++
b/extensions/jsh-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/jsh/deployment/JshDslProcessor.java
@@ -135,7 +135,8 @@ class JshDslProcessor {
null,
null,
List.of(),
- List.of());
+ List.of(),
+ null);
try (JavaCompilationProvider compiler = new JavaCompilationProvider())
{
compiler.compile(filesToCompile, context);
}
diff --git
a/extensions/kotlin-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/kotlin/deployment/KotlinDslProcessor.java
b/extensions/kotlin-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/kotlin/deployment/KotlinDslProcessor.java
index 413f422e42..fa77f39700 100644
---
a/extensions/kotlin-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/kotlin/deployment/KotlinDslProcessor.java
+++
b/extensions/kotlin-dsl/deployment/src/main/java/org/apache/camel/quarkus/dsl/kotlin/deployment/KotlinDslProcessor.java
@@ -136,7 +136,8 @@ class KotlinDslProcessor {
KotlinConstantsKt.JVM_TARGET,
KotlinConstantsKt.JVM_TARGET,
List.of(),
- List.of());
+ List.of(),
+ null);
try (KotlinCompilationProvider compiler = new
KotlinCompilationProvider()) {
compiler.compile(filesToCompile, context);
}
diff --git
a/integration-test-groups/jdbc/mssql/src/test/resources/container-license-acceptance.txt
b/integration-test-groups/jdbc/mssql/src/test/resources/container-license-acceptance.txt
index 56ecd37372..de8cca62a2 100644
---
a/integration-test-groups/jdbc/mssql/src/test/resources/container-license-acceptance.txt
+++
b/integration-test-groups/jdbc/mssql/src/test/resources/container-license-acceptance.txt
@@ -1 +1 @@
-mcr.microsoft.com/mssql/server:2019-latest
\ No newline at end of file
+mcr.microsoft.com/mssql/server:2022-latest
\ No newline at end of file
diff --git a/integration-tests/camel-k-runtime/pom.xml
b/integration-tests/camel-k-runtime/pom.xml
index d3049831d3..5d98758812 100644
--- a/integration-tests/camel-k-runtime/pom.xml
+++ b/integration-tests/camel-k-runtime/pom.xml
@@ -121,8 +121,6 @@
<quarkus.native.native-image-xmx>5g</quarkus.native.native-image-xmx>
</properties>
</profile>
- <!--
- //https://github.com/apache/camel-quarkus/issues/5318
<profile>
<id>native</id>
<activation>
@@ -156,7 +154,6 @@
</plugins>
</build>
</profile>
- -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git
a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
index ac807d3776..286ca9cc5f 100644
---
a/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
+++
b/integration-tests/kafka-sasl-ssl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslSslTestResource.java
@@ -100,12 +100,25 @@ public class KafkaSaslSslTestResource extends
KafkaTestResource {
SaslSslKafkaContainer(final DockerImageName dockerImageName) {
super(dockerImageName);
+ }
+
+ @Override
+ public String getBootstrapServers() {
+ return String.format("SASL_SSL://%s:%s", getHost(),
getMappedPort(KAFKA_PORT));
+ }
+
+ @Override
+ protected void configure() {
+ super.configure();
String protocolMap = "SASL_SSL:SASL_SSL,BROKER:PLAINTEXT";
String listeners = "SASL_SSL://0.0.0.0:" + KAFKA_PORT +
",BROKER://0.0.0.0:9092";
+ String host = getNetwork() != null ? getNetworkAliases().get(0) :
"localhost";
withEnv("KAFKA_OPTS",
"-Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf");
withEnv("KAFKA_LISTENERS", listeners);
+ withEnv("KAFKA_ADVERTISED_LISTENERS",
+ String.format("SASL_SSL://%s:9093,BROKER://%s:9092", host,
host));
withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", protocolMap);
withEnv("KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE", "false");
withEnv("KAFKA_SASL_ENABLED_MECHANISMS", "SCRAM-SHA-512");
@@ -123,20 +136,6 @@ public class KafkaSaslSslTestResource extends
KafkaTestResource {
waitingFor(Wait.forLogMessage(".*started.*KafkaServer.*", 1));
}
- @Override
- public String getBootstrapServers() {
- return String.format("SASL_SSL://%s:%s", getHost(),
getMappedPort(KAFKA_PORT));
- }
-
- @Override
- protected void configure() {
- super.configure();
-
- String host = getNetwork() != null ? getNetworkAliases().get(0) :
"localhost";
- withEnv("KAFKA_ADVERTISED_LISTENERS",
- String.format("SASL_SSL://%s:9093,BROKER://%s:9092", host,
host));
- }
-
@Override
protected void containerIsStarting(InspectContainerResponse
containerInfo, boolean reused) {
super.containerIsStarting(containerInfo, reused);
diff --git
a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java
b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java
index 66c2fe77ce..4a6dc3ee51 100644
---
a/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java
+++
b/integration-tests/kafka-sasl/src/test/java/org/apache/camel/quarkus/kafka/sasl/KafkaSaslTestResource.java
@@ -82,19 +82,6 @@ public class KafkaSaslTestResource extends KafkaTestResource
{
SaslKafkaContainer(final DockerImageName dockerImageName) {
super(dockerImageName);
-
- String protocolMap =
"SASL_PLAINTEXT:SASL_PLAINTEXT,BROKER:PLAINTEXT";
- String listeners = "SASL_PLAINTEXT://0.0.0.0:" + KAFKA_PORT +
",BROKER://0.0.0.0:9092";
-
- withEnv("KAFKA_OPTS",
"-Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf");
- withEnv("KAFKA_LISTENERS", listeners);
- withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", protocolMap);
- withEnv("KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE", "false");
- withEnv("KAFKA_SASL_ENABLED_MECHANISMS", "PLAIN");
- withEnv("ZOOKEEPER_SASL_ENABLED", "false");
- withEnv("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER");
- withEnv("KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL", "PLAIN");
- withEmbeddedZookeeper().waitingFor(Wait.forListeningPort());
}
@Override
@@ -106,9 +93,21 @@ public class KafkaSaslTestResource extends
KafkaTestResource {
protected void configure() {
super.configure();
+ String protocolMap =
"SASL_PLAINTEXT:SASL_PLAINTEXT,BROKER:PLAINTEXT";
+ String listeners = "SASL_PLAINTEXT://0.0.0.0:" + KAFKA_PORT +
",BROKER://0.0.0.0:9092";
String host = getNetwork() != null ? getNetworkAliases().get(0) :
"localhost";
+
+ withEnv("KAFKA_OPTS",
"-Djava.security.auth.login.config=/etc/kafka/kafka_server_jaas.conf");
+ withEnv("KAFKA_LISTENERS", listeners);
withEnv("KAFKA_ADVERTISED_LISTENERS",
String.format("SASL_PLAINTEXT://%s:9093,BROKER://%s:9092",
host, host));
+ withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", protocolMap);
+ withEnv("KAFKA_CONFLUENT_SUPPORT_METRICS_ENABLE", "false");
+ withEnv("KAFKA_SASL_ENABLED_MECHANISMS", "PLAIN");
+ withEnv("ZOOKEEPER_SASL_ENABLED", "false");
+ withEnv("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER");
+ withEnv("KAFKA_SASL_MECHANISM_INTER_BROKER_PROTOCOL", "PLAIN");
+ withEmbeddedZookeeper().waitingFor(Wait.forListeningPort());
}
@Override
diff --git
a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java
b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java
index ed0e0da401..3a80ac4e94 100644
---
a/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java
+++
b/integration-tests/kafka-ssl/src/test/java/org/apache/camel/quarkus/kafka/ssl/KafkaSslTestResource.java
@@ -96,11 +96,24 @@ public class KafkaSslTestResource extends KafkaTestResource
{
SSLKafkaContainer(final DockerImageName dockerImageName) {
super(dockerImageName);
+ }
+
+ @Override
+ public String getBootstrapServers() {
+ return String.format("SSL://%s:%s", getHost(),
getMappedPort(KAFKA_PORT));
+ }
+
+ @Override
+ protected void configure() {
+ super.configure();
String protocolMap = "SSL:SSL,BROKER:PLAINTEXT";
String listeners = "SSL://0.0.0.0:" + KAFKA_PORT +
",BROKER://0.0.0.0:9092";
+ String host = getNetwork() != null ? getNetworkAliases().get(0) :
"localhost";
withEnv("KAFKA_LISTENERS", listeners);
+ withEnv("KAFKA_ADVERTISED_LISTENERS",
+ String.format("SSL://%s:9093,BROKER://%s:9092", host,
host));
withEnv("KAFKA_LISTENER_SECURITY_PROTOCOL_MAP", protocolMap);
withEnv("KAFKA_INTER_BROKER_LISTENER_NAME", "BROKER");
withEnv("KAFKA_SSL_KEY_CREDENTIALS", KAFKA_SSL_CREDS_FILE);
@@ -116,20 +129,6 @@ public class KafkaSslTestResource extends
KafkaTestResource {
withLogConsumer(frame -> System.out.print(frame.getUtf8String()));
}
- @Override
- public String getBootstrapServers() {
- return String.format("SSL://%s:%s", getHost(),
getMappedPort(KAFKA_PORT));
- }
-
- @Override
- protected void configure() {
- super.configure();
-
- String host = getNetwork() != null ? getNetworkAliases().get(0) :
"localhost";
- withEnv("KAFKA_ADVERTISED_LISTENERS",
- String.format("SSL://%s:9093,BROKER://%s:9092", host,
host));
- }
-
@Override
protected void containerIsStarting(InspectContainerResponse
containerInfo, boolean reused) {
super.containerIsStarting(containerInfo, reused);
diff --git a/integration-tests/kubernetes/pom.xml
b/integration-tests/kubernetes/pom.xml
index fc0b898453..1f41bc8f49 100644
--- a/integration-tests/kubernetes/pom.xml
+++ b/integration-tests/kubernetes/pom.xml
@@ -81,8 +81,6 @@
<quarkus.native.native-image-xmx>5g</quarkus.native.native-image-xmx>
</properties>
</profile>
- <!--
- //https://github.com/apache/camel-quarkus/issues/5318
<profile>
<id>native</id>
<activation>
@@ -110,7 +108,6 @@
</plugins>
</build>
</profile>
- -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/integration-tests/master-openshift/pom.xml
b/integration-tests/master-openshift/pom.xml
index fc59424676..ce8f5b2e4c 100644
--- a/integration-tests/master-openshift/pom.xml
+++ b/integration-tests/master-openshift/pom.xml
@@ -154,8 +154,6 @@
</plugins>
</build>
</profile>
- <!--
- // https://github.com/apache/camel-quarkus/issues/5318
<profile>
<id>native</id>
<activation>
@@ -193,7 +191,6 @@
</plugins>
</build>
</profile>
- -->
<profile>
<id>virtualDependencies</id>
<activation>
diff --git a/pom.xml b/pom.xml
index 65bb455f84..8d45b4beee 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>3.5.0.CR1</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/ -->
@@ -71,8 +71,8 @@
<angus-mail.version>${angus-mail-version}</angus-mail.version>
<animal-sniffer.version>1.18</animal-sniffer.version>
<antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and
probably others -->
- <avro.version>1.11.2</avro.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
<audience-annotations.version>${yetus-audience-annotations-version}</audience-annotations.version>
+ <avro.version>1.11.3</avro.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
<awssdk.version>2.20.128</awssdk.version><!-- @sync
io.quarkiverse.amazonservices:quarkus-amazon-services-parent:${quarkiverse-amazonservices.version}
prop:awssdk.version -->
<awscrt.version>0.24.0</awscrt.version><!-- @sync
software.amazon.awssdk:aws-sdk-java-pom:${awssdk.version} prop:awscrt.version
-->
<assertj.version>3.24.2</assertj.version><!-- @sync
io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
@@ -82,7 +82,7 @@
<azure-identity.version>1.10.1</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>
@@ -144,7 +144,7 @@
<reactor-core.version>3.4.31</reactor-core.version><!-- @sync
com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core
-->
<reactor-netty.version>${reactor-netty-version}</reactor-netty.version>
<retrofit.version>2.9.0</retrofit.version><!-- @sync
org.influxdb:influxdb-java:${influxdb.version}
dep:com.squareup.retrofit2:retrofit -->
-
<smallrye.reactive.messaging.camel.version>4.9.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.10.1</smallrye.reactive.messaging.camel.version><!--
@sync io.quarkus:quarkus-bom:${quarkus.version}
dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<spring.version>${spring-version}</spring.version>
<snakeyaml.version>2.1</snakeyaml.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->
<tablesaw.version>0.43.1</tablesaw.version>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index 8a3d58ad69..bd05705a36 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6327,7 +6327,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.9.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.10.1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6387,12 +6387,12 @@
<dependency>
<groupId>org.apache.avro</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-jetty</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.3</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.avro</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>avro-ipc-netty</artifactId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <version>1.11.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>1.11.3</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>org.apache.groovy</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6534,22 +6534,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 2a4aa31fd3..1383715e82 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6317,7 +6317,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-camel</artifactId>
- <version>4.9.0</version>
+ <version>4.10.1</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
@@ -6489,22 +6489,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 168cdb2679..4d7184f8dc 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6317,7 +6317,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.9.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.10.1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -6489,22 +6489,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
