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 be2606a4aece6c98e4a01c5f1c29ce0d4c2f5169 Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Fri Sep 1 07:43:00 2023 +0100 Upgrade Quarkus to 3.4.0.CR1 --- docs/antora.yml | 2 +- .../src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java | 2 +- extensions/knative/deployment/pom.xml | 4 ++++ extensions/knative/runtime/pom.xml | 4 ++++ pom.xml | 10 +++++----- poms/bom/src/main/generated/flattened-full-pom.xml | 8 ++++---- poms/bom/src/main/generated/flattened-reduced-pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 6 +++--- 8 files changed, 25 insertions(+), 17 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 37340027a8..67672f7d88 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.3.1 # replace ${quarkus.version} + quarkus-version: 3.4.0.CR1 # replace ${quarkus.version} graalvm-version: 23.0.1 # replace ${graalvm.version} graalvm-docs-version: 22.3 mapstruct-version: 1.5.5.Final # replace ${mapstruct.version} diff --git a/extensions/google-bigquery/runtime/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java b/extensions/google-bigquery/runtime/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java index a7c8ccec86..ae753b68d6 100644 --- a/extensions/google-bigquery/runtime/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java +++ b/extensions/google-bigquery/runtime/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java @@ -160,7 +160,7 @@ public class PooledByteBufAllocatorL { } private UnsafeDirectLittleEndian newDirectBufferL(int initialCapacity, int maxCapacity) { - PoolArenasCache cache = threadCache(); + PoolThreadCache cache = threadCache(); PoolArena<ByteBuffer> directArena = cache.directArena; if (directArena != null) { diff --git a/extensions/knative/deployment/pom.xml b/extensions/knative/deployment/pom.xml index 38c5890c2e..2364759423 100644 --- a/extensions/knative/deployment/pom.xml +++ b/extensions/knative/deployment/pom.xml @@ -46,6 +46,10 @@ <groupId>io.quarkus</groupId> <artifactId>quarkus-vertx-http-deployment</artifactId> </dependency> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-virtual-threads-deployment</artifactId> + </dependency> </dependencies> <build> diff --git a/extensions/knative/runtime/pom.xml b/extensions/knative/runtime/pom.xml index 25aef2f6b7..c8a89f8e6e 100644 --- a/extensions/knative/runtime/pom.xml +++ b/extensions/knative/runtime/pom.xml @@ -56,6 +56,10 @@ <groupId>io.quarkus</groupId> <artifactId>quarkus-vertx-http</artifactId> </dependency> + <dependency> + <groupId>io.quarkus</groupId> + <artifactId>quarkus-virtual-threads</artifactId> + </dependency> </dependencies> <build> diff --git a/pom.xml b/pom.xml index bd479f0a8f..908103289e 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.0.2</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.3.1</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> + <quarkus.version>3.4.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/ --> @@ -102,7 +102,7 @@ <google-cloud-pubsub.version>1.124.0</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 --> <groovy.version>4.0.13</groovy.version><!-- @sync io.quarkiverse.groovy:quarkus-groovy-parent:${quarkiverse-groovy.version} prop:groovy.version --> - <grpc.version>1.56.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core --> + <grpc.version>1.57.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> @@ -127,9 +127,9 @@ <jsch.version>0.2.11</jsch.version><!-- @sync io.quarkiverse.jsch:quarkus-jsch-parent:${quarkiverse-jsch.version} prop:jsch.version --> <json-path.version>${json-path-version}</json-path.version> <json-smart.version>2.4.10</json-smart.version><!-- @sync com.jayway.jsonpath:json-path:${json-path.version} dep:net.minidev:json-smart --> - <kafka.version>3.5.0</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients --> + <kafka.version>3.5.1</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.0</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib --> + <kotlin.version>1.9.10</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 --> <mapstruct.version>${mapstruct-version}</mapstruct.version> <minio.version>8.2.2</minio.version><!-- @sync io.quarkiverse.minio:quarkus-minio-parent:${quarkiverse-minio.version} prop:minio.version --> @@ -146,7 +146,7 @@ <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 --> <spring.version>${spring-version}</spring.version> - <snakeyaml.version>2.0</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml --> + <snakeyaml.version>2.1</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml --> <tablesaw.version>0.43.1</tablesaw.version> <threetenbp.version>1.6.0</threetenbp.version> <xalan.version>2.7.2</xalan.version><!-- Xalan should be removed as is in Camel, but it is not possible. https://github.com/apache/camel-quarkus/issues/4065--> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 925ee4d1ba..1489a439ee 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6437,7 +6437,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.5.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.5.1</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} --> @@ -6568,17 +6568,17 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-script-util</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.9.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.9.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-jvm-host</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.9.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jolokia</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 1cda2b3ebc..4e9cc1df1d 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6392,7 +6392,7 @@ <dependency> <groupId>org.apache.kafka</groupId> <artifactId>connect-runtime</artifactId> - <version>3.5.0</version> + <version>3.5.1</version> <exclusions> <exclusion> <groupId>javax.activation</groupId> @@ -6518,12 +6518,12 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-scripting-jvm</artifactId> - <version>1.9.0</version> + <version>1.9.10</version> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-scripting-jvm-host</artifactId> - <version>1.9.0</version> + <version>1.9.10</version> </dependency> <dependency> <groupId>org.mapstruct</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 e9b1ee0945..1cdb07a40e 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6392,7 +6392,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.5.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.5.1</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} --> @@ -6518,12 +6518,12 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.9.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>kotlin-scripting-jvm-host</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.9.10</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.mapstruct</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->