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 e968c69d6ec4a7ea1006dd7c391374d98f305464 Author: David Jencks <[email protected]> AuthorDate: Mon Oct 25 11:41:53 2021 -0700 content latest to next --- docs/modules/ROOT/pages/contributor-guide/extension-metadata.adoc | 6 +++--- docs/modules/ROOT/pages/contributor-guide/release-guide.adoc | 4 ++-- docs/modules/ROOT/pages/index.adoc | 2 +- docs/modules/ROOT/pages/reference/components.adoc | 2 -- docs/modules/ROOT/pages/reference/dataformats.adoc | 2 -- docs/modules/ROOT/pages/reference/extensions/kamelet.adoc | 2 +- .../ROOT/pages/reference/extensions/microprofile-health.adoc | 2 +- docs/modules/ROOT/pages/reference/languages.adoc | 2 -- docs/modules/ROOT/pages/reference/others.adoc | 2 -- docs/modules/ROOT/pages/user-guide/cdi.adoc | 6 +++--- docs/modules/ROOT/pages/user-guide/command-mode.adoc | 2 +- docs/modules/ROOT/pages/user-guide/defining-camel-routes.adoc | 4 ++-- docs/modules/ROOT/pages/user-guide/native-mode.adoc | 2 +- docs/modules/ROOT/pages/user-guide/observability.adoc | 2 +- extensions/kamelet/runtime/src/main/doc/usage.adoc | 2 +- extensions/microprofile-health/runtime/src/main/doc/usage.adoc | 2 +- integration-tests/aws2-grouped/README.adoc | 2 +- 17 files changed, 19 insertions(+), 27 deletions(-) diff --git a/docs/modules/ROOT/pages/contributor-guide/extension-metadata.adoc b/docs/modules/ROOT/pages/contributor-guide/extension-metadata.adoc index 3f15b56..efe81c5 100644 --- a/docs/modules/ROOT/pages/contributor-guide/extension-metadata.adoc +++ b/docs/modules/ROOT/pages/contributor-guide/extension-metadata.adoc @@ -5,14 +5,14 @@ This file contains metadata used by Quarkus project generator https://code.quarkus.io/[https://code.quarkus.io/]. It is located in the `src/main/resources/META-INF` directory of the runtime module. -Here is an https://github.com/apache/camel-quarkus/blob/main/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml[example from the ActiveMQ extension]: +Here is an https://github.com/apache/camel-quarkus/blob/2.4.x/extensions/activemq/runtime/src/main/resources/META-INF/quarkus-extension.yaml[example from the ActiveMQ extension]: [source,yaml] ---- name: "Camel ActiveMQ" description: "Send messages to (or consume from) Apache ActiveMQ. This component extends the Camel JMS component" metadata: - guide: "https://camel.apache.org/camel-quarkus/latest/extensions/activemq.html" + guide: "https://camel.apache.org/camel-quarkus/2.4.x/extensions/activemq.html" categories: - "integration" ---- @@ -30,7 +30,7 @@ The data comes from the following sources: * `name`: comes from `pom.xml`'s `<name>` -* `description`: taken from xref:latest@manual::camel-catalog.adoc[Camel Catalog]. If the given +* `description`: taken from xref:manual::camel-catalog.adoc[Camel Catalog]. If the given extension contains more than one component, language or data format, their descriptions are concatenated and a warning is issued in the log. The value from Camel Catalog can be overridden by setting a `<description>` in the `pom.xml` of the given extension's runtime module. diff --git a/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc b/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc index 0ef9e1e..1e98801 100644 --- a/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc +++ b/docs/modules/ROOT/pages/contributor-guide/release-guide.adoc @@ -3,10 +3,10 @@ :page-aliases: release-guide.adoc The process is _mutatis mutandis_ the same as for the main Apache Camel repository - see the -xref:latest@manual::release-guide.adoc[Release guide] page of the Camel documentation. +xref:manual::release-guide.adoc[Release guide] page of the Camel documentation. Here, just a sketch of the repeating part, after you have performed the initial setup following the -xref:latest@manual::release-guide.adoc[Camel Release guide]. +xref:manual::release-guide.adoc[Camel Release guide]. == Pre release tasks diff --git a/docs/modules/ROOT/pages/index.adoc b/docs/modules/ROOT/pages/index.adoc index 560813f..090a56e 100644 --- a/docs/modules/ROOT/pages/index.adoc +++ b/docs/modules/ROOT/pages/index.adoc @@ -1,6 +1,6 @@ = Apache Camel extensions for Quarkus -This project aims to bring the awesome integration capabilities of xref:latest@manual::index.adoc[Apache Camel] +This project aims to bring the awesome integration capabilities of xref:manual::index.adoc[Apache Camel] and its vast xref:{cq-camel-components}::index.adoc[component library] to the https://quarkus.io/[Quarkus runtime]. diff --git a/docs/modules/ROOT/pages/reference/components.adoc b/docs/modules/ROOT/pages/reference/components.adoc index 8e56656..7466027 100644 --- a/docs/modules/ROOT/pages/reference/components.adoc +++ b/docs/modules/ROOT/pages/reference/components.adoc @@ -1,6 +1,4 @@ = Camel components supported on Quarkus -:indexer-version: latest -:indexer-component: components :indexer-module: ROOT :indexer-rel-filter: *-component.adoc :indexer-human-readable-kind: Component diff --git a/docs/modules/ROOT/pages/reference/dataformats.adoc b/docs/modules/ROOT/pages/reference/dataformats.adoc index 199bc30..78429c8 100644 --- a/docs/modules/ROOT/pages/reference/dataformats.adoc +++ b/docs/modules/ROOT/pages/reference/dataformats.adoc @@ -1,6 +1,4 @@ = Camel data formats supported on Quarkus -:indexer-version: latest -:indexer-component: components :indexer-module: dataformats :indexer-rel-filter: *-dataformat.adoc :indexer-human-readable-kind: Data format diff --git a/docs/modules/ROOT/pages/reference/extensions/kamelet.adoc b/docs/modules/ROOT/pages/reference/extensions/kamelet.adoc index 9e0b0bc..3b1508f 100644 --- a/docs/modules/ROOT/pages/reference/extensions/kamelet.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/kamelet.adoc @@ -46,7 +46,7 @@ This extension allows to pre-load a set of Kamelets at build time using the `qua === Using the Kamelet Catalog -A set of pre-made Kamelets can be found on the /camel-kamelets/latest[Kamelet Catalog]. +A set of pre-made Kamelets can be found on the xref:camel-kamelets::index.adoc[]. To use the Kamelet from the catalog you need to copy their yaml definition (that you can find https://github.com/apache/camel-kamelets/[in the camel-kamelet repo]) on your project in the classpath. Alternatively you can add the `camel-kamelets-catalog` artifact to your `pom.xml`: [source,xml] diff --git a/docs/modules/ROOT/pages/reference/extensions/microprofile-health.adoc b/docs/modules/ROOT/pages/reference/extensions/microprofile-health.adoc index 92c5e6c..0e7e306 100644 --- a/docs/modules/ROOT/pages/reference/extensions/microprofile-health.adoc +++ b/docs/modules/ROOT/pages/reference/extensions/microprofile-health.adoc @@ -41,7 +41,7 @@ Check the xref:user-guide/index.adoc[User guide] for more information about writ == Usage -You can register health checks for your applications with the xref:latest@manual::health-check.adoc[Camel health check API]. +You can register health checks for your applications with the xref:manual::health-check.adoc[Camel health check API]. By default, classes extending `AbstractHealthCheck` are registered as both liveness and readiness checks. You can override the `isReadiness` method to control this behaviour. diff --git a/docs/modules/ROOT/pages/reference/languages.adoc b/docs/modules/ROOT/pages/reference/languages.adoc index b471147..3d9392c 100644 --- a/docs/modules/ROOT/pages/reference/languages.adoc +++ b/docs/modules/ROOT/pages/reference/languages.adoc @@ -1,6 +1,4 @@ = Camel languages supported on Quarkus -:indexer-version: latest -:indexer-component: components :indexer-module: languages :indexer-rel-filter: *-language.adoc :indexer-human-readable-kind: Language diff --git a/docs/modules/ROOT/pages/reference/others.adoc b/docs/modules/ROOT/pages/reference/others.adoc index b0b848e..16bc3e8 100644 --- a/docs/modules/ROOT/pages/reference/others.adoc +++ b/docs/modules/ROOT/pages/reference/others.adoc @@ -1,6 +1,4 @@ = Camel misc. components supported on Quarkus -:indexer-version: latest -:indexer-component: components :indexer-module: others :indexer-rel-filter: *.adoc :indexer-human-readable-kind: Misc. component diff --git a/docs/modules/ROOT/pages/user-guide/cdi.adoc b/docs/modules/ROOT/pages/user-guide/cdi.adoc index cf45504..7caddf0 100644 --- a/docs/modules/ROOT/pages/user-guide/cdi.adoc +++ b/docs/modules/ROOT/pages/user-guide/cdi.adoc @@ -68,7 +68,7 @@ public class MyBean { == `@EndpointInject` and `@Produce` If you are used to `@org.apache.camel.EndpointInject` and `@org.apache.camel.Produce` from -xref:latest@manual::pojo-producing.adoc[plain Camel] or from Camel on SpringBoot, you can continue using them on Quarkus too. +xref:manual::pojo-producing.adoc[plain Camel] or from Camel on SpringBoot, you can continue using them on Quarkus too. This is supported since Camel Quarkus 2.0.0. The following use cases are supported by `org.apache.camel.quarkus:camel-quarkus-core`: @@ -180,14 +180,14 @@ public class CamelRoute extends RouteBuilder { [NOTE] ==== -We aim at supporting all use cases listed in xref:latest@manual::bean-binding.adoc[Bean binding] section of Camel documentation. +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:latest@manual:ROOT:pojo-consuming.adoc[Pojo consuming] section of Camel documentation. +- see the xref:manual:ROOT:pojo-consuming.adoc[Pojo consuming] section of Camel documentation. Declaring a class like the following diff --git a/docs/modules/ROOT/pages/user-guide/command-mode.adoc b/docs/modules/ROOT/pages/user-guide/command-mode.adoc index d93183a..aebf79e 100644 --- a/docs/modules/ROOT/pages/user-guide/command-mode.adoc +++ b/docs/modules/ROOT/pages/user-guide/command-mode.adoc @@ -19,7 +19,7 @@ with a command line utility may suit much better in situations like this. There is just one thing where it would differ from a stock Camel Quarkus application: setting an exit condition in `application.properties`. -The rest of the application - most notably the xref:latest@manual::routes.adoc[Route] +The rest of the application - most notably the xref:manual::routes.adoc[Route] that performs the actual data transformation and transfer - will look the same like with a traditional Camel service. == A minimal Hello World! diff --git a/docs/modules/ROOT/pages/user-guide/defining-camel-routes.adoc b/docs/modules/ROOT/pages/user-guide/defining-camel-routes.adoc index 52b7f73..f363faf 100644 --- a/docs/modules/ROOT/pages/user-guide/defining-camel-routes.adoc +++ b/docs/modules/ROOT/pages/user-guide/defining-camel-routes.adoc @@ -54,7 +54,7 @@ In case of the above example, it would be `camel-quarkus-timer`. In order to configure Camel routes, rests or templates in XML, you must add a Camel XML parser dependency to the classpath. Since Camel Quarkus 1.8.0, `xref:reference/extensions/xml-io-dsl.adoc[camel-quarkus-xml-io-dsl]` is the best choice. -With Camel Main, you can set a property that points to the location of resources XML files such as routes, xref:latest@manual::rest-dsl.adoc[REST DSL] and xref:latest@manual::route-template.adoc[Route templates]: +With Camel Main, you can set a property that points to the location of resources XML files such as routes, xref:manual::rest-dsl.adoc[REST DSL] and xref:manual::route-template.adoc[Route templates]: [source,properties] ---- @@ -131,7 +131,7 @@ xref:reference/extensions/yaml-dsl.adoc[YAML], xref:reference/extensions/kotlin-dsl.adoc[Kotlin] or xref:reference/extensions/js-dsl.adoc[JavaScript] for defining Camel routes. -These are mostly motivated by link:/camel-k/latest[Camel K] and its project-less approach to defining Camel routes. +These are mostly motivated by xref:camel-k::index.adoc[] and its project-less approach to defining Camel routes. With Camel K, all you need to run an integration is a file where the routes are defined using one of the supported DSLs. With Camel Quarkus you still need a `pom.xml` file with the appropriate dependencies in addition to the route definition files. Except for YAML, these DSLs are supported only in JVM mode, because they load and compile the routes at runtime. diff --git a/docs/modules/ROOT/pages/user-guide/native-mode.adoc b/docs/modules/ROOT/pages/user-guide/native-mode.adoc index 3f7401b..0d0f507 100644 --- a/docs/modules/ROOT/pages/user-guide/native-mode.adoc +++ b/docs/modules/ROOT/pages/user-guide/native-mode.adoc @@ -58,7 +58,7 @@ Please refer to https://quarkus.io/guides/building-native-image#quarkus-native-p [[using-onexception-clause-in-native-mode]] == Using the onException clause in native mode -When using xref:latest@manual::exception-clause.adoc[Camel `onException` handling] in native mode, it is the application developers responsibility to register the exception classes for reflection. +When using xref:manual::exception-clause.adoc[Camel `onException` handling] in native mode, it is the application developers responsibility to register the exception classes for reflection. For instance, with an exception handler like this diff --git a/docs/modules/ROOT/pages/user-guide/observability.adoc b/docs/modules/ROOT/pages/user-guide/observability.adoc index defa259..6ea4bdc 100644 --- a/docs/modules/ROOT/pages/user-guide/observability.adoc +++ b/docs/modules/ROOT/pages/user-guide/observability.adoc @@ -4,7 +4,7 @@ Health & liveness checks are supported via the xref:reference/extensions/microprofile-health.adoc[MicroProfile Health] extension. They can be configured via the -xref:latest@manual::health-check.adoc[Camel Health] API or via +xref:manual::health-check.adoc[Camel Health] API or via https://quarkus.io/guides/microprofile-health[Quarkus MicroProfile Health]. All configured checks are available on the standard MicroProfile Health endpoint URLs: diff --git a/extensions/kamelet/runtime/src/main/doc/usage.adoc b/extensions/kamelet/runtime/src/main/doc/usage.adoc index 5ec1718..741c620 100644 --- a/extensions/kamelet/runtime/src/main/doc/usage.adoc +++ b/extensions/kamelet/runtime/src/main/doc/usage.adoc @@ -4,7 +4,7 @@ This extension allows to pre-load a set of Kamelets at build time using the `qua === Using the Kamelet Catalog -A set of pre-made Kamelets can be found on the /camel-kamelets/latest[Kamelet Catalog]. +A set of pre-made Kamelets can be found on the xref:camel-kamelets::index.adoc[]. To use the Kamelet from the catalog you need to copy their yaml definition (that you can find https://github.com/apache/camel-kamelets/[in the camel-kamelet repo]) on your project in the classpath. Alternatively you can add the `camel-kamelets-catalog` artifact to your `pom.xml`: [source,xml] diff --git a/extensions/microprofile-health/runtime/src/main/doc/usage.adoc b/extensions/microprofile-health/runtime/src/main/doc/usage.adoc index b7350b9..51a70db 100644 --- a/extensions/microprofile-health/runtime/src/main/doc/usage.adoc +++ b/extensions/microprofile-health/runtime/src/main/doc/usage.adoc @@ -1,4 +1,4 @@ -You can register health checks for your applications with the xref:latest@manual::health-check.adoc[Camel health check API]. +You can register health checks for your applications with the xref:manual::health-check.adoc[Camel health check API]. By default, classes extending `AbstractHealthCheck` are registered as both liveness and readiness checks. You can override the `isReadiness` method to control this behaviour. diff --git a/integration-tests/aws2-grouped/README.adoc b/integration-tests/aws2-grouped/README.adoc index 003da8c..9b17b21 100644 --- a/integration-tests/aws2-grouped/README.adoc +++ b/integration-tests/aws2-grouped/README.adoc @@ -1,7 +1,7 @@ == AWS 2 grouped integration tests This module allows executing all tests from `integration-test-groups/aws2/*` grouped together. -See the https://camel.apache.org/camel-quarkus/latest/contributor-guide/extension-testing.html#_grouping[Grouping section] of the Contributor guide for more details. +See the https://camel.apache.org/camel-kamelets/latest/index.html#_grouping[Grouping section] of the Contributor guide for more details. === Mock backend vs. real service
