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 9e302d7b316ea51303ea1227b50b01f0549f0a79 Author: Zineb Bendhiba <bendhiba.zi...@gmail.com> AuthorDate: Thu May 27 13:27:54 2021 +0200 upgrade to camel 3.11.0-SNAPSHOT --- docs/antora-playbook-dev.yml | 2 +- docs/antora-playbook.yml | 2 +- docs/antora.yml | 2 +- docs/modules/ROOT/partials/reference/components/azure-cosmosdb.adoc | 2 +- .../ROOT/partials/reference/others/resourceresolver-github.adoc | 1 + ...tegrationTestsSupportCustomTypeConverterBulkConverterLoader.java | 2 ++ .../support/typeconverter/converters/MyLoaderConverterLoader.java | 2 ++ pom.xml | 6 +++--- 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/docs/antora-playbook-dev.yml b/docs/antora-playbook-dev.yml index 019625f..9001771 100644 --- a/docs/antora-playbook-dev.yml +++ b/docs/antora-playbook-dev.yml @@ -26,7 +26,7 @@ content: start_path: docs - url: g...@github.com:apache/camel.git branches: - - camel-3.10.x # replace ${camel.docs.branch} + - camel-3.11.x # replace ${camel.docs.branch} start_paths: - docs/components - url: g...@github.com:apache/camel.git diff --git a/docs/antora-playbook.yml b/docs/antora-playbook.yml index 3d8396e..0450197 100644 --- a/docs/antora-playbook.yml +++ b/docs/antora-playbook.yml @@ -26,7 +26,7 @@ content: start_path: docs - url: g...@github.com:apache/camel.git branches: - - camel-3.10.x # replace ${camel.docs.branch} + - camel-3.11.x # replace ${camel.docs.branch} start_paths: - docs/components - url: g...@github.com:apache/camel.git diff --git a/docs/antora.yml b/docs/antora.yml index b2db741..cc60c08 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -22,6 +22,6 @@ nav: - modules/ROOT/nav.adoc asciidoc: attributes: - cq-camel-components: 3.10.x@components # replace ${camel.docs.components.xref} + cq-camel-components: 3.11.x@components # replace ${camel.docs.components.xref} min-maven-version: 3.6.2 # replace ${min-maven-version} quarkus-version: 2.0.0.CR2 # replace ${quarkus.version} \ No newline at end of file diff --git a/docs/modules/ROOT/partials/reference/components/azure-cosmosdb.adoc b/docs/modules/ROOT/partials/reference/components/azure-cosmosdb.adoc index ea14437..dbc961c 100644 --- a/docs/modules/ROOT/partials/reference/components/azure-cosmosdb.adoc +++ b/docs/modules/ROOT/partials/reference/components/azure-cosmosdb.adoc @@ -9,5 +9,5 @@ :cq-native-since: n/a :cq-camel-part-name: azure-cosmosdb :cq-camel-part-title: Azure CosmosDB -:cq-camel-part-description: Azure Cosmos DB is Microsofts globally distributed, multi-model database service for operational and analytics workloads. It offers multi-mastering feature by automatically scaling throughput, compute, and storage. This component interacts with Azure CosmosDB through Azure SQL API +:cq-camel-part-description: To read and write records to the CosmosDB database on Azure cloud platform. :cq-extension-page-title: Azure CosmosDB diff --git a/docs/modules/ROOT/partials/reference/others/resourceresolver-github.adoc b/docs/modules/ROOT/partials/reference/others/resourceresolver-github.adoc new file mode 100644 index 0000000..a509c1d --- /dev/null +++ b/docs/modules/ROOT/partials/reference/others/resourceresolver-github.adoc @@ -0,0 +1 @@ +// Empty partial for a Camel bit unsupported by Camel Quarkus to avoid warnings when this file is included from a Camel page diff --git a/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/CamelQuarkusIntegrationTestsSupportCustomTypeConverterBulkConverterLoader.java b/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/CamelQuarkusIntegrationTestsSupportCustomTypeConverterBulkConverterLoader.java index a1bd65a..393f1e8 100644 --- a/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/CamelQuarkusIntegrationTestsSupportCustomTypeConverterBulkConverterLoader.java +++ b/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/CamelQuarkusIntegrationTestsSupportCustomTypeConverterBulkConverterLoader.java @@ -3,6 +3,7 @@ package org.apache.camel.quarkus.it.support.typeconverter.converters; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.DeferredContextBinding; import org.apache.camel.Exchange; import org.apache.camel.Ordered; import org.apache.camel.TypeConversionException; @@ -16,6 +17,7 @@ import org.apache.camel.spi.TypeConverterRegistry; * Generated by camel build tools - do NOT edit this file! */ @SuppressWarnings("unchecked") +@DeferredContextBinding public final class CamelQuarkusIntegrationTestsSupportCustomTypeConverterBulkConverterLoader implements TypeConverterLoader, BulkTypeConverters, CamelContextAware { private CamelContext camelContext; diff --git a/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/MyLoaderConverterLoader.java b/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/MyLoaderConverterLoader.java index f43b2a9..6d1bb5f 100644 --- a/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/MyLoaderConverterLoader.java +++ b/integration-tests-support/custom-type-converter/runtime/src/generated/java/org/apache/camel/quarkus/it/support/typeconverter/converters/MyLoaderConverterLoader.java @@ -3,6 +3,7 @@ package org.apache.camel.quarkus.it.support.typeconverter.converters; import org.apache.camel.CamelContext; import org.apache.camel.CamelContextAware; +import org.apache.camel.DeferredContextBinding; import org.apache.camel.Exchange; import org.apache.camel.TypeConversionException; import org.apache.camel.TypeConverterLoaderException; @@ -16,6 +17,7 @@ import org.apache.camel.util.DoubleMap; * Generated by camel build tools - do NOT edit this file! */ @SuppressWarnings("unchecked") +@DeferredContextBinding public final class MyLoaderConverterLoader implements TypeConverterLoader, CamelContextAware { private CamelContext camelContext; diff --git a/pom.xml b/pom.xml index f5a2ceb..7373eb4 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ <parent> <groupId>org.apache.camel</groupId> <artifactId>camel-dependencies</artifactId> - <version>3.10.0</version> + <version>3.11.0-SNAPSHOT</version> </parent> <groupId>org.apache.camel.quarkus</groupId> @@ -38,8 +38,8 @@ <properties> <!-- Primary dependencies - maintained manually --> - <camel.major.minor>3.10</camel.major.minor> <!-- run after each change: cd docs && mvnd validate --> - <camel.version>${camel.major.minor}.0</camel.version> + <camel.major.minor>3.11</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 branch on which our Antora docs depends -->