This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 2f512b29d0b22a7809348b0a309c99a88c54b838 Author: James Netherton <[email protected]> AuthorDate: Fri Oct 8 11:40:29 2021 +0100 Upgrade Camel to 3.13.0 --- docs/antora-playbook-dev.yml | 2 +- docs/antora-playbook.yml | 4 ++-- docs/antora.yml | 2 +- .../quarkus/component/atlasmap/deployment/AtlasmapProcessor.java | 3 --- pom.xml | 6 +++--- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/docs/antora-playbook-dev.yml b/docs/antora-playbook-dev.yml index d4ab0d0..97ac4b9 100644 --- a/docs/antora-playbook-dev.yml +++ b/docs/antora-playbook-dev.yml @@ -26,7 +26,7 @@ content: start_path: docs - url: [email protected]:apache/camel.git branches: - - camel-3.12.x # replace ${camel.docs.branch} + - camel-3.13.x # replace ${camel.docs.branch} start_paths: - docs/components - url: [email protected]:apache/camel.git diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml index a0a0340..a051cfe 100644 --- a/docs/antora-playbook.yml +++ b/docs/antora-playbook.yml @@ -33,7 +33,7 @@ content: # The version/branch of main camel 'components' this version of camel-quarkus uses - url: https://github.com/apache/camel.git branches: - - camel-3.12.x # replace ${camel.docs.branch} + - camel-3.13.x # replace ${camel.docs.branch} start_paths: # eip - core/camel-core-engine/src/main/docs @@ -50,7 +50,7 @@ content: # The camel-spring-boot version corresponding to the main camel 'components' version/branch - url: https://github.com/apache/camel-spring-boot.git branches: - - camel-spring-boot-3.12.x # replace ${camel.sb.docs.branch} + - camel-spring-boot-3.13.x # replace ${camel.sb.docs.branch} start_path: docs asciidoc: diff --git a/docs/antora.yml b/docs/antora.yml index ebff9fe..f7073ab 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -22,7 +22,7 @@ nav: - modules/ROOT/nav.adoc asciidoc: attributes: - cq-camel-components: 3.12.x@components # replace ${camel.docs.components.xref} + cq-camel-components: 3.13.x@components # replace ${camel.docs.components.xref} min-maven-version: 3.6.2 # replace ${min-maven-version} target-maven-version: 3.8.1 # replace ${target-maven-version} quarkus-version: 2.3.0.Final # replace ${quarkus.version} diff --git a/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java b/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java index 9ba0849..0789a2c 100644 --- a/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java +++ b/extensions/atlasmap/deployment/src/main/java/org/apache/camel/quarkus/component/atlasmap/deployment/AtlasmapProcessor.java @@ -25,7 +25,6 @@ import java.util.stream.Stream; import io.atlasmap.core.DefaultAtlasContextFactory; import io.atlasmap.core.DefaultAtlasModuleInfo; import io.atlasmap.csv.module.CsvModule; -import io.atlasmap.dfdl.module.DfdlModule; import io.atlasmap.java.module.JavaModule; import io.atlasmap.json.module.JsonModule; import io.atlasmap.mxbean.AtlasContextFactoryMXBean; @@ -63,7 +62,6 @@ class AtlasmapProcessor { items.add(new ReflectiveClassBuildItem(false, false, DefaultAtlasModuleInfo.class)); items.add(new ReflectiveClassBuildItem(true, false, JsonModule.class)); items.add(new ReflectiveClassBuildItem(true, false, CsvModule.class)); - items.add(new ReflectiveClassBuildItem(true, false, DfdlModule.class)); items.add(new ReflectiveClassBuildItem(true, false, JavaModule.class)); items.add(new ReflectiveClassBuildItem(true, false, XmlModule.class)); items.add(new ReflectiveClassBuildItem(false, true, false, AtlasContextFactoryMXBean.class)); @@ -85,7 +83,6 @@ class AtlasmapProcessor { indexDependency.produce(new IndexDependencyBuildItem("io.atlasmap", "atlas-java-model")); indexDependency.produce(new IndexDependencyBuildItem("io.atlasmap", "atlas-json-model")); indexDependency.produce(new IndexDependencyBuildItem("io.atlasmap", "atlas-csv-model")); - indexDependency.produce(new IndexDependencyBuildItem("io.atlasmap", "atlas-dfdl-model")); } @BuildStep diff --git a/pom.xml b/pom.xml index d2445ae..0ce68ce 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>camel-dependencies</artifactId> - <version>3.12.0</version> + <version>3.13.0-SNAPSHOT</version> </parent> <groupId>org.apache.camel.quarkus</groupId> @@ -39,8 +39,8 @@ <properties> <!-- Primary dependencies - maintained manually --> - <camel.major.minor>3.12</camel.major.minor> <!-- run after each change: cd docs && mvnd validate --> - <camel.version>${camel.major.minor}.0</camel.version> + <camel.major.minor>3.13</camel.major.minor> <!-- run after each change: cd docs && mvnd validate --> + <camel.version>${camel.major.minor}.0-SNAPSHOT</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 camel branch on which our Antora docs depends --> <camel.sb.docs.branch>camel-spring-boot-${camel.major.minor}.x</camel.sb.docs.branch><!-- The stable camel-spring-boot branch on which our Antora docs depends -->
