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 1715274739f9a6e0bdd9d398a02356a415038ead
Author: James Netherton <jamesnether...@gmail.com>
AuthorDate: Wed Feb 28 08:13:46 2024 +0000
Upgrade Quarkus to 3.9.0.CR1
---
extensions/google-bigquery/deployment/pom.xml | 4 ++++
extensions/google-bigquery/runtime/pom.xml | 4 ++++
extensions/google-pubsub/deployment/pom.xml | 4 ++++
extensions/google-pubsub/runtime/pom.xml | 4 ++++
extensions/grpc/deployment/pom.xml | 4 ++++
extensions/grpc/runtime/pom.xml | 8 ++++++++
extensions/salesforce/deployment/pom.xml | 4 ++++
extensions/salesforce/runtime/pom.xml | 4 ++++
.../db2/src/test/resources/container-license-acceptance.txt | 2 +-
pom.xml | 10 +++++-----
poms/bom/src/main/generated/flattened-full-pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-reduced-pom.xml | 4 ++--
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 4 ++--
.../java/org/apache/camel/quarkus/test/AfterEachCallback.java | 1 +
.../java/org/apache/camel/quarkus/test/BeforeEachCallback.java | 1 +
.../test/userTestCases/AdviceInDoBeforeEachMethodsTest.java | 6 +++---
16 files changed, 53 insertions(+), 15 deletions(-)
diff --git a/extensions/google-bigquery/deployment/pom.xml
b/extensions/google-bigquery/deployment/pom.xml
index e4cb3b702f..193d2935dc 100644
--- a/extensions/google-bigquery/deployment/pom.xml
+++ b/extensions/google-bigquery/deployment/pom.xml
@@ -54,6 +54,10 @@
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-server</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/extensions/google-bigquery/runtime/pom.xml
b/extensions/google-bigquery/runtime/pom.xml
index 15a4b77477..9dfe0da15d 100644
--- a/extensions/google-bigquery/runtime/pom.xml
+++ b/extensions/google-bigquery/runtime/pom.xml
@@ -90,6 +90,10 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-netty</artifactId>
<exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
<exclusion>
<groupId>com.google.android</groupId>
<artifactId>annotations</artifactId>
diff --git a/extensions/google-pubsub/deployment/pom.xml
b/extensions/google-pubsub/deployment/pom.xml
index 31b8b31739..3820cbf30b 100644
--- a/extensions/google-pubsub/deployment/pom.xml
+++ b/extensions/google-pubsub/deployment/pom.xml
@@ -58,6 +58,10 @@
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-server</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/extensions/google-pubsub/runtime/pom.xml
b/extensions/google-pubsub/runtime/pom.xml
index 9161883ace..437a7ebb91 100644
--- a/extensions/google-pubsub/runtime/pom.xml
+++ b/extensions/google-pubsub/runtime/pom.xml
@@ -113,6 +113,10 @@
<groupId>com.google.android</groupId>
<artifactId>annotations</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
<exclusion>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
diff --git a/extensions/grpc/deployment/pom.xml
b/extensions/grpc/deployment/pom.xml
index db1b712e67..e606eeb03e 100644
--- a/extensions/grpc/deployment/pom.xml
+++ b/extensions/grpc/deployment/pom.xml
@@ -50,6 +50,10 @@
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-server</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/extensions/grpc/runtime/pom.xml b/extensions/grpc/runtime/pom.xml
index bc4e5e3974..b58d4f005d 100644
--- a/extensions/grpc/runtime/pom.xml
+++ b/extensions/grpc/runtime/pom.xml
@@ -39,6 +39,10 @@
<groupId>io.quarkus</groupId>
<artifactId>quarkus-grpc-common</artifactId>
<exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
<exclusion>
<groupId>io.quarkus</groupId>
<artifactId>quarkus-vertx</artifactId>
@@ -55,6 +59,10 @@
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-server</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/extensions/salesforce/deployment/pom.xml
b/extensions/salesforce/deployment/pom.xml
index 2b2e620592..cd5e5989c7 100644
--- a/extensions/salesforce/deployment/pom.xml
+++ b/extensions/salesforce/deployment/pom.xml
@@ -57,6 +57,10 @@
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-server</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/extensions/salesforce/runtime/pom.xml
b/extensions/salesforce/runtime/pom.xml
index 0d5fbb0626..4868698643 100644
--- a/extensions/salesforce/runtime/pom.xml
+++ b/extensions/salesforce/runtime/pom.xml
@@ -62,6 +62,10 @@
<groupId>io.vertx</groupId>
<artifactId>vertx-grpc-server</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.checkerframework</groupId>
+ <artifactId>checker-qual</artifactId>
+ </exclusion>
</exclusions>
</dependency>
diff --git
a/integration-test-groups/jdbc/db2/src/test/resources/container-license-acceptance.txt
b/integration-test-groups/jdbc/db2/src/test/resources/container-license-acceptance.txt
index 4ae18dac18..1d9dcc945a 100644
---
a/integration-test-groups/jdbc/db2/src/test/resources/container-license-acceptance.txt
+++
b/integration-test-groups/jdbc/db2/src/test/resources/container-license-acceptance.txt
@@ -1 +1 @@
-docker.io/ibmcom/db2:11.5.7.0a
\ No newline at end of file
+icr.io/db2_community/db2:11.5.9.0
diff --git a/pom.xml b/pom.xml
index a00a442ce9..9a60b53cdc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,7 +61,7 @@
<quarkiverse-mybatis.version>2.2.1</quarkiverse-mybatis.version><!--
https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/
-->
<quarkiverse-pooled-jms.version>2.3.1</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.8.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.5.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/ -->
@@ -75,7 +75,7 @@
<avro.version>1.11.3</avro.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro -->
<awssdk.version>2.24.9</awssdk.version><!-- @sync
io.quarkiverse.amazonservices:quarkus-amazon-services-parent:${quarkiverse-amazonservices.version}
prop:awssdk.version -->
<awscrt.version>0.29.9</awscrt.version><!-- @sync
software.amazon.awssdk:aws-sdk-java-pom:${awssdk.version} prop:awscrt.version
-->
- <assertj.version>3.25.1</assertj.version><!-- @sync
io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
+ <assertj.version>3.25.3</assertj.version><!-- @sync
io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version -->
<aws-java-sdk.version>1.11.714</aws-java-sdk.version>
<azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version>
<azure-core.version>1.45.1</azure-core.version><!-- @sync
com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-core -->
@@ -103,7 +103,7 @@
<graalvm.version>23.0.1</graalvm.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk -->
<graalvm-docs.version>jdk21</graalvm-docs.version><!-- @sync
io.quarkus:quarkus-documentation:${quarkus.version}
prop:graal-community.tag-for-documentation -->
<groovy.version>4.0.18</groovy.version><!-- @sync
io.quarkiverse.groovy:quarkus-groovy-parent:${quarkiverse-groovy.version}
prop:groovy.version -->
- <grpc.version>1.59.1</grpc.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
+ <grpc.version>1.61.1</grpc.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core -->
<hapi.version>${hapi-version}</hapi.version>
<hapi-base.version>${hapi-base-version}</hapi-base.version>
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
@@ -129,7 +129,7 @@
<json-path.version>${json-path-version}</json-path.version>
<jedis-client.version>${jedis-client-version}</jedis-client.version>
<json-smart.version>2.5.0</json-smart.version><!-- @sync
com.jayway.jsonpath:json-path:${json-path.version} dep:net.minidev:json-smart
-->
- <kafka.version>3.6.1</kafka.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
+ <kafka.version>3.7.0</kafka.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients -->
<kudu.version>${kudu-version}</kudu.version>
<kotlin.version>1.9.22</kotlin.version><!-- @sync
io.quarkus:quarkus-bom:${quarkus.version}
dep:org.jetbrains.kotlin:kotlin-stdlib -->
<kryo.version>2.24.0</kryo.version><!-- @sync
org.apache.flink:flink-core:${flink-version} dep:com.esotericsoftware.kryo:kryo
-->
@@ -148,7 +148,7 @@
<reactor-core.version>3.4.34</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.16.2</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.18.0</smallrye.reactive.messaging.camel.version><!--
@sync io.quarkus:quarkus-bom:${quarkus.version}
dep:io.smallrye.reactive:smallrye-reactive-messaging-provider -->
<snakeyaml.version>2.2</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 -->
<spring.version>${spring-version}</spring.version>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml
b/poms/bom/src/main/generated/flattened-full-pom.xml
index a39e94aa76..a128b9b212 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -6452,7 +6452,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.16.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.18.0</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} -->
@@ -6537,7 +6537,7 @@
<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.6.1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.7.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>javax.activation</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 47a58a9493..24f7c5dc0a 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6407,7 +6407,7 @@
<dependency>
<groupId>io.smallrye.reactive</groupId>
<artifactId>smallrye-reactive-messaging-camel</artifactId>
- <version>4.16.2</version>
+ <version>4.18.0</version>
</dependency>
<dependency>
<groupId>io.swagger.core.v3</groupId>
@@ -6477,7 +6477,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>connect-runtime</artifactId>
- <version>3.6.1</version>
+ <version>3.7.0</version>
<exclusions>
<exclusion>
<groupId>javax.activation</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 c0ab4d6406..89917123d7 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6407,7 +6407,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.16.2</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>4.18.0</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} -->
@@ -6477,7 +6477,7 @@
<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.6.1</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
+ <version>3.7.0</version><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<exclusions>
<exclusion>
<groupId>javax.activation</groupId><!--
org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterEachCallback.java
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterEachCallback.java
index 7f67fdbadd..eb4e43a089 100644
---
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterEachCallback.java
+++
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/AfterEachCallback.java
@@ -27,6 +27,7 @@ public class AfterEachCallback implements
QuarkusTestAfterEachCallback {
CamelQuarkusTestSupport testInstance = (CamelQuarkusTestSupport)
context.getTestInstance();
try {
+ testInstance.tearDown();
testInstance.doAfterEach(context);
} catch (Exception e) {
throw new RuntimeException(e);
diff --git
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/BeforeEachCallback.java
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/BeforeEachCallback.java
index f7903726b0..93ac9e34e7 100644
---
a/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/BeforeEachCallback.java
+++
b/test-framework/junit5/src/main/java/org/apache/camel/quarkus/test/BeforeEachCallback.java
@@ -36,6 +36,7 @@ public class BeforeEachCallback implements
QuarkusTestBeforeEachCallback {
try {
testInstance.internalBeforeEach(mockContext);
testInstance.internalBeforeAll(mockContext);
+ testInstance.setUp();
testInstance.doBeforeEach(context);
} catch (Exception e) {
throw new RuntimeException(e);
diff --git
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/userTestCases/AdviceInDoBeforeEachMethodsTest.java
b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/userTestCases/AdviceInDoBeforeEachMethodsTest.java
index 0af7cf9800..ae5b16d6eb 100644
---
a/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/userTestCases/AdviceInDoBeforeEachMethodsTest.java
+++
b/test-framework/junit5/src/test/java/org/apache/camel/quarkus/test/userTestCases/AdviceInDoBeforeEachMethodsTest.java
@@ -17,6 +17,7 @@
package org.apache.camel.quarkus.test.userTestCases;
import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.callback.QuarkusTestMethodContext;
import jakarta.inject.Inject;
import org.apache.camel.CamelContext;
import org.apache.camel.EndpointInject;
@@ -27,7 +28,6 @@ import org.apache.camel.builder.AdviceWithRouteBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.quarkus.test.CamelQuarkusTestSupport;
-import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
/**
@@ -56,8 +56,8 @@ public class AdviceInDoBeforeEachMethodsTest extends
CamelQuarkusTestSupport {
};
}
- @BeforeEach
- protected void applyAdvice() throws Exception {
+ @Override
+ protected void doBeforeEach(QuarkusTestMethodContext context) throws
Exception {
AdviceWith.adviceWith(this.context, "sampleRoute",
AdviceInDoBeforeEachMethodsTest::enhanceRoute);
}
