This is an automated email from the ASF dual-hosted git repository. ppalaga pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit ed4735a793e803f27155edc01324c475ad818f16 Author: James Netherton <[email protected]> AuthorDate: Thu Mar 25 13:21:33 2021 +0000 Fixup upgrade to Camel 3.9.0 --- .../quarkus/main/deployment/CamelMainNativeImageProcessor.java | 6 ++++++ .../quarkus/component/xstream/deployment/XstreamProcessor.java | 9 +++++++++ pom.xml | 10 ++++------ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/extensions-core/main/deployment/src/main/java/org/apache/camel/quarkus/main/deployment/CamelMainNativeImageProcessor.java b/extensions-core/main/deployment/src/main/java/org/apache/camel/quarkus/main/deployment/CamelMainNativeImageProcessor.java index 60183d8..b2f19e3 100644 --- a/extensions-core/main/deployment/src/main/java/org/apache/camel/quarkus/main/deployment/CamelMainNativeImageProcessor.java +++ b/extensions-core/main/deployment/src/main/java/org/apache/camel/quarkus/main/deployment/CamelMainNativeImageProcessor.java @@ -17,6 +17,7 @@ package org.apache.camel.quarkus.main.deployment; import java.util.stream.Collectors; +import java.util.stream.Stream; import io.quarkus.deployment.Capabilities; import io.quarkus.deployment.annotations.BuildProducer; @@ -65,5 +66,10 @@ public class CamelMainNativeImageProcessor { } } } + + String[] resources = Stream.of("components", "dataformats", "languages") + .map(k -> "org/apache/camel/main/" + k + ".properties") + .toArray(String[]::new); + nativeResource.produce(new NativeImageResourceBuildItem(resources)); } } diff --git a/extensions/xstream/deployment/src/main/java/org/apache/camel/quarkus/component/xstream/deployment/XstreamProcessor.java b/extensions/xstream/deployment/src/main/java/org/apache/camel/quarkus/component/xstream/deployment/XstreamProcessor.java index c727a82..f3ea63a 100644 --- a/extensions/xstream/deployment/src/main/java/org/apache/camel/quarkus/component/xstream/deployment/XstreamProcessor.java +++ b/extensions/xstream/deployment/src/main/java/org/apache/camel/quarkus/component/xstream/deployment/XstreamProcessor.java @@ -16,8 +16,12 @@ */ package org.apache.camel.quarkus.component.xstream.deployment; +import java.io.InputStream; + +import io.quarkus.deployment.annotations.BuildProducer; import io.quarkus.deployment.annotations.BuildStep; import io.quarkus.deployment.builditem.FeatureBuildItem; +import io.quarkus.deployment.builditem.nativeimage.ReflectiveClassBuildItem; class XstreamProcessor { @@ -28,4 +32,9 @@ class XstreamProcessor { return new FeatureBuildItem(FEATURE); } + @BuildStep + void reflectiveClasses(BuildProducer<ReflectiveClassBuildItem> reflectiveClasses) { + reflectiveClasses.produce(new ReflectiveClassBuildItem(false, false, InputStream.class)); + } + } diff --git a/pom.xml b/pom.xml index d6fdb66..d79eb51 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>camel-dependencies</artifactId> - <version>3.8.0</version> + <version>3.9.0</version> </parent> <groupId>org.apache.camel.quarkus</groupId> @@ -42,15 +42,13 @@ <animal-sniffer.version>1.18</animal-sniffer.version> <antlr3.version>3.5.2</antlr3.version><!-- Spark, Stringtemplate and probably others --> <avro.version>${avro-version}</avro.version> - <aws-java-sdk.version>${aws-java-sdk-version}</aws-java-sdk.version> - <awssdk1-swf-libs.version>${aws-java-sdk-swf-libs}</awssdk1-swf-libs.version> - <!-- TODO: Use azure-sdk-bom once they start maintaining it properly https://github.com/Azure/azure-sdk-for-java/issues/18759 --> - <azure-sdk-bom.version>1.0.2</azure-sdk-bom.version><!-- TODO inherit from Camel https://issues.apache.org/jira/browse/CAMEL-16278 --> + <aws-java-sdk.version>1.11.714</aws-java-sdk.version> + <azure-sdk-bom.version>${azure-sdk-bom-version}</azure-sdk-bom.version> <bouncycastle.version>${bouncycastle-version}</bouncycastle.version><!-- keep in sync with Camel --> <camel.major.minor>3.9</camel.major.minor> <!-- run after each change: cd docs && mvndev validate --> - <camel.version>${camel.major.minor}.0</camel.version> + <camel.version>${camel.major.minor}.0</camel.version> <camel.docs.components.xref>${camel.major.minor}.x@components</camel.docs.components.xref><!-- the version in Camel's docs/components/antora.yml --> <camel.docs.branch>camel-${camel.major.minor}.x</camel.docs.branch><!-- The stable branch on which our Antora docs depends -->
