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 c0d00c831a9cc57e22b5ca901cc2a369937358e1 Author: James Netherton <jamesnether...@gmail.com> AuthorDate: Mon Apr 17 08:25:26 2023 +0100 Upgrade Quarkus to 3.1.0.CR1 --- docs/antora.yml | 2 +- pom.xml | 8 ++++---- 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 ++++++++---- 6 files changed, 33 insertions(+), 17 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 7d5bcbebad..25e569f825 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -30,7 +30,7 @@ asciidoc: # Project versions camel-version: 4.0.0-M2 # replace ${camel.version} camel-docs-version: "" - quarkus-version: 3.0.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} diff --git a/pom.xml b/pom.xml index 1f3f2fb852..ecaeac02b8 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,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.0</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.0.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>2.0.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ --> @@ -80,7 +80,7 @@ <azure-identity.version>1.7.3</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.3</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.72</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on --> + <bouncycastle.version>1.73</bouncycastle.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.bouncycastle:bcprov-jdk18on --> <brotli.version>0.1.2</brotli.version> <caffeine.version>3.1.5</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> @@ -102,7 +102,7 @@ <google-cloud-pubsub-bom.version>1.121.0</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.121.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>22.3.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk --> - <grpc.version>1.54.0</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core --> + <grpc.version>1.54.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> @@ -143,7 +143,7 @@ <reactor-core.version>3.4.26</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.5.0</retrofit.version> - <smallrye.reactive.messaging.camel.version>4.4.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.5.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> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 665958b82c..34d881a7c4 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6400,6 +6400,10 @@ <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> </exclusions> </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 8a7bed5fac..9907e5e1f7 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6293,6 +6293,10 @@ <groupId>javax.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>jaxb-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>slf4j-log4j12</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> </exclusions> </dependency> <dependency> @@ -6335,22 +6339,22 @@ <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>bcmail-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.73</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-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.73</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>bcprov-ext-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.73</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-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.73</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.brotli</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 52189fa026..9e80c7dbe4 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6273,6 +6273,10 @@ <groupId>javax.xml.bind</groupId> <artifactId>jaxb-api</artifactId> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -6315,22 +6319,22 @@ <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcmail-jdk18on</artifactId> - <version>1.72</version> + <version>1.73</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcpg-jdk18on</artifactId> - <version>1.72</version> + <version>1.73</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcprov-ext-jdk18on</artifactId> - <version>1.72</version> + <version>1.73</version> </dependency> <dependency> <groupId>org.bouncycastle</groupId> <artifactId>bcutil-jdk18on</artifactId> - <version>1.72</version> + <version>1.73</version> </dependency> <dependency> <groupId>org.brotli</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 bd661b1912..a5eb53d058 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6273,6 +6273,10 @@ <groupId>javax.xml.bind</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>jaxb-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </exclusion> + <exclusion> + <groupId>org.slf4j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>slf4j-log4j12</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </exclusion> </exclusions> </dependency> <dependency> @@ -6315,22 +6319,22 @@ <dependency> <groupId>org.bouncycastle</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>bcmail-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.73</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-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.73</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>bcprov-ext-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.73</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-jdk18on</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.72</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.73</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.brotli</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->