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 ac7a080d2a25f645f6a4c062239674d55b374982 Author: James Netherton <[email protected]> AuthorDate: Thu Jul 21 17:51:56 2022 +0100 Upgrade Quarkus to 2.12.0.CR1 --- docs/antora.yml | 6 +++--- .../java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java | 7 +++++-- integration-tests/js-dsl/pom.xml | 1 - pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml | 4 ++-- poms/bom/src/main/generated/flattened-reduced-pom.xml | 2 +- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 2 +- 7 files changed, 15 insertions(+), 13 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 088d2f681f..eff957b106 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -31,9 +31,9 @@ asciidoc: target-maven-version: 3.8.6 # replace ${target-maven-version} camel-version: 3.18.0 # replace ${camel.version} camel-docs-version: 3.18.x # replace ${camel.docs.components.version} - quarkus-version: 2.11.1.Final # replace ${quarkus.version} - graalvm-version: 22.1.0 # replace ${graalvm.version} - graalvm-docs-version: 22.1 + quarkus-version: 999-SNAPSHOT # replace ${quarkus.version} + graalvm-version: 22.2.0 # replace ${graalvm.version} + graalvm-docs-version: 22.2 # attributes used in xrefs to other Antora components cq-camel-components: 3.18.x@components # replace ${camel.docs.components.xref} quarkus-examples-version: latest diff --git a/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java b/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java index eaae495205..4a90a7ff06 100644 --- a/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java +++ b/integration-tests/grpc/src/test/java/org/apache/camel/quarkus/component/grpc/it/GrpcTest.java @@ -54,6 +54,7 @@ import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; @QuarkusTest @QuarkusTestResource(GrpcServerTestResource.class) @@ -238,7 +239,8 @@ class GrpcTest { PongResponseStreamObserver responseObserver = new PongResponseStreamObserver(latch); StreamObserver<PingRequest> requestObserver = pingPongStub.pingAsyncSync(responseObserver); requestObserver.onNext(pingRequest); - latch.await(5, TimeUnit.SECONDS); + requestObserver.onCompleted(); + assertTrue(latch.await(5, TimeUnit.SECONDS)); Awaitility.await().atMost(5, TimeUnit.SECONDS).until(() -> { JsonPath json = RestAssured.get("/grpc/tls") @@ -301,7 +303,8 @@ class GrpcTest { PongResponseStreamObserver responseObserver = new PongResponseStreamObserver(latch); StreamObserver<PingRequest> requestObserver = pingPongStub.pingAsyncSync(responseObserver); requestObserver.onNext(pingRequest); - latch.await(5, TimeUnit.SECONDS); + requestObserver.onCompleted(); + assertTrue(latch.await(5, TimeUnit.SECONDS)); Awaitility.await().atMost(5, TimeUnit.SECONDS).until(() -> { JsonPath json = RestAssured.get("/grpc/jwt") diff --git a/integration-tests/js-dsl/pom.xml b/integration-tests/js-dsl/pom.xml index fb162ae218..7ba331016d 100644 --- a/integration-tests/js-dsl/pom.xml +++ b/integration-tests/js-dsl/pom.xml @@ -84,7 +84,6 @@ </activation> <properties> <quarkus.package.type>native</quarkus.package.type> - <quarkus.native.additional-build-args>--language:js</quarkus.native.additional-build-args> </properties> <build> <plugins> diff --git a/pom.xml b/pom.xml index 53e19bae34..75680e7b47 100644 --- a/pom.xml +++ b/pom.xml @@ -57,7 +57,7 @@ <quarkiverse-minio.version>2.9.1</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ --> <quarkiverse-mybatis.version>1.0.4</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ --> <quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ --> - <quarkus.version>2.11.1.Final</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>3.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ --> <quarkus-qpid-jms.version>0.36.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ --> @@ -86,8 +86,8 @@ <geny.version>0.6.2</geny.version> <github-api.version>1.111</github-api.version><!-- Used in a Groovy script bellow --> <google-auth-library-credentials.version>1.7.0</google-auth-library-credentials.version><!-- TODO: Revert back to using Camel's version when gRPC versions are in sync --> - <graalvm.version>22.1.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk --> - <grpc.version>1.47.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core --> + <graalvm.version>22.2.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk --> + <grpc.version>1.48.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core --> <hapi.version>${hapi-version}</hapi.version> <hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version> <hbase.version>${hbase-version}</hbase.version> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 1bb8457715..3d01b2c3ae 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -10042,12 +10042,12 @@ <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>22.1.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>22.2.0</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>22.1.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>22.2.0</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/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index 61729770ca..5166d22851 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -10037,7 +10037,7 @@ <dependency> <groupId>org.graalvm.js</groupId> <artifactId>js</artifactId> - <version>22.1.0</version> + <version>22.2.0</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 1b51d3b15b..846e67102c 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -10037,7 +10037,7 @@ <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>22.1.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>22.2.0</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} -->
