This is an automated email from the ASF dual-hosted git repository. github-bot pushed a commit to branch quarkus-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ecb1e4eb94c7f039b0c9ebccd8971865451f7556 Author: James Netherton <[email protected]> AuthorDate: Fri Apr 29 07:22:18 2022 +0100 Upgrade Quarkus to 2.10.0.CR1 --- docs/antora.yml | 6 +++--- extensions/arangodb/deployment/pom.xml | 4 ++++ extensions/arangodb/runtime/pom.xml | 4 ++++ .../component/csimple/deployment/CSimpleProcessor.java | 2 +- pom.xml | 13 +++++++------ poms/bom/pom.xml | 5 +++++ poms/bom/src/main/generated/flattened-full-pom.xml | 13 +++++++++---- poms/bom/src/main/generated/flattened-reduced-pom.xml | 11 ++++++++--- .../src/main/generated/flattened-reduced-verbose-pom.xml | 11 ++++++++--- 9 files changed, 49 insertions(+), 20 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 52da876ace..353e06fc79 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -31,9 +31,9 @@ asciidoc: target-maven-version: 3.8.4 # replace ${target-maven-version} camel-version: 3.17.0 # replace ${camel.version} camel-docs-version: 3.17.x # replace ${camel.docs.components.version} - quarkus-version: 2.9.0.Final # replace ${quarkus.version} - graalvm-version: 22.0.0.2 # replace ${graalvm.version} - graalvm-docs-version: 22.0 + quarkus-version: 999-SNAPSHOT # replace ${quarkus.version} + graalvm-version: 22.1.0 # replace ${graalvm.version} + graalvm-docs-version: 22.1 # attributes used in xrefs to other Antora components cq-camel-components: 3.17.x@components # replace ${camel.docs.components.xref} quarkus-examples-version: latest diff --git a/extensions/arangodb/deployment/pom.xml b/extensions/arangodb/deployment/pom.xml index 48ac3932b8..e117787d6b 100644 --- a/extensions/arangodb/deployment/pom.xml +++ b/extensions/arangodb/deployment/pom.xml @@ -34,6 +34,10 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core-deployment</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-httpclient-deployment</artifactId> + </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-arangodb</artifactId> diff --git a/extensions/arangodb/runtime/pom.xml b/extensions/arangodb/runtime/pom.xml index 564e98035a..da0d141c45 100644 --- a/extensions/arangodb/runtime/pom.xml +++ b/extensions/arangodb/runtime/pom.xml @@ -40,6 +40,10 @@ <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core</artifactId> </dependency> + <dependency> + <groupId>org.apache.camel.quarkus</groupId> + <artifactId>camel-quarkus-support-httpclient</artifactId> + </dependency> <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-arangodb</artifactId> diff --git a/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java index 15db109c34..80e6714ab0 100644 --- a/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java +++ b/extensions/csimple/deployment/src/main/java/org/apache/camel/quarkus/component/csimple/deployment/CSimpleProcessor.java @@ -312,7 +312,7 @@ class CSimpleProcessor { projectDir.resolve("src/main/java").toFile(), csimpleClassesDir.toFile(), StandardCharsets.UTF_8.name(), - Collections.emptyList(), + Collections.emptyMap(), null, "11", "11", diff --git a/pom.xml b/pom.xml index 34cfaca94f..a50bb99439 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ <quarkiverse-minio.version>2.3.0</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ --> <quarkiverse-mybatis.version>1.0.2</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.9.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.34.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ --> @@ -86,13 +86,13 @@ <github-api.version>1.111</github-api.version><!-- Used in a Groovy script bellow --> <google-native-image-support.version>0.14.1</google-native-image-support.version> <google-auth-library-credentials.version>${grpc-google-auth-library-version}</google-auth-library-credentials.version> - <graalvm.version>22.0.0.2</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.nativeimage:svm --> - <grpc.version>1.45.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core --> + <graalvm.version>22.1.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk --> + <grpc.version>1.46.0</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> <htrace.version>4.2.0-incubating</htrace.version><!-- Mess in hbase transitive deps --> - <infinispan.version>13.0.9.Final</infinispan.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.infinispan:infinispan-core --> + <infinispan.version>13.0.10.Final</infinispan.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.infinispan:infinispan-core --> <influxdb.version>${influx-java-driver-version}</influxdb.version> <jackson1.version>1.9.13</jackson1.version><!-- Mess in the transitive dependencies of hbase-testing-util --> <jackson-asl.version>${jackson1.version}</jackson-asl.version><!-- Can be different from jackson1.version on some occasions --> @@ -118,14 +118,15 @@ <msal4j.version>1.11.3</msal4j.version><!-- @sync com.azure:azure-identity:${azure-identity-version} dep:com.microsoft.azure:msal4j --> <mvel2.version>2.4.14.Final</mvel2.version><!-- @sync org.apache.camel:camel-dependencies:${camel.version} prop:mvel-version --> <okio.version>${squareup-okio-version}</okio.version> + <perfmark-api.version>0.25.0</perfmark-api.version><!-- @sync io.grpc:grpc-netty-shaded:${grpc.version} dep:io.perfmark:perfmark-api --> <protobuf.version>3.19.3</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java --> <projectreactor-netty.version>${reactor-netty-version}</projectreactor-netty.version> <retrofit.version>2.5.0</retrofit.version> <saaj.impl.version>1.5.3</saaj.impl.version> - <smallrye.reactive.messaging.camel.version>3.15.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>3.17.0</smallrye.reactive.messaging.camel.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.smallrye.reactive:smallrye-reactive-messaging-provider --> <spring.version>${spring5-version}</spring.version> <snakeyaml.version>${snakeyaml-version}</snakeyaml.version> - <threetenbp.version>1.4.0</threetenbp.version> + <threetenbp.version>1.6.0</threetenbp.version> <xalan.version>${xalan-version}</xalan.version> <xchange.version>${xchange-version}</xchange.version> <xerces.version>${xerces-version}</xerces.version> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 9df32e6c07..2a928e2d6a 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -9684,6 +9684,11 @@ <artifactId>reactor-netty</artifactId> <version>${projectreactor-netty.version}</version> </dependency> + <dependency> + <groupId>io.perfmark</groupId> + <artifactId>perfmark-api</artifactId> + <version>${perfmark-api.version}</version> + </dependency> <dependency> <groupId>io.quarkiverse.freemarker</groupId> <artifactId>quarkus-freemarker</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index 87fb2bc6af..d8ee5e7b8e 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -9626,6 +9626,11 @@ <artifactId>reactor-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>1.0.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>io.perfmark</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>perfmark-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>0.25.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>io.quarkiverse.freemarker</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>quarkus-freemarker</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -9695,7 +9700,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>3.15.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.17.0</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} --> @@ -9928,12 +9933,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.0.0.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>22.1.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.0.0.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>22.1.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} --> @@ -10089,7 +10094,7 @@ <dependency> <groupId>org.threeten</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>threetenbp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.web3j</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 2f406dec6c..2098183cc7 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -9626,6 +9626,11 @@ <artifactId>reactor-netty</artifactId> <version>1.0.2</version> </dependency> + <dependency> + <groupId>io.perfmark</groupId> + <artifactId>perfmark-api</artifactId> + <version>0.25.0</version> + </dependency> <dependency> <groupId>io.quarkiverse.freemarker</groupId> <artifactId>quarkus-freemarker</artifactId> @@ -9695,7 +9700,7 @@ <dependency> <groupId>io.smallrye.reactive</groupId> <artifactId>smallrye-reactive-messaging-camel</artifactId> - <version>3.15.0</version> + <version>3.17.0</version> <exclusions> <exclusion> <groupId>jakarta.activation</groupId> @@ -9923,7 +9928,7 @@ <dependency> <groupId>org.graalvm.js</groupId> <artifactId>js</artifactId> - <version>22.0.0.2</version> + <version>22.1.0</version> </dependency> <dependency> <groupId>org.influxdb</groupId> @@ -10079,7 +10084,7 @@ <dependency> <groupId>org.threeten</groupId> <artifactId>threetenbp</artifactId> - <version>1.4.0</version> + <version>1.6.0</version> </dependency> <dependency> <groupId>org.web3j</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 c95d869b68..a89ac5f23a 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -9626,6 +9626,11 @@ <artifactId>reactor-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>1.0.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>io.perfmark</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>perfmark-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>0.25.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>io.quarkiverse.freemarker</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>quarkus-freemarker</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -9695,7 +9700,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>3.15.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.17.0</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} --> @@ -9923,7 +9928,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.0.0.2</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>22.1.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} --> @@ -10079,7 +10084,7 @@ <dependency> <groupId>org.threeten</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>threetenbp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.4.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.web3j</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
