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 9566d2eadafc818cf0ad49c1de13a26639f3e91a Author: James Netherton <[email protected]> AuthorDate: Fri Aug 19 07:40:15 2022 +0100 Upgrade Quarkus to 2.13.0.CR1 --- docs/antora.yml | 2 +- extensions/avro-rpc/runtime/pom.xml | 5 -- .../avro/rpc/GenericDatumReaderSubstitute.java | 56 ---------------------- .../csimple/deployment/CSimpleProcessor.java | 1 + pom.xml | 6 +-- poms/bom/src/main/generated/flattened-full-pom.xml | 4 +- .../src/main/generated/flattened-reduced-pom.xml | 4 +- .../generated/flattened-reduced-verbose-pom.xml | 4 +- 8 files changed, 11 insertions(+), 71 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index f69589331d..e668c224fa 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -30,7 +30,7 @@ asciidoc: # Project versions camel-version: 3.18.2 # replace ${camel.version} camel-docs-version: 3.18.x # replace ${camel.docs.components.version} - quarkus-version: 2.12.0.Final # replace ${quarkus.version} + quarkus-version: 2.13.0.CR1 # replace ${quarkus.version} graalvm-version: 22.2.0 # replace ${graalvm.version} graalvm-docs-version: 22.2 min-maven-version: 3.8.2 # replace ${min-maven-version} diff --git a/extensions/avro-rpc/runtime/pom.xml b/extensions/avro-rpc/runtime/pom.xml index a5386b501b..5c47032397 100644 --- a/extensions/avro-rpc/runtime/pom.xml +++ b/extensions/avro-rpc/runtime/pom.xml @@ -64,11 +64,6 @@ <groupId>org.apache.avro</groupId> <artifactId>avro-ipc-netty</artifactId> </dependency> - <dependency> - <groupId>org.graalvm.nativeimage</groupId> - <artifactId>svm</artifactId> - <scope>provided</scope> - </dependency> </dependencies> <build> diff --git a/extensions/avro-rpc/runtime/src/main/java/org/apache/camel/quarkus/component/avro/rpc/GenericDatumReaderSubstitute.java b/extensions/avro-rpc/runtime/src/main/java/org/apache/camel/quarkus/component/avro/rpc/GenericDatumReaderSubstitute.java deleted file mode 100644 index 5ecb7c54f8..0000000000 --- a/extensions/avro-rpc/runtime/src/main/java/org/apache/camel/quarkus/component/avro/rpc/GenericDatumReaderSubstitute.java +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.component.avro.rpc; - -import java.util.IdentityHashMap; -import java.util.Map; - -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.Inject; -import com.oracle.svm.core.annotate.RecomputeFieldValue; -import com.oracle.svm.core.annotate.Substitute; -import com.oracle.svm.core.annotate.TargetClass; -import org.apache.avro.Schema; -import org.apache.avro.generic.GenericDatumReader; - -@TargetClass(value = GenericDatumReader.class) -public final class GenericDatumReaderSubstitute { - - @Inject - @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Reset) - private Map<Schema, Class> stringClassCache; - - @Alias - protected Class findStringClass(Schema schema) { - return null; - } - - @Substitute - private Class getStringClass(Schema s) { - if (stringClassCache == null) { - stringClassCache = new IdentityHashMap<>(); - } - - Class c = stringClassCache.get(s); - - if (c == null) { - c = findStringClass(s); - stringClassCache.put(s, c); - } - return c; - } -} 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 80e6714ab0..ccae73bd9e 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 @@ -308,6 +308,7 @@ class CSimpleProcessor { return new CompilationProvider.Context( "csimple-project", classPathElements, + classPathElements, projectDir.toFile(), projectDir.resolve("src/main/java").toFile(), csimpleClassesDir.toFile(), diff --git a/pom.xml b/pom.xml index 813bc8d5bc..17fa548f49 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ <quarkiverse-minio.version>2.9.1</quarkiverse-minio.version><!-- https://repo1.maven.org/maven2/io/quarkiverse/minio/quarkus-minio-parent/ --> <quarkiverse-mybatis.version>1.0.4</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.12.0.Final</quarkus.version><!-- https://repo1.maven.org/maven2/io/quarkus/quarkus-bom/ --> + <quarkus.version>2.13.0.CR1</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.36.0</quarkus-qpid-jms.version><!-- https://repo1.maven.org/maven2/org/amqphub/quarkus/quarkus-qpid-jms-bom/ --> @@ -67,7 +67,7 @@ <ahc.version>${ahc-version}</ahc.version> <animal-sniffer.version>1.18</animal-sniffer.version> <antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others --> - <avro.version>1.11.0</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro --> + <avro.version>1.11.1</avro.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.apache.avro:avro --> <awssdk.version>2.17.220</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 --> <aws-java-sdk.version>1.11.714</aws-java-sdk.version> @@ -93,7 +93,7 @@ <github-api.version>1.111</github-api.version><!-- Used in a Groovy script bellow --> <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 --> <graalvm.version>22.2.0</graalvm.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.graalvm.sdk:graal-sdk --> - <grpc.version>1.48.1</grpc.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:io.grpc:grpc-core --> + <grpc.version>1.49.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> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index c282c3ebea..9ad9c795b1 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -9976,12 +9976,12 @@ <dependency> <groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>avro-ipc-jetty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.11.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>avro-ipc-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.11.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>javax.annotation</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 5d024471e3..6ef716cf68 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -9976,12 +9976,12 @@ <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro-ipc-jetty</artifactId> - <version>1.11.0</version> + <version>1.11.1</version> </dependency> <dependency> <groupId>org.apache.avro</groupId> <artifactId>avro-ipc-netty</artifactId> - <version>1.11.0</version> + <version>1.11.1</version> <exclusions> <exclusion> <groupId>javax.annotation</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 8d5431df1a..2f70e141a0 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -9976,12 +9976,12 @@ <dependency> <groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>avro-ipc-jetty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.11.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>org.apache.avro</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>avro-ipc-netty</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.11.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>1.11.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>javax.annotation</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
