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 442b10940094f34ed8605a8a566b777ac74b34df Author: James Netherton <[email protected]> AuthorDate: Tue May 30 08:05:35 2023 +0100 Upgrade Quarkus to 3.2.0.CR1 --- docs/antora.yml | 4 ++-- extensions-jvm/drill/deployment/pom.xml | 4 ++++ extensions-jvm/drill/runtime/pom.xml | 4 ++++ .../component/jta/MockTransactionManagerProducer.java | 2 +- pom.xml | 10 +++++----- poms/bom/pom.xml | 4 ++++ poms/bom/src/main/generated/flattened-full-pom.xml | 12 ++++++++---- poms/bom/src/main/generated/flattened-reduced-pom.xml | 12 ++++++++---- .../bom/src/main/generated/flattened-reduced-verbose-pom.xml | 12 ++++++++---- 9 files changed, 44 insertions(+), 20 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index c3024802fd..001cce4822 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -30,11 +30,11 @@ asciidoc: # Project versions camel-version: 4.0.0-M3 # replace ${camel.version} camel-docs-version: "" - quarkus-version: 3.1.0.Final # replace ${quarkus.version} + quarkus-version: 999-SNAPSHOT # replace ${quarkus.version} graalvm-version: 22.3.2 # replace ${graalvm.version} graalvm-docs-version: 22.3 min-maven-version: 3.8.2 # replace ${min-maven-version} - target-maven-version: 3.9.1 # replace ${target-maven-version} + target-maven-version: 3.9.2 # replace ${target-maven-version} # Attributes used in xrefs to other Antora components cq-camel-components: components diff --git a/extensions-jvm/drill/deployment/pom.xml b/extensions-jvm/drill/deployment/pom.xml index 07eaa0cae8..76332b36bf 100644 --- a/extensions-jvm/drill/deployment/pom.xml +++ b/extensions-jvm/drill/deployment/pom.xml @@ -30,6 +30,10 @@ <name>Camel Quarkus :: Drill :: Deployment</name> <dependencies> + <dependency> + <groupId>io.quarkiverse.cxf</groupId> + <artifactId>quarkus-cxf-woodstox-deployment</artifactId> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core-deployment</artifactId> diff --git a/extensions-jvm/drill/runtime/pom.xml b/extensions-jvm/drill/runtime/pom.xml index 2ae8376baf..6091cbc77b 100644 --- a/extensions-jvm/drill/runtime/pom.xml +++ b/extensions-jvm/drill/runtime/pom.xml @@ -35,6 +35,10 @@ </properties> <dependencies> + <dependency> + <groupId>io.quarkiverse.cxf</groupId> + <artifactId>quarkus-cxf-woodstox</artifactId> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core</artifactId> diff --git a/extensions/jta/deployment/src/test/java/org/apache/camel/quarkus/component/jta/MockTransactionManagerProducer.java b/extensions/jta/deployment/src/test/java/org/apache/camel/quarkus/component/jta/MockTransactionManagerProducer.java index d4b96ade0c..520ecf0e04 100644 --- a/extensions/jta/deployment/src/test/java/org/apache/camel/quarkus/component/jta/MockTransactionManagerProducer.java +++ b/extensions/jta/deployment/src/test/java/org/apache/camel/quarkus/component/jta/MockTransactionManagerProducer.java @@ -16,7 +16,7 @@ */ package org.apache.camel.quarkus.component.jta; -import io.quarkus.arc.Priority; +import jakarta.annotation.Priority; import jakarta.enterprise.context.ApplicationScoped; import jakarta.enterprise.inject.Alternative; import jakarta.enterprise.inject.Produces; diff --git a/pom.xml b/pom.xml index be646794b5..c0d3eb0339 100644 --- a/pom.xml +++ b/pom.xml @@ -61,7 +61,7 @@ <quarkiverse-mybatis.version>2.0.0</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ --> <quarkiverse-pooled-jms.version>2.0.1</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ --> <quarkiverse-tika.version>2.0.0</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ --> - <quarkus.version>3.1.0.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>4.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ --> <quarkus-qpid-jms.version>2.2.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ --> @@ -109,7 +109,7 @@ <ibm.mq.client.version>9.3.2.1</ibm.mq.client.version> <influxdb.version>${influx-java-driver-version}</influxdb.version> <io-netty-iouring.version>0.0.16.Final</io-netty-iouring.version><!-- @sync org.asynchttpclient:async-http-client-project:${ahc.version} prop:netty.iouring --> - <jackson.version>2.15.0</jackson.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.fasterxml.jackson.core:jackson-core --> + <jackson.version>2.15.2</jackson.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.fasterxml.jackson.core:jackson-core --> <jakarta.jms-api.version>${jakarta-jms-api-version}</jakarta.jms-api.version> <java-json-tools.json-patch.version>${json-patch-version}</java-json-tools.json-patch.version><!-- A replacement for com.github.fge:json-patch --> <jodatime.version>${jodatime2-version}</jodatime.version><!-- Mess in transitive dependencies of Splunk --> @@ -123,7 +123,7 @@ <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.4.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.8.21</kotlin.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.jetbrains.kotlin:kotlin-stdlib --> + <kotlin.version>1.8.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 --> <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 --> @@ -138,7 +138,7 @@ <reactor-core.version>3.4.27</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.5.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.6.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 --> <tablesaw.version>0.43.1</tablesaw.version> @@ -210,7 +210,7 @@ <!-- maven-enforcer-plugin --> <min-maven-version>3.8.2</min-maven-version> - <target-maven-version>3.9.1</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version --> + <target-maven-version>3.9.2</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version --> <supported-maven-versions>[${min-maven-version},)</supported-maven-versions> <!-- maven-release-plugin --> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 5536f4ffb3..8709b1b9f4 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -1825,6 +1825,10 @@ <artifactId>camel-microprofile-health</artifactId> <version>${camel.version}</version> <exclusions> + <exclusion> + <groupId>org.eclipse.parsson</groupId> + <artifactId>jakarta.json</artifactId> + </exclusion> <exclusion> <groupId>org.glassfish</groupId> <artifactId>jakarta.json</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 8889b8c7aa..2a4342a53f 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -1763,6 +1763,10 @@ <artifactId>camel-microprofile-health</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.0.0-M3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> + <exclusion> + <groupId>org.eclipse.parsson</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> <exclusion> <groupId>org.glassfish</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6220,7 +6224,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.5.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>jakarta.jms</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6421,17 +6425,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.8.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.8.22</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.8.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.8.22</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.8.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.8.22</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.mvel</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 6c6d1a5cd1..d0e0fd0f76 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -1763,6 +1763,10 @@ <artifactId>camel-microprofile-health</artifactId> <version>4.0.0-M3</version> <exclusions> + <exclusion> + <groupId>org.eclipse.parsson</groupId> + <artifactId>jakarta.json</artifactId> + </exclusion> <exclusion> <groupId>org.glassfish</groupId> <artifactId>jakarta.json</artifactId> @@ -6220,7 +6224,7 @@ <dependency> <groupId>io.smallrye.reactive</groupId> <artifactId>smallrye-reactive-messaging-camel</artifactId> - <version>4.5.0</version> + <version>4.6.0</version> </dependency> <dependency> <groupId>jakarta.jms</groupId> @@ -6406,17 +6410,17 @@ <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-script-util</artifactId> - <version>1.8.21</version> + <version>1.8.22</version> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-scripting-jvm</artifactId> - <version>1.8.21</version> + <version>1.8.22</version> </dependency> <dependency> <groupId>org.jetbrains.kotlin</groupId> <artifactId>kotlin-scripting-jvm-host</artifactId> - <version>1.8.21</version> + <version>1.8.22</version> </dependency> <dependency> <groupId>org.mvel</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 6141f13a14..e70b3046db 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -1763,6 +1763,10 @@ <artifactId>camel-microprofile-health</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.0.0-M3</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> + <exclusion> + <groupId>org.eclipse.parsson</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> <exclusion> <groupId>org.glassfish</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>jakarta.json</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6220,7 +6224,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.5.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>4.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>jakarta.jms</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -6406,17 +6410,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.8.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.8.22</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.8.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.8.22</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.8.21</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.8.22</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.mvel</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
