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 1b207ab90c529ac92497acbbe192071837de0f24 Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Tue Jan 24 07:35:16 2023 +0000 Upgrade Quarkus to 2.17.0.CR1 --- docs/antora.yml | 4 ++-- .../deployment/BouncyCastleSupportProcessor.java | 2 +- extensions-support/bouncycastle/runtime/pom.xml | 4 ++-- extensions/crypto/runtime/pom.xml | 2 +- extensions/pdf/runtime/pom.xml | 2 +- pom.xml | 12 ++++++------ poms/bom/pom.xml | 6 +++--- poms/bom/src/main/generated/flattened-full-pom.xml | 19 ++++++++++++------- poms/bom/src/main/generated/flattened-reduced-pom.xml | 14 +++++++------- .../main/generated/flattened-reduced-verbose-pom.xml | 14 +++++++------- 10 files changed, 42 insertions(+), 37 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 3ca1ed8455..acc48bcf9d 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -30,11 +30,11 @@ asciidoc: # Project versions camel-version: 3.20.1 # replace ${camel.version} camel-docs-version: 3.20.x # replace ${camel.docs.components.version} - quarkus-version: 2.16.0.Final # replace ${quarkus.version} + quarkus-version: 999-SNAPSHOT # replace ${quarkus.version} graalvm-version: 22.3.0 # replace ${graalvm.version} graalvm-docs-version: 22.3 min-maven-version: 3.8.2 # replace ${min-maven-version} - target-maven-version: 3.8.6 # replace ${target-maven-version} + target-maven-version: 3.8.7 # replace ${target-maven-version} # Attributes used in xrefs to other Antora components cq-camel-components: 3.20.x@components # replace ${camel.docs.components.xref} diff --git a/extensions-support/bouncycastle/deployment/src/main/java/org/apache/camel/quarkus/support/bouncycastle/deployment/BouncyCastleSupportProcessor.java b/extensions-support/bouncycastle/deployment/src/main/java/org/apache/camel/quarkus/support/bouncycastle/deployment/BouncyCastleSupportProcessor.java index 27efdd8ae8..9962228577 100644 --- a/extensions-support/bouncycastle/deployment/src/main/java/org/apache/camel/quarkus/support/bouncycastle/deployment/BouncyCastleSupportProcessor.java +++ b/extensions-support/bouncycastle/deployment/src/main/java/org/apache/camel/quarkus/support/bouncycastle/deployment/BouncyCastleSupportProcessor.java @@ -56,7 +56,7 @@ public class BouncyCastleSupportProcessor { @BuildStep IndexDependencyBuildItem registerBCDependencyForIndex() { - return new IndexDependencyBuildItem("org.bouncycastle", "bcprov-jdk15on"); + return new IndexDependencyBuildItem("org.bouncycastle", "bcprov-jdk18on"); } @BuildStep diff --git a/extensions-support/bouncycastle/runtime/pom.xml b/extensions-support/bouncycastle/runtime/pom.xml index 3a915a255e..6b86f31eea 100644 --- a/extensions-support/bouncycastle/runtime/pom.xml +++ b/extensions-support/bouncycastle/runtime/pom.xml @@ -49,11 +49,11 @@ </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk15on</artifactId> + <artifactId>bcprov-jdk18on</artifactId> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcpkix-jdk15on</artifactId> + <artifactId>bcpkix-jdk18on</artifactId> </dependency> <dependency> <groupId>org.javassist</groupId> diff --git a/extensions/crypto/runtime/pom.xml b/extensions/crypto/runtime/pom.xml index 349762d23a..f8441b332c 100644 --- a/extensions/crypto/runtime/pom.xml +++ b/extensions/crypto/runtime/pom.xml @@ -50,7 +50,7 @@ </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcpg-jdk15on</artifactId> + <artifactId>bcpg-jdk18on</artifactId> </dependency> </dependencies> diff --git a/extensions/pdf/runtime/pom.xml b/extensions/pdf/runtime/pom.xml index 961f643f9a..fe2311bb9e 100644 --- a/extensions/pdf/runtime/pom.xml +++ b/extensions/pdf/runtime/pom.xml @@ -57,7 +57,7 @@ </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15on</artifactId> + <artifactId>bcmail-jdk18on</artifactId> </dependency> </dependencies> diff --git a/pom.xml b/pom.xml index 82c907e8fe..40613231e7 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ <quarkiverse-mybatis.version>1.0.5</quarkiverse-mybatis.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/mybatis/quarkus-mybatis-parent/ --> <quarkiverse-pooled-jms.version>1.0.7</quarkiverse-pooled-jms.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/messaginghub/quarkus-pooled-jms-parent/ --> <quarkiverse-tika.version>1.0.3</quarkiverse-tika.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/tika/quarkus-tika-parent/ --> - <quarkus.version>2.16.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>3.0.0</quarkus-hazelcast-client.version><!-- https://repo1.maven.org/maven2/com/hazelcast/quarkus-hazelcast-client-bom/ --> <quarkus-qpid-jms.version>0.41.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ --> @@ -70,7 +70,7 @@ <antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others --> <avro.version>1.11.1</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro --> <awssdk.version>2.17.291</awssdk.version><!-- @sync io.quarkiverse.amazonservices:quarkus-amazon-services-parent:${quarkiverse-amazonservices.version} prop:awssdk.version --> - <assertj.version>3.23.1</assertj.version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:assertj.version --> + <assertj.version>3.24.2</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.34.0</azure-core.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-core --> @@ -78,7 +78,7 @@ <azure-identity.version>1.7.0</azure-identity.version><!-- @sync com.azure:azure-sdk-bom:${azure-sdk-bom.version} dep:com.azure:azure-identity --> <azure-core-http-vertx.version>1.0.0-beta.1</azure-core-http-vertx.version> <!-- TODO: https://github.com/apache/camel-quarkus/issues/4181 --> <cassandra-driver-test.version>3.7.1</cassandra-driver-test.version><!-- Keep in sync with testcontainers instead of Debezium bom --> - <bouncycastle.version>1.70</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk15on --> + <bouncycastle.version>1.71</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on --> <caffeine.version>3.1.1</caffeine.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.github.ben-manes.caffeine:caffeine --> <commons-beanutils.version>${commons-beanutils-version}</commons-beanutils.version> <commons-cli.version>1.4</commons-cli.version><!-- keep in sync with Quarkus, via quarkus-bootstrap-core --> @@ -96,7 +96,7 @@ <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 --> <google-oauth-client.version>${google-oauth-client-version}</google-oauth-client.version><!-- TODO: Fix this in Camel https://github.com/apache/camel-quarkus/issues/4139 --> <graalvm.version>22.3.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk --> - <grpc.version>1.51.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core --> + <grpc.version>1.52.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> @@ -120,7 +120,7 @@ <jnr-ffi.version>2.1.2</jnr-ffi.version><!-- Mess in web3j transitive deps --> <json-path.version>${json-path-version}</json-path.version> <json-smart.version>2.4.7</json-smart.version><!-- @sync com.jayway.jsonpath:json-path:${json-path.version} dep:net.minidev:json-smart --> - <kafka.version>3.3.1</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients --> + <kafka.version>3.3.2</kafka.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.kafka:kafka-clients --> <kudu.version>${kudu-version}</kudu.version> <kotlin.version>1.7.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 --> @@ -214,7 +214,7 @@ <!-- maven-enforcer-plugin --> <min-maven-version>3.8.2</min-maven-version> - <target-maven-version>3.8.6</target-maven-version><!-- @sync io.quarkus:quarkus-build-parent:${quarkus.version} prop:proposed-maven-version --> + <target-maven-version>3.8.7</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 83b6965510..1bc3051b69 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -10368,17 +10368,17 @@ </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15on</artifactId> + <artifactId>bcmail-jdk18on</artifactId> <version>${bouncycastle.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcpg-jdk15on</artifactId> + <artifactId>bcpg-jdk18on</artifactId> <version>${bouncycastle.version}</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcutil-jdk15on</artifactId> + <artifactId>bcutil-jdk18on</artifactId> <version>${bouncycastle.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 2c2e496999..f1de77b314 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -10243,7 +10243,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.3.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.3.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>jakarta.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -10314,18 +10314,18 @@ </dependency> <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>bcmail-jdk15on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.70</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>bcmail-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.71</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>bcpg-jdk15on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.70</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>bcpg-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.71</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>bcutil-jdk15on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.70</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>bcutil-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.71</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -21578,6 +21578,11 @@ <artifactId>bctls-jdk15on</artifactId><!-- io.quarkus:quarkus-bom:2.16.0.Final --> <version>1.70</version><!-- io.quarkus:quarkus-bom:2.16.0.Final --> </dependency> + <dependency> + <groupId>org.bouncycastle</groupId><!-- io.quarkus:quarkus-bom:2.16.0.Final --> + <artifactId>bcutil-jdk15on</artifactId><!-- io.quarkus:quarkus-bom:2.16.0.Final --> + <version>1.70</version><!-- io.quarkus:quarkus-bom:2.16.0.Final --> + </dependency> <dependency> <groupId>org.checkerframework</groupId><!-- io.quarkus:quarkus-bom:2.16.0.Final --> <artifactId>checker-qual</artifactId><!-- io.quarkus:quarkus-bom:2.16.0.Final --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index cbeb4d8fae..71b9151a61 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -10238,7 +10238,7 @@ <dependency> <groupId>org.apache.kafka</groupId> <artifactId>connect-runtime</artifactId> - <version>3.3.1</version> + <version>3.3.2</version> <exclusions> <exclusion> <groupId>jakarta.activation</groupId> @@ -10309,18 +10309,18 @@ </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcmail-jdk15on</artifactId> - <version>1.70</version> + <artifactId>bcmail-jdk18on</artifactId> + <version>1.71</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcpg-jdk15on</artifactId> - <version>1.70</version> + <artifactId>bcpg-jdk18on</artifactId> + <version>1.71</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcutil-jdk15on</artifactId> - <version>1.70</version> + <artifactId>bcutil-jdk18on</artifactId> + <version>1.71</version> </dependency> <dependency> <groupId>org.codehaus.jackson</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 e08c2683cd..5ce8df9015 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -10238,7 +10238,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.3.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.3.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>jakarta.activation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -10309,18 +10309,18 @@ </dependency> <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>bcmail-jdk15on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.70</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>bcmail-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.71</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>bcpg-jdk15on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.70</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>bcpg-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.71</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <artifactId>bcutil-jdk15on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.70</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>bcutil-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.71</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.codehaus.jackson</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->