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 95d782784beee73f569f8f620585e96f8600946d Author: James Netherton <[email protected]> AuthorDate: Wed Feb 28 08:13:46 2024 +0000 Upgrade Quarkus to 3.9.0.CR1 --- docs/antora.yml | 2 +- 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/js-dsl/runtime/pom.xml | 4 ++++ extensions/opentelemetry/deployment/pom.xml | 5 +++++ extensions/salesforce/deployment/pom.xml | 4 ++++ extensions/salesforce/runtime/pom.xml | 4 ++++ .../test/resources/container-license-acceptance.txt | 2 +- pom.xml | 10 +++++----- poms/bom/pom.xml | 8 +++++++- poms/bom/src/main/generated/flattened-full-pom.xml | 19 +++++++++++++++---- poms/bom/src/main/generated/flattened-reduced-pom.xml | 12 +++++++++--- .../main/generated/flattened-reduced-verbose-pom.xml | 12 +++++++++--- .../apache/camel/quarkus/test/AfterEachCallback.java | 1 + .../apache/camel/quarkus/test/BeforeEachCallback.java | 1 + .../AdviceInDoBeforeEachMethodsTest.java | 6 +++--- 20 files changed, 97 insertions(+), 21 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 3bb969c940..b70e7dca08 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -32,7 +32,7 @@ asciidoc: camel-docs-version: 4.4.x camel-quarkus-version: 3.9.0 # replace ${camel-quarkus.version} quarkus-version: 3.8.2 # replace ${quarkus.version} - graalvm-version: 23.0.1 # replace ${graalvm.version} + graalvm-version: 23.1.2 # replace ${graalvm.version} graalvm-docs-version: jdk21 # replace ${graalvm-docs.version} mapstruct-version: 1.5.5.Final # replace ${mapstruct.version} min-maven-version: 3.8.2 # replace ${min-maven-version} 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/js-dsl/runtime/pom.xml b/extensions/js-dsl/runtime/pom.xml index 51145aaa2a..79d6071910 100644 --- a/extensions/js-dsl/runtime/pom.xml +++ b/extensions/js-dsl/runtime/pom.xml @@ -46,6 +46,10 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-js-dsl</artifactId> </dependency> + <dependency> + <groupId>org.graalvm.js</groupId> + <artifactId>js-language</artifactId> + </dependency> </dependencies> <build> diff --git a/extensions/opentelemetry/deployment/pom.xml b/extensions/opentelemetry/deployment/pom.xml index 6f670ab186..0d7a9ce634 100644 --- a/extensions/opentelemetry/deployment/pom.xml +++ b/extensions/opentelemetry/deployment/pom.xml @@ -54,6 +54,11 @@ <artifactId>quarkus-junit5-internal</artifactId> <scope>test</scope> </dependency> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-security-deployment</artifactId> + <scope>test</scope> + </dependency> </dependencies> <build> 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 e25acfcea9..c445dde485 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ <quarkiverse-mybatis.version>2.2.2</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.2</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.6.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 --> @@ -100,10 +100,10 @@ <google-cloud-bom.version>0.212.0</google-cloud-bom.version><!-- @sync com.google.cloud:libraries-bom:${google-cloud-bom-version} dep:com.google.cloud:google-cloud-bom --> <google-cloud-pubsub-bom.version>1.126.2</google-cloud-pubsub-bom.version><!-- @sync com.google.cloud:google-cloud-bom:${google-cloud-bom.version} dep:com.google.cloud:google-cloud-pubsub-bom --> <google-cloud-pubsub.version>1.126.2</google-cloud-pubsub.version><!-- @sync com.google.cloud:google-cloud-pubsub-bom:${google-cloud-pubsub-bom.version} dep:com.google.cloud:google-cloud-pubsub --> - <graalvm.version>23.0.1</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk --> + <graalvm.version>23.1.2</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.62.2</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 --> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 2b6dd5ca23..dfcdbb219c 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1611,6 +1611,12 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-js-dsl</artifactId> <version>${camel.version}</version> + <exclusions> + <exclusion> + <groupId>org.graalvm.js</groupId> + <artifactId>js</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -6743,7 +6749,7 @@ </dependency> <dependency> <groupId>org.graalvm.js</groupId> - <artifactId>js</artifactId> + <artifactId>js-language</artifactId> <version>${graalvm.version}</version> </dependency> <dependency> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 7d91ee6e1e..de6b4d29ae 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1549,6 +1549,12 @@ <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-js-dsl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6537,7 +6543,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} --> @@ -6666,13 +6672,13 @@ </dependency> <dependency> <groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>23.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>js-language</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>23.1.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>js-scriptengine</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>23.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>23.1.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.influxdb</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -19836,6 +19842,11 @@ <artifactId>txw2</artifactId><!-- io.quarkus:quarkus-bom:3.8.1 --> <version>4.0.4</version><!-- io.quarkus:quarkus-bom:3.8.1 --> </dependency> + <dependency> + <groupId>org.graalvm.js</groupId><!-- io.quarkus:quarkus-bom:3.8.1 --> + <artifactId>js</artifactId><!-- io.quarkus:quarkus-bom:3.8.1 --> + <version>23.0.1</version><!-- io.quarkus:quarkus-bom:3.8.1 --> + </dependency> <dependency> <groupId>org.graalvm.sdk</groupId><!-- io.quarkus:quarkus-bom:3.8.1 --> <artifactId>graal-sdk</artifactId><!-- io.quarkus:quarkus-bom:3.8.1 --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 079603546f..9267de8d8c 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1549,6 +1549,12 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-js-dsl</artifactId> <version>4.4.0</version> + <exclusions> + <exclusion> + <groupId>org.graalvm.js</groupId> + <artifactId>js</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -6477,7 +6483,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> @@ -6606,8 +6612,8 @@ </dependency> <dependency> <groupId>org.graalvm.js</groupId> - <artifactId>js</artifactId> - <version>23.0.1</version> + <artifactId>js-language</artifactId> + <version>23.1.2</version> </dependency> <dependency> <groupId>org.influxdb</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 bbd9fcdea0..9c1ab86a0b 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1549,6 +1549,12 @@ <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>camel-js-dsl</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <exclusions> + <exclusion> + <groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.camel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6477,7 +6483,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} --> @@ -6606,8 +6612,8 @@ </dependency> <dependency> <groupId>org.graalvm.js</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>js</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>23.0.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>js-language</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>23.1.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.influxdb</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); }
