This is an automated email from the ASF dual-hosted git repository. djencks pushed a commit to branch 2.4.x in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 12b32d3cc6980dafa92bf505cc28abc23bfad31f Author: David Jencks <[email protected]> AuthorDate: Mon Oct 25 12:31:05 2021 -0700 cherry-pick syntax upgrades from main --- docs/antora.yml | 2 +- .../ROOT/pages/contributor-guide/release-guide.adoc | 6 +----- docs/modules/ROOT/pages/reference/components.adoc | 12 +----------- docs/modules/ROOT/pages/reference/dataformats.adoc | 12 +----------- docs/modules/ROOT/pages/reference/index.adoc | 15 ++++++++++----- docs/modules/ROOT/pages/reference/languages.adoc | 12 +----------- docs/modules/ROOT/pages/reference/others.adoc | 12 +----------- docs/modules/ROOT/pages/user-guide/cdi.adoc | 7 ++----- .../pages/user-guide/dependency-management.adoc | 10 ++-------- docs/modules/ROOT/pages/user-guide/examples.adoc | 4 +--- .../reference/summary-table.adoc} | 21 ++++++++++----------- 11 files changed, 31 insertions(+), 82 deletions(-) diff --git a/docs/antora.yml b/docs/antora.yml index 8c60818..1331e38 100644 --- a/docs/antora.yml +++ b/docs/antora.yml @@ -30,4 +30,4 @@ asciidoc: quarkus-examples-version: latest # indexTable common indexer-version: 3.12.x # replace ${camel.docs.components.version} - indexer-component: components \ No newline at end of file + indexer-component: components diff --git a/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc b/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc index 1e98801..6832542 100644 --- a/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc +++ b/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc @@ -1,4 +1,3 @@ -[[ReleaseGuide-ReleaseGuide]] = Apache Camel Quarkus release process :page-aliases: release-guide.adoc @@ -164,11 +163,8 @@ from the local Maven repository and then checks that they are available in Maven As long as there are unavailable artifacts, the requests are re-tried with a (configurable) delay of 60 seconds. ==== -[NOTE] -==== -https://github.com/quarkusio/quarkus-platform[Quarkus Platform] hosts the metadata and Maven BOMs necessary for +NOTE: https://github.com/quarkusio/quarkus-platform[Quarkus Platform] hosts the metadata and Maven BOMs necessary for https://code.quarkus.io/[code.quarkus.io] as well as for https://quarkus.io/guides/tooling[Quarkus tools]. -==== * Clone Quarkus Platform unless you have done it in the past + diff --git a/docs/modules/ROOT/pages/reference/components.adoc b/docs/modules/ROOT/pages/reference/components.adoc index 7466027..7acc4c6 100644 --- a/docs/modules/ROOT/pages/reference/components.adoc +++ b/docs/modules/ROOT/pages/reference/components.adoc @@ -4,14 +4,4 @@ :indexer-human-readable-kind: Component :indexer-human-readable-kind-plural: components -There are indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes=cq-artifact-id] {indexer-human-readable-kind-plural} (indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes='cq-artifact-id,cq-deprecated=true'] deprecated, indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}" [...] - -[.counted-table,width="100%",cols="4,1,1,1,1,5",options="header"] -|=== -| {indexer-human-readable-kind} | Artifact | JVM + -since | Native + -since | Support + -level | Description -|=== - -indexTable::[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes=cq-artifact-id,cells="=`xref:reference/extensions/$\{cqArtifactIdBase}.adoc[$\{cqCamelPartTitle}]`,cq-artifact-id,cq-jvm-since,cq-native-since,cq-status-deprecation,cq-camel-part-description"] +include::partial$reference/summary-table.adoc[] \ No newline at end of file diff --git a/docs/modules/ROOT/pages/reference/dataformats.adoc b/docs/modules/ROOT/pages/reference/dataformats.adoc index 78429c8..7b48979 100644 --- a/docs/modules/ROOT/pages/reference/dataformats.adoc +++ b/docs/modules/ROOT/pages/reference/dataformats.adoc @@ -4,14 +4,4 @@ :indexer-human-readable-kind: Data format :indexer-human-readable-kind-plural: data formats -There are indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes=cq-artifact-id] {indexer-human-readable-kind-plural} (indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes='cq-artifact-id,cq-deprecated=true'] deprecated, indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}" [...] - -[.counted-table,width="100%",cols="4,1,1,1,1,5",options="header"] -|=== -| {indexer-human-readable-kind} | Artifact | JVM + -since | Native + -since | Support + -level | Description -|=== - -indexTable::[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes=cq-artifact-id,cells="=`xref:reference/extensions/$\{cqArtifactIdBase}.adoc[$\{cqCamelPartTitle}]`,cq-artifact-id,cq-jvm-since,cq-native-since,cq-status-deprecation,cq-camel-part-description"] +include::partial$reference/summary-table.adoc[] \ No newline at end of file diff --git a/docs/modules/ROOT/pages/reference/index.adoc b/docs/modules/ROOT/pages/reference/index.adoc index 7aa970c..d4a3016 100644 --- a/docs/modules/ROOT/pages/reference/index.adoc +++ b/docs/modules/ROOT/pages/reference/index.adoc @@ -18,10 +18,15 @@ There are indexCount:[relative=reference/extensions/\*.adoc] extensions (indexCo [.counted-table,width="100%",cols="4,1,1,1,1,5",options="header"] |=== -| Extension | Artifact | JVM + -since | Native + -since | Support + -level | Description +| Extension +| Artifact +| JVM + +since +| Native + +since +| Support + +level +| Description |=== -indexTable::[relative='reference/extensions/*.adoc',cells="$xref,cq-artifact-id,cq-jvm-since,cq-native-since,cq-status-deprecation,cq-description"] +indexTable::[relative='reference/extensions/*.adoc',cellformats="$xref|cqArtifactId|cqJvmSince|cqNativeSince|cqStatusDeprecation|cqDescription"] diff --git a/docs/modules/ROOT/pages/reference/languages.adoc b/docs/modules/ROOT/pages/reference/languages.adoc index 3d9392c..3fd908a 100644 --- a/docs/modules/ROOT/pages/reference/languages.adoc +++ b/docs/modules/ROOT/pages/reference/languages.adoc @@ -4,14 +4,4 @@ :indexer-human-readable-kind: Language :indexer-human-readable-kind-plural: languages -There are indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes=cq-artifact-id] {indexer-human-readable-kind-plural} (indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes='cq-artifact-id,cq-deprecated=true'] deprecated, indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}" [...] - -[.counted-table,width="100%",cols="4,1,1,1,1,5",options="header"] -|=== -| {indexer-human-readable-kind} | Artifact | JVM + -since | Native + -since | Support + -level | Description -|=== - -indexTable::[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes=cq-artifact-id,cells="=`xref:reference/extensions/$\{cqArtifactIdBase}.adoc[$\{cqCamelPartTitle}]`,cq-artifact-id,cq-jvm-since,cq-native-since,cq-status-deprecation,cq-camel-part-description"] +include::partial$reference/summary-table.adoc[] \ No newline at end of file diff --git a/docs/modules/ROOT/pages/reference/others.adoc b/docs/modules/ROOT/pages/reference/others.adoc index 16bc3e8..523f982 100644 --- a/docs/modules/ROOT/pages/reference/others.adoc +++ b/docs/modules/ROOT/pages/reference/others.adoc @@ -4,14 +4,4 @@ :indexer-human-readable-kind: Misc. component :indexer-human-readable-kind-plural: misc. components -There are indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes=cq-artifact-id] {indexer-human-readable-kind-plural} (indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes='cq-artifact-id,cq-deprecated=true'] deprecated, indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}" [...] - -[.counted-table,width="100%",cols="4,1,1,1,1,5",options="header"] -|=== -| {indexer-human-readable-kind} | Artifact | JVM + -since | Native + -since | Support + -level | Description -|=== - -indexTable::[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes=cq-artifact-id,cells="=`xref:reference/extensions/$\{cqArtifactIdBase}.adoc[$\{cqCamelPartTitle}]`,cq-artifact-id,cq-jvm-since,cq-native-since,cq-status-deprecation,cq-camel-part-description"] +include::partial$reference/summary-table.adoc[] \ No newline at end of file diff --git a/docs/modules/ROOT/pages/user-guide/cdi.adoc b/docs/modules/ROOT/pages/user-guide/cdi.adoc index 7caddf0..a332267 100644 --- a/docs/modules/ROOT/pages/user-guide/cdi.adoc +++ b/docs/modules/ROOT/pages/user-guide/cdi.adoc @@ -178,16 +178,13 @@ public class CamelRoute extends RouteBuilder { } ---- -[NOTE] -==== -We aim at supporting all use cases listed in xref:manual::bean-binding.adoc[Bean binding] section of Camel documentation. +NOTE: We aim at supporting all use cases listed in xref:manual::bean-binding.adoc[Bean binding] section of Camel documentation. Do not hesitate to https://github.com/apache/camel-quarkus/issues[file an issue] if some bean binding scenario does not work for you. -==== === `@Consume` Since Camel Quarkus 2.0.0, the `camel-quarkus-bean` artifact brings support for `@org.apache.camel.Consume` -- see the xref:manual:ROOT:pojo-consuming.adoc[Pojo consuming] section of Camel documentation. +- see the xref:manual::pojo-consuming.adoc[Pojo consuming] section of Camel documentation. Declaring a class like the following diff --git a/docs/modules/ROOT/pages/user-guide/dependency-management.adoc b/docs/modules/ROOT/pages/user-guide/dependency-management.adoc index 3d8d746..efe0182 100644 --- a/docs/modules/ROOT/pages/user-guide/dependency-management.adoc +++ b/docs/modules/ROOT/pages/user-guide/dependency-management.adoc @@ -13,11 +13,8 @@ The easiest and most straightforward way to get the dependency versions right in All of these allow you to select extensions and scaffold a new Maven or Gradle project. -[TIP] -==== -The universe of available extensions spans over Quarkus Core, Camel Quarkus and several other third party participating projects, +TIP: The universe of available extensions spans over Quarkus Core, Camel Quarkus and several other third party participating projects, such as Hazelcast, Cassandra, Kogito, OptaPlanner, etc. -==== The generated `pom.xml` will look similar to the following: @@ -90,11 +87,8 @@ As long as you do not plan to use any dependencies beyond those from Quarkus and you may consider switching to `org.apache.camel.quarkus:camel-quarkus-bom`. It manages all supported Camel artifacts and imports `io.quarkus:quarkus-bom`. -[NOTE] -==== -`io.quarkus:quarkus-bom` manages the core Quarkus dependencies, +NOTE: `io.quarkus:quarkus-bom` manages the core Quarkus dependencies, such as `io.quarkus:quarkus-arc` (CDI), `io.quarkus:quarkus-hibernate-orm`, `io.quarkus:quarkus-resteasy` (JAX-RS), etc. -==== == Combining with other BOMs diff --git a/docs/modules/ROOT/pages/user-guide/examples.adoc b/docs/modules/ROOT/pages/user-guide/examples.adoc index 0ecba72..f01f0e2 100644 --- a/docs/modules/ROOT/pages/user-guide/examples.adoc +++ b/docs/modules/ROOT/pages/user-guide/examples.adoc @@ -1,6 +1,4 @@ = Camel Quarkus Examples -:page-aliases: examples.adoc -:quarkus-examples-version: latest We offer several examples in https://github.com/apache/camel-quarkus-examples[Camel Quarkus examples repository]. To learn how to use them, please follow the xref:user-guide/first-steps.adoc[First steps] chapter of the User guide. @@ -11,4 +9,4 @@ Number of Examples: jsonpathCount:{quarkus-examples-version}@camel-quarkus-examp | Example | Description |=== -jsonpathTable::{quarkus-examples-version}@camel-quarkus-examples:ROOT:attachment$examples.json['$[*]', '$\{link}[$\{title}],description'] +jsonpathTable::{quarkus-examples-version}@camel-quarkus-examples:ROOT:attachment$examples.json["$[*]",cellformats= "`$\{link}[$\{title}]`|description"] diff --git a/docs/modules/ROOT/pages/reference/components.adoc b/docs/modules/ROOT/partials/reference/summary-table.adoc similarity index 61% copy from docs/modules/ROOT/pages/reference/components.adoc copy to docs/modules/ROOT/partials/reference/summary-table.adoc index 7466027..3154608 100644 --- a/docs/modules/ROOT/pages/reference/components.adoc +++ b/docs/modules/ROOT/partials/reference/summary-table.adoc @@ -1,17 +1,16 @@ -= Camel components supported on Quarkus -:indexer-module: ROOT -:indexer-rel-filter: *-component.adoc -:indexer-human-readable-kind: Component -:indexer-human-readable-kind-plural: components - There are indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes=cq-artifact-id] {indexer-human-readable-kind-plural} (indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes='cq-artifact-id,cq-deprecated=true'] deprecated, indexCount:[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}" [...] [.counted-table,width="100%",cols="4,1,1,1,1,5",options="header"] |=== -| {indexer-human-readable-kind} | Artifact | JVM + -since | Native + -since | Support + -level | Description +| {indexer-human-readable-kind} +| Artifact +| JVM + +since +| Native + +since +| Support + +level +| Description |=== -indexTable::[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes=cq-artifact-id,cells="=`xref:reference/extensions/$\{cqArtifactIdBase}.adoc[$\{cqCamelPartTitle}]`,cq-artifact-id,cq-jvm-since,cq-native-since,cq-status-deprecation,cq-camel-part-description"] +indexTable::[version="{indexer-version}",component="{indexer-component}",module="{indexer-module}",relative="{indexer-rel-filter}",attributes=cq-artifact-id,cellformats="`xref:reference/extensions/$\{cqArtifactIdBase}.adoc[$\{cqCamelPartTitle}]`|cqArtifactId|cqJvmSince|cqNativeSince|cqStatus|cqCamelPartDescription"]
