diff --git a/docs/antora.yml b/docs/antora.yml index f69589331d85..e668c224fa28 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 a5386b501bd0..5c47032397ba 100644 --- a/extensions/avro-rpc/runtime/pom.xml +++ b/extensions/avro-rpc/runtime/pom.xml @@ -64,11 +64,6 @@ org.apache.avro avro-ipc-netty - - org.graalvm.nativeimage - svm - provided - 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 5ecb7c54f86b..000000000000 --- 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 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 80e6714ab026..ccae73bd9e48 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 @@ private Context compilationContext(final Path projectDir, final Path csimpleClas 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 c6244b9eedee..d3ba8ee07a5f 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 2.9.1 1.0.4 1.0.3 - 2.12.0.Final + 2.13.0.CR1 3.0.0 0.36.0 @@ -67,7 +67,7 @@ ${ahc-version} 1.18 3.5.2 - 1.11.0 + 1.11.1 2.17.220 3.23.1 1.11.714 @@ -92,7 +92,7 @@ 1.111 1.7.0 22.2.0 - 1.48.1 + 1.49.0 ${hapi-version} ${hapi-fhir-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 e84870efbbd1..af082fc0ca5f 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -9984,12 +9984,12 @@ org.apache.avro avro-ipc-jetty - 1.11.0 + 1.11.1 org.apache.avro avro-ipc-netty - 1.11.0 + 1.11.1 javax.annotation diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index a0e21deda5aa..064adfb50169 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -9984,12 +9984,12 @@ org.apache.avro avro-ipc-jetty - 1.11.0 + 1.11.1 org.apache.avro avro-ipc-netty - 1.11.0 + 1.11.1 javax.annotation 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 7103c293dff3..60fb27e1e979 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -9984,12 +9984,12 @@ org.apache.avro avro-ipc-jetty - 1.11.0 + 1.11.1 org.apache.avro avro-ipc-netty - 1.11.0 + 1.11.1 javax.annotation