You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2020/11/05 12:09:27 UTC

[camel-spring-boot] branch camel-spring-boot-3.4.x updated (02a786c -> a46d38b)

This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a change to branch camel-spring-boot-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git.


    from 02a786c  fix: xref module syntax, set version to 3.4.x
     new 903f033  fix: xref for component modules naming
     new 3a39fd6  fix: xref link for local components
     new a46d38b  fix: remove starters that are not present on 3.4.x

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 components-starter/README.adoc                     | 212 +++++++++------------
 docs/modules/ROOT/pages/list.adoc                  | 212 +++++++++------------
 docs/modules/ROOT/pages/spring-boot.adoc           |   6 +-
 .../camel/springboot/maven/ExtMvelHelper.java      |  55 +++---
 .../maven/UpdateDocComponentsListMojo.java         |   3 +-
 5 files changed, 201 insertions(+), 287 deletions(-)


[camel-spring-boot] 02/03: fix: xref link for local components

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch camel-spring-boot-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 3a39fd649c7143e8b81e9fac76dfdea72ba28e0b
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu Nov 5 11:54:37 2020 +0100

    fix: xref link for local components
    
    We have the components from `core` module in the Camel catalog so when
    generating the list of starters they get pulled in and linked to the
    (main) Camel components reference where they do not exist.
    
    Logic for detecting such components by looking if the `.adoc` files are
    present looked at `component-starters` subdirectory of
    `docs/modules/ROOT/pages` and did not detect them as local components.
    
    This fixes that as all `.adoc` files are placed within
    `docs/modules/ROOT/pages`.
    
    Also cleans up the logic a bit.
    
    (cherry picked from commit bb9ed4f4e84e64eb1512165f84be7fc7cd7d6056)
    
    # Conflicts:
    #	components-starter/README.adoc
    #	docs/modules/ROOT/pages/list.adoc
    #	tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java
---
 components-starter/README.adoc                     |  8 ++--
 docs/modules/ROOT/pages/list.adoc                  |  8 ++--
 .../camel/springboot/maven/ExtMvelHelper.java      | 55 ++++++++++------------
 .../maven/UpdateDocComponentsListMojo.java         |  3 +-
 4 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/components-starter/README.adoc b/components-starter/README.adoc
index 22d5432..10de155 100644
--- a/components-starter/README.adoc
+++ b/components-starter/README.adoc
@@ -1309,16 +1309,16 @@ Number of miscellaneous extensions: 26 in 26 JAR artifacts (1 deprecated)
 | xref:3.4.x@components:others:shiro.adoc[Shiro] +
 (camel-shiro-starter) | 2.5 | Security using Shiro
 
-| xref:3.4.x@components:others:spring-cloud.adoc[Spring Cloud] +
+| xref:spring-cloud.adoc[Spring Cloud] +
 (camel-spring-cloud-starter) | 2.19 | Camel Cloud integration with Spring Cloud
 
-| xref:3.4.x@components:others:spring-cloud-consul.adoc[Spring Cloud Consul] +
+| xref:spring-cloud-consul.adoc[Spring Cloud Consul] +
 (camel-spring-cloud-consul-starter) | 2.19 | Camel Cloud integration with Spring Cloud Consul
 
-| xref:3.4.x@components:others:spring-cloud-netflix.adoc[Spring Cloud Netflix] +
+| xref:spring-cloud-netflix.adoc[Spring Cloud Netflix] +
 (camel-spring-cloud-netflix-starter) | 2.19 | Camel Cloud integration with Spring Cloud Netflix
 
-| xref:3.4.x@components:others:spring-cloud-zookeeper.adoc[Spring Cloud Zookeeper] +
+| xref:spring-cloud-zookeeper.adoc[Spring Cloud Zookeeper] +
 (camel-spring-cloud-zookeeper-starter) | 2.19 | Camel Cloud integration with Spring Cloud Zookeeper
 
 | xref:3.4.x@components:others:spring-javaconfig.adoc[Spring Java Configuration] +
diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc
index 22d5432..10de155 100644
--- a/docs/modules/ROOT/pages/list.adoc
+++ b/docs/modules/ROOT/pages/list.adoc
@@ -1309,16 +1309,16 @@ Number of miscellaneous extensions: 26 in 26 JAR artifacts (1 deprecated)
 | xref:3.4.x@components:others:shiro.adoc[Shiro] +
 (camel-shiro-starter) | 2.5 | Security using Shiro
 
-| xref:3.4.x@components:others:spring-cloud.adoc[Spring Cloud] +
+| xref:spring-cloud.adoc[Spring Cloud] +
 (camel-spring-cloud-starter) | 2.19 | Camel Cloud integration with Spring Cloud
 
-| xref:3.4.x@components:others:spring-cloud-consul.adoc[Spring Cloud Consul] +
+| xref:spring-cloud-consul.adoc[Spring Cloud Consul] +
 (camel-spring-cloud-consul-starter) | 2.19 | Camel Cloud integration with Spring Cloud Consul
 
-| xref:3.4.x@components:others:spring-cloud-netflix.adoc[Spring Cloud Netflix] +
+| xref:spring-cloud-netflix.adoc[Spring Cloud Netflix] +
 (camel-spring-cloud-netflix-starter) | 2.19 | Camel Cloud integration with Spring Cloud Netflix
 
-| xref:3.4.x@components:others:spring-cloud-zookeeper.adoc[Spring Cloud Zookeeper] +
+| xref:spring-cloud-zookeeper.adoc[Spring Cloud Zookeeper] +
 (camel-spring-cloud-zookeeper-starter) | 2.19 | Camel Cloud integration with Spring Cloud Zookeeper
 
 | xref:3.4.x@components:others:spring-javaconfig.adoc[Spring Java Configuration] +
diff --git a/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java b/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java
index d5de97b..8229fd8 100644
--- a/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java
+++ b/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java
@@ -16,14 +16,17 @@
  */
 package org.apache.camel.springboot.maven;
 
+import java.nio.file.Files;
 import java.nio.file.Path;
 
 import org.apache.camel.maven.packaging.MvelHelper;
-import org.apache.camel.tooling.model.OtherModel;
-import org.apache.camel.tooling.util.Strings;
+import org.apache.camel.tooling.model.ArtifactModel;
+import org.apache.camel.tooling.model.BaseModel;
 import org.apache.camel.tooling.model.ComponentModel;
 import org.apache.camel.tooling.model.DataFormatModel;
 import org.apache.camel.tooling.model.LanguageModel;
+import org.apache.camel.tooling.model.OtherModel;
+import org.apache.camel.tooling.model.SupportLevel;
 
 public class ExtMvelHelper {
 
@@ -37,46 +40,38 @@ public class ExtMvelHelper {
         return MvelHelper.escape(raw);
     }
 
-    public String getFirstVersionShort(Object model) {
-        String version = (String) invokeGetter(model, "getFirstVersion");
+    public String getFirstVersionShort(BaseModel<?> model) {
+        String version = model.getFirstVersion();
         return org.apache.camel.tooling.model.Strings.cutLastZeroDigit(version);
     }
 
-    public String getDocLink(Object model) {
-        if (localDocExists(model)) {
-            return getLocalDocLink(model);
+    public String getSupportLevel(ArtifactModel<?> model) {
+        final SupportLevel supportLevel = model.getSupportLevel();
+        if (supportLevel != null) {
+            return model.getSupportLevel().name();
+        }
+
+        return SupportLevel.Preview.name();
+    }
+
+    public String getDocLink(ArtifactModel<?> model) {
+        if (isLocalComponent(model)) {
+            return String.format("xref:%s.adoc", ((ArtifactModel<?>) model).getName());
         } else if (model instanceof ComponentModel) {
-            return String.format("xref:3.4.x@components::%s-component.adoc", invokeGetter(model, "getScheme"));
+            return String.format("xref:3.4.x@components::%s-component.adoc", ((ComponentModel) model).getScheme());
         } else if (model instanceof DataFormatModel) {
-            return String.format("xref:3.4.x@components:dataformats:%s-dataformat.adoc", invokeGetter(model, "getName"));
+            return String.format("xref:3.4.x@components:dataformats:%s-dataformat.adoc", ((DataFormatModel) model).getName());
         } else if (model instanceof LanguageModel) {
-            return String.format("xref:3.4.x@components:languages:%s-language.adoc", invokeGetter(model, "getName"));
+            return String.format("xref:3.4.x@components:languages:%s-language.adoc", ((LanguageModel) model).getName());
         } else if (model instanceof OtherModel) {
-            return String.format("xref:3.4.x@components:others:%s.adoc", invokeGetter(model, "getName"));
+            return String.format("xref:3.4.x@components:others:%s.adoc", ((OtherModel) model).getName());
         } else {
             return null;
         }
     }
 
-    private Object invokeGetter(Object model, String method) {
-        try {
-            return model.getClass().getMethod(method)
-                    .invoke(model);
-        } catch (Exception e) {
-            throw new RuntimeException("Unable to access " + method + " from " + model, e);
-        }
-    }
-
-    private boolean localDocExists(Object model) {
-        Path path = extensionsDocPath.resolve(getSpringBootDocName(model));
-        return path.toFile().exists();
+    private boolean isLocalComponent(ArtifactModel<?> model) {
+        return Files.exists(extensionsDocPath.resolve(((ArtifactModel<?>) model).getName() + ".adoc"));
     }
 
-    private String getLocalDocLink(Object model) {
-        return "xref:components-starter/" + getSpringBootDocName(model);
-    }
-
-    private String getSpringBootDocName(Object model) {
-        return Strings.after((String) invokeGetter(model, "getArtifactId"), "camel-") + ".adoc";
-    }
 }
diff --git a/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateDocComponentsListMojo.java b/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateDocComponentsListMojo.java
index 9bc9f8c..0312ded 100644
--- a/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateDocComponentsListMojo.java
+++ b/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/UpdateDocComponentsListMojo.java
@@ -20,7 +20,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.nio.file.Path;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -628,7 +627,7 @@ public class UpdateDocComponentsListMojo extends AbstractMojo {
     }
 
     private Path getComponentsStarterDocPath() {
-        return Paths.get(websiteDocBaseDir.toString(), "components-starter");
+        return websiteDocBaseDir.toPath();
     }
 
 }


[camel-spring-boot] 03/03: fix: remove starters that are not present on 3.4.x

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch camel-spring-boot-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit a46d38b0402e3151b376305ff5caa23880721257
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Thu Nov 5 13:00:22 2020 +0100

    fix: remove starters that are not present on 3.4.x
    
    I guess mixing versions when building locally leads to components not
    present in a version to end up being linked to, this removes components
    that are not present on 3.4.x.
---
 components-starter/README.adoc    | 42 ---------------------------------------
 docs/modules/ROOT/pages/list.adoc | 42 ---------------------------------------
 2 files changed, 84 deletions(-)

diff --git a/components-starter/README.adoc b/components-starter/README.adoc
index 10de155..3a4ec3b 100644
--- a/components-starter/README.adoc
+++ b/components-starter/README.adoc
@@ -20,9 +20,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::apns-component.adoc[APNS] (camel-apns-starter) +
 `apns:name` | 2.8 | Send notifications to Apple iOS devices.
 
-| xref:3.4.x@components::arangodb-component.adoc[ArangoDb] (camel-arangodb-starter) +
-`arangodb:database` | 3.5 | Perform operations on ArangoDb when used as a Document Database, or as a Graph Database
-
 | xref:3.4.x@components::as2-component.adoc[AS2] (camel-as2-starter) +
 `as2:apiName/methodName` | 2.22 | Transfer data securely and reliably using the AS2 protocol (RFC4130).
 
@@ -35,9 +32,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::ahc-ws-component.adoc[Async HTTP Client (AHC) Websocket] (camel-ahc-ws-starter) +
 `ahc-ws:httpUri` | 2.14 | Exchange data with external Websocket servers using Async Http Client.
 
-| xref:3.4.x@components::atlasmap-component.adoc[AtlasMap] (camel-atlasmap-starter) +
-`atlasmap:resourceUri` | 3.7 | Transforms the message using an AtlasMap transformation.
-
 | xref:3.4.x@components::atmos-component.adoc[Atmos] (camel-atmos-starter) +
 `atmos:name/operation` | 2.15 | Integract with EMC's ViPR object data services using the Atmos Client.
 
@@ -89,9 +83,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::aws2-eks-component.adoc[AWS 2 Elastic Kubernetes Service (EKS)] (camel-aws2-eks-starter) +
 `aws2-eks:label` | 3.1 | Manage AWS EKS cluster instances using AWS SDK version 2.x.
 
-| xref:3.4.x@components::aws2-eventbridge-component.adoc[AWS 2 Eventbridge] (camel-aws2-eventbridge-starter) +
-`aws2-eventbridge://eventbusNameOrArn` | 3.6 | Manage AWS Eventbridge cluster instances using AWS SDK version 2.x.
-
 | xref:3.4.x@components::aws2-iam-component.adoc[AWS 2 Identity and Access Management (IAM)] (camel-aws2-iam-starter) +
 `aws2-iam:label` | 3.1 | Manage AWS IAM instances using AWS SDK version 2.x.
 
@@ -116,9 +107,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::aws2-s3-component.adoc[AWS 2 S3 Storage Service] (camel-aws2-s3-starter) +
 `aws2-s3://bucketNameOrArn` | 3.2 | Store and retrie objects from AWS S3 Storage Service using AWS SDK version 2.x.
 
-| xref:3.4.x@components::aws2-sts-component.adoc[AWS 2 Security Token Service (STS)] (camel-aws2-sts-starter) +
-`aws2-sts:label` | 3.5 | Manage AWS STS cluster instances using AWS SDK version 2.x.
-
 | xref:3.4.x@components::aws2-ses-component.adoc[AWS 2 Simple Email Service (SES)] (camel-aws2-ses-starter) +
 `aws2-ses:from` | 3.1 | Send e-mails through AWS SES service using AWS SDK version 2.x.
 
@@ -191,9 +179,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::aws-translate-component.adoc[AWS Translate] (camel-aws-translate-starter) +
 `aws-translate:label` | 3.0 | Translate texts using AWS Translate.
 
-| xref:3.4.x@components::azure-eventhubs-component.adoc[Azure Event Hubs] (camel-azure-eventhubs-starter) +
-`azure-eventhubs:namespace/eventHubName` | 3.5 | The azure-eventhubs component that integrates Azure Event Hubs using AMQP protocol. Azure EventHubs is a highly scalable publish-subscribe service that can ingest millions of events per second and stream them to multiple consumers.
-
 | xref:3.4.x@components::azure-storage-blob-component.adoc[Azure Storage Blob Service] (camel-azure-storage-blob-starter) +
 `azure-storage-blob:accountName/containerName` | 3.3 | Store and retrieve blobs from Azure Storage Blob Service using SDK v12.
 
@@ -590,9 +575,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::json-validator-component.adoc[JSON Schema Validator] (camel-json-validator-starter) +
 `json-validator:resourceUri` | 2.20 | Validate JSON payloads using NetworkNT JSON Schema.
 
-| xref:3.4.x@components::jsonata-component.adoc[JSONATA] (camel-jsonata-starter) +
-`jsonata:resourceUri` | 3.5 | JSON to JSON transformation using JSONATA.
-
 | xref:3.4.x@components::jt400-component.adoc[JT400] (camel-jt400-starter) +
 `jt400:userID:password/systemName/objectPath.type` | 1.5 | Exchanges messages with an AS/400 system using data queues or program call.
 
@@ -677,9 +659,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::mina-component.adoc[Mina] (camel-mina-starter) +
 `mina:protocol:host:port` | 2.10 | Socket level networking using TCP or UDP with Apache Mina 2.x.
 
-| xref:3.4.x@components::minio-component.adoc[Minio] (camel-minio-starter) +
-`minio:bucketName` | 3.5 | Store and retrieve objects from Minio Storage Service using Minio SDK.
-
 | xref:3.4.x@components::mllp-component.adoc[MLLP] (camel-mllp-starter) +
 `mllp:hostname:port` | 2.17 | Communicate with external systems using the MLLP protocol.
 
@@ -725,9 +704,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::nsq-component.adoc[NSQ] (camel-nsq-starter) +
 `nsq:topic` | 2.23 | Send and receive messages from NSQ realtime distributed messaging platform.
 
-| xref:3.4.x@components::oaipmh-component.adoc[OAI-PMH] (camel-oaipmh-starter) +
-`oaipmh:baseUrl` | 3.5 | Harvest metadata using OAI-PMH protocol
-
 | xref:3.4.x@components::olingo2-component.adoc[Olingo2] (camel-olingo2-starter) +
 `olingo2:apiName/methodName` | 2.14 | Communicate with OData 2.0 services using Apache Olingo.
 
@@ -971,12 +947,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::vertx-component.adoc[Vert.x] (camel-vertx-starter) +
 `vertx:address` | 2.12 | Send and receive messages to/from Vert.x Event Bus.
 
-| xref:3.4.x@components::vertx-http-component.adoc[Vert.x HTTP Client] (camel-vertx-http-starter) +
-`vertx-http:httpUri` | 3.5 | Send requests to external HTTP servers using Vert.x
-
-| xref:3.4.x@components::vertx-websocket-component.adoc[Vert.x WebSocket] (camel-vertx-websocket-starter) +
-`vertx-websocket:host:port/path` | 3.5 | Expose WebSocket endpoints and connect to remote WebSocket servers using Vert.x
-
 | xref:3.4.x@components::vm-component.adoc[VM] (camel-vm-starter) +
 `vm:name` | 1.1 | Call another endpoint in the same CamelContext asynchronously.
 
@@ -1121,9 +1091,6 @@ Number of Camel data formats: 46 in 38 JAR artifacts (0 deprecated)
 | xref:3.4.x@components:dataformats:json-johnzon-dataformat.adoc[JSON Johnzon] +
 (camel-johnzon-starter) | 2.18 | Marshal POJOs to JSON and back.
 
-| xref:3.4.x@components:dataformats:json-jsonb-dataformat.adoc[JSON JSON-B] +
-(camel-jsonb-starter) | 3.7 | Marshal POJOs to JSON and back using JSON-B.
-
 | xref:3.4.x@components:dataformats:json-xstream-dataformat.adoc[JSON XStream] +
 (camel-xstream-starter) | 2.0 | Marshal POJOs to JSON and back.
 
@@ -1264,9 +1231,6 @@ Number of miscellaneous extensions: 26 in 26 JAR artifacts (1 deprecated)
 | xref:3.4.x@components:others:cxf-transport.adoc[CXF Transport] +
 (camel-cxf-transport-starter) | 2.8 | Camel Transport for Apache CXF
 
-| xref:3.4.x@components:others:etcd3.adoc[Etcd3] +
-(camel-etcd3-starter) | 3.5 | Aggregation repository using EtcD as datastore
-
 | xref:3.4.x@components:others:hystrix.adoc[Hystrix] +
 (camel-hystrix-starter) | 2.18 | *deprecated* Circuit Breaker EIP using Netflix Hystrix
 
@@ -1276,18 +1240,12 @@ Number of miscellaneous extensions: 26 in 26 JAR artifacts (1 deprecated)
 | xref:3.4.x@components:others:leveldb.adoc[LevelDB] +
 (camel-leveldb-starter) | 2.10 | Using LevelDB as persistent EIP store
 
-| xref:3.4.x@components:others:leveldb-legacy.adoc[LevelDB-legacy] +
-(camel-leveldb-legacy-starter) | 2.10 | Using LevelDB as persistent EIP store
-
 | xref:3.4.x@components:others:lra.adoc[LRA] +
 (camel-lra-starter) | 2.21 | Camel saga binding for Long-Running-Action framework
 
 | xref:3.4.x@components:others:openapi-java.adoc[Openapi Java] +
 (camel-openapi-java-starter) | 3.1 | Rest-dsl support for using openapi doc
 
-| xref:3.4.x@components:others:opentelemetry.adoc[OpenTelemetry] +
-(camel-opentelemetry-starter) | 3.5 | Distributed tracing using OpenTelemetry
-
 | xref:3.4.x@components:others:opentracing.adoc[OpenTracing] +
 (camel-opentracing-starter) | 2.19 | Distributed tracing using OpenTracing
 
diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc
index 10de155..3a4ec3b 100644
--- a/docs/modules/ROOT/pages/list.adoc
+++ b/docs/modules/ROOT/pages/list.adoc
@@ -20,9 +20,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::apns-component.adoc[APNS] (camel-apns-starter) +
 `apns:name` | 2.8 | Send notifications to Apple iOS devices.
 
-| xref:3.4.x@components::arangodb-component.adoc[ArangoDb] (camel-arangodb-starter) +
-`arangodb:database` | 3.5 | Perform operations on ArangoDb when used as a Document Database, or as a Graph Database
-
 | xref:3.4.x@components::as2-component.adoc[AS2] (camel-as2-starter) +
 `as2:apiName/methodName` | 2.22 | Transfer data securely and reliably using the AS2 protocol (RFC4130).
 
@@ -35,9 +32,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::ahc-ws-component.adoc[Async HTTP Client (AHC) Websocket] (camel-ahc-ws-starter) +
 `ahc-ws:httpUri` | 2.14 | Exchange data with external Websocket servers using Async Http Client.
 
-| xref:3.4.x@components::atlasmap-component.adoc[AtlasMap] (camel-atlasmap-starter) +
-`atlasmap:resourceUri` | 3.7 | Transforms the message using an AtlasMap transformation.
-
 | xref:3.4.x@components::atmos-component.adoc[Atmos] (camel-atmos-starter) +
 `atmos:name/operation` | 2.15 | Integract with EMC's ViPR object data services using the Atmos Client.
 
@@ -89,9 +83,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::aws2-eks-component.adoc[AWS 2 Elastic Kubernetes Service (EKS)] (camel-aws2-eks-starter) +
 `aws2-eks:label` | 3.1 | Manage AWS EKS cluster instances using AWS SDK version 2.x.
 
-| xref:3.4.x@components::aws2-eventbridge-component.adoc[AWS 2 Eventbridge] (camel-aws2-eventbridge-starter) +
-`aws2-eventbridge://eventbusNameOrArn` | 3.6 | Manage AWS Eventbridge cluster instances using AWS SDK version 2.x.
-
 | xref:3.4.x@components::aws2-iam-component.adoc[AWS 2 Identity and Access Management (IAM)] (camel-aws2-iam-starter) +
 `aws2-iam:label` | 3.1 | Manage AWS IAM instances using AWS SDK version 2.x.
 
@@ -116,9 +107,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::aws2-s3-component.adoc[AWS 2 S3 Storage Service] (camel-aws2-s3-starter) +
 `aws2-s3://bucketNameOrArn` | 3.2 | Store and retrie objects from AWS S3 Storage Service using AWS SDK version 2.x.
 
-| xref:3.4.x@components::aws2-sts-component.adoc[AWS 2 Security Token Service (STS)] (camel-aws2-sts-starter) +
-`aws2-sts:label` | 3.5 | Manage AWS STS cluster instances using AWS SDK version 2.x.
-
 | xref:3.4.x@components::aws2-ses-component.adoc[AWS 2 Simple Email Service (SES)] (camel-aws2-ses-starter) +
 `aws2-ses:from` | 3.1 | Send e-mails through AWS SES service using AWS SDK version 2.x.
 
@@ -191,9 +179,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::aws-translate-component.adoc[AWS Translate] (camel-aws-translate-starter) +
 `aws-translate:label` | 3.0 | Translate texts using AWS Translate.
 
-| xref:3.4.x@components::azure-eventhubs-component.adoc[Azure Event Hubs] (camel-azure-eventhubs-starter) +
-`azure-eventhubs:namespace/eventHubName` | 3.5 | The azure-eventhubs component that integrates Azure Event Hubs using AMQP protocol. Azure EventHubs is a highly scalable publish-subscribe service that can ingest millions of events per second and stream them to multiple consumers.
-
 | xref:3.4.x@components::azure-storage-blob-component.adoc[Azure Storage Blob Service] (camel-azure-storage-blob-starter) +
 `azure-storage-blob:accountName/containerName` | 3.3 | Store and retrieve blobs from Azure Storage Blob Service using SDK v12.
 
@@ -590,9 +575,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::json-validator-component.adoc[JSON Schema Validator] (camel-json-validator-starter) +
 `json-validator:resourceUri` | 2.20 | Validate JSON payloads using NetworkNT JSON Schema.
 
-| xref:3.4.x@components::jsonata-component.adoc[JSONATA] (camel-jsonata-starter) +
-`jsonata:resourceUri` | 3.5 | JSON to JSON transformation using JSONATA.
-
 | xref:3.4.x@components::jt400-component.adoc[JT400] (camel-jt400-starter) +
 `jt400:userID:password/systemName/objectPath.type` | 1.5 | Exchanges messages with an AS/400 system using data queues or program call.
 
@@ -677,9 +659,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::mina-component.adoc[Mina] (camel-mina-starter) +
 `mina:protocol:host:port` | 2.10 | Socket level networking using TCP or UDP with Apache Mina 2.x.
 
-| xref:3.4.x@components::minio-component.adoc[Minio] (camel-minio-starter) +
-`minio:bucketName` | 3.5 | Store and retrieve objects from Minio Storage Service using Minio SDK.
-
 | xref:3.4.x@components::mllp-component.adoc[MLLP] (camel-mllp-starter) +
 `mllp:hostname:port` | 2.17 | Communicate with external systems using the MLLP protocol.
 
@@ -725,9 +704,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::nsq-component.adoc[NSQ] (camel-nsq-starter) +
 `nsq:topic` | 2.23 | Send and receive messages from NSQ realtime distributed messaging platform.
 
-| xref:3.4.x@components::oaipmh-component.adoc[OAI-PMH] (camel-oaipmh-starter) +
-`oaipmh:baseUrl` | 3.5 | Harvest metadata using OAI-PMH protocol
-
 | xref:3.4.x@components::olingo2-component.adoc[Olingo2] (camel-olingo2-starter) +
 `olingo2:apiName/methodName` | 2.14 | Communicate with OData 2.0 services using Apache Olingo.
 
@@ -971,12 +947,6 @@ Number of Camel components: 341 in 274 JAR artifacts (1 deprecated)
 | xref:3.4.x@components::vertx-component.adoc[Vert.x] (camel-vertx-starter) +
 `vertx:address` | 2.12 | Send and receive messages to/from Vert.x Event Bus.
 
-| xref:3.4.x@components::vertx-http-component.adoc[Vert.x HTTP Client] (camel-vertx-http-starter) +
-`vertx-http:httpUri` | 3.5 | Send requests to external HTTP servers using Vert.x
-
-| xref:3.4.x@components::vertx-websocket-component.adoc[Vert.x WebSocket] (camel-vertx-websocket-starter) +
-`vertx-websocket:host:port/path` | 3.5 | Expose WebSocket endpoints and connect to remote WebSocket servers using Vert.x
-
 | xref:3.4.x@components::vm-component.adoc[VM] (camel-vm-starter) +
 `vm:name` | 1.1 | Call another endpoint in the same CamelContext asynchronously.
 
@@ -1121,9 +1091,6 @@ Number of Camel data formats: 46 in 38 JAR artifacts (0 deprecated)
 | xref:3.4.x@components:dataformats:json-johnzon-dataformat.adoc[JSON Johnzon] +
 (camel-johnzon-starter) | 2.18 | Marshal POJOs to JSON and back.
 
-| xref:3.4.x@components:dataformats:json-jsonb-dataformat.adoc[JSON JSON-B] +
-(camel-jsonb-starter) | 3.7 | Marshal POJOs to JSON and back using JSON-B.
-
 | xref:3.4.x@components:dataformats:json-xstream-dataformat.adoc[JSON XStream] +
 (camel-xstream-starter) | 2.0 | Marshal POJOs to JSON and back.
 
@@ -1264,9 +1231,6 @@ Number of miscellaneous extensions: 26 in 26 JAR artifacts (1 deprecated)
 | xref:3.4.x@components:others:cxf-transport.adoc[CXF Transport] +
 (camel-cxf-transport-starter) | 2.8 | Camel Transport for Apache CXF
 
-| xref:3.4.x@components:others:etcd3.adoc[Etcd3] +
-(camel-etcd3-starter) | 3.5 | Aggregation repository using EtcD as datastore
-
 | xref:3.4.x@components:others:hystrix.adoc[Hystrix] +
 (camel-hystrix-starter) | 2.18 | *deprecated* Circuit Breaker EIP using Netflix Hystrix
 
@@ -1276,18 +1240,12 @@ Number of miscellaneous extensions: 26 in 26 JAR artifacts (1 deprecated)
 | xref:3.4.x@components:others:leveldb.adoc[LevelDB] +
 (camel-leveldb-starter) | 2.10 | Using LevelDB as persistent EIP store
 
-| xref:3.4.x@components:others:leveldb-legacy.adoc[LevelDB-legacy] +
-(camel-leveldb-legacy-starter) | 2.10 | Using LevelDB as persistent EIP store
-
 | xref:3.4.x@components:others:lra.adoc[LRA] +
 (camel-lra-starter) | 2.21 | Camel saga binding for Long-Running-Action framework
 
 | xref:3.4.x@components:others:openapi-java.adoc[Openapi Java] +
 (camel-openapi-java-starter) | 3.1 | Rest-dsl support for using openapi doc
 
-| xref:3.4.x@components:others:opentelemetry.adoc[OpenTelemetry] +
-(camel-opentelemetry-starter) | 3.5 | Distributed tracing using OpenTelemetry
-
 | xref:3.4.x@components:others:opentracing.adoc[OpenTracing] +
 (camel-opentracing-starter) | 2.19 | Distributed tracing using OpenTracing
 


[camel-spring-boot] 01/03: fix: xref for component modules naming

Posted by zr...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

zregvart pushed a commit to branch camel-spring-boot-3.4.x
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git

commit 903f0333cc82a7c2bf4c2bf50af1c070e8692d4f
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Wed Nov 4 22:22:35 2020 +0100

    fix: xref for component modules naming
    
    Naming of dataformats, languages and other in xrefs was wrong.
---
 components-starter/README.adoc                     | 178 ++++++++++-----------
 docs/modules/ROOT/pages/list.adoc                  | 178 ++++++++++-----------
 docs/modules/ROOT/pages/spring-boot.adoc           |   6 +-
 .../camel/springboot/maven/ExtMvelHelper.java      |   6 +-
 4 files changed, 186 insertions(+), 182 deletions(-)

diff --git a/components-starter/README.adoc b/components-starter/README.adoc
index becc654..22d5432 100644
--- a/components-starter/README.adoc
+++ b/components-starter/README.adoc
@@ -1046,142 +1046,142 @@ Number of Camel data formats: 46 in 38 JAR artifacts (0 deprecated)
 |===
 | Data Format | Since | Description
 
-| xref:3.4.x@components:dataformats/any23.adoc[Any23] +
+| xref:3.4.x@components:dataformats:any23-dataformat.adoc[Any23] +
 (camel-any23-starter) | 3.0 | Extract RDF data from HTML documents.
 
-| xref:3.4.x@components:dataformats/asn1.adoc[ASN.1 File] +
+| xref:3.4.x@components:dataformats:asn1-dataformat.adoc[ASN.1 File] +
 (camel-asn1-starter) | 2.20 | Encode and decode data structures using Abstract Syntax Notation One (ASN.1).
 
-| xref:3.4.x@components:dataformats/avro.adoc[Avro] +
+| xref:3.4.x@components:dataformats:avro-dataformat.adoc[Avro] +
 (camel-avro-starter) | 2.14 | Serialize and deserialize messages using Apache Avro binary data format.
 
-| xref:3.4.x@components:dataformats/barcode.adoc[Barcode] +
+| xref:3.4.x@components:dataformats:barcode-dataformat.adoc[Barcode] +
 (camel-barcode-starter) | 2.14 | Transform strings to various 1D/2D barcode bitmap formats and back.
 
-| xref:3.4.x@components:dataformats/base64.adoc[Base64] +
+| xref:3.4.x@components:dataformats:base64-dataformat.adoc[Base64] +
 (camel-base64-starter) | 2.11 | Encode and decode data using Base64.
 
-| xref:3.4.x@components:dataformats/beanio.adoc[BeanIO] +
+| xref:3.4.x@components:dataformats:beanio-dataformat.adoc[BeanIO] +
 (camel-beanio-starter) | 2.10 | Marshal and unmarshal Java beans to and from flat files (such as CSV, delimited, or fixed length formats).
 
-| xref:3.4.x@components:dataformats/bindy.adoc[Bindy CSV] +
+| xref:3.4.x@components:dataformats:bindy-dataformat.adoc[Bindy CSV] +
 (camel-bindy-starter) | 2.0 | Marshal and unmarshal Java beans from and to flat payloads (such as CSV, delimited, fixed length formats, or FIX messages).
 
-| xref:3.4.x@components:dataformats/bindy.adoc[Bindy Fixed Length] +
+| xref:3.4.x@components:dataformats:bindy-dataformat.adoc[Bindy Fixed Length] +
 (camel-bindy-starter) | 2.0 | Marshal and unmarshal Java beans from and to flat payloads (such as CSV, delimited, fixed length formats, or FIX messages).
 
-| xref:3.4.x@components:dataformats/bindy.adoc[Bindy Key Value Pair] +
+| xref:3.4.x@components:dataformats:bindy-dataformat.adoc[Bindy Key Value Pair] +
 (camel-bindy-starter) | 2.0 | Marshal and unmarshal Java beans from and to flat payloads (such as CSV, delimited, fixed length formats, or FIX messages).
 
-| xref:3.4.x@components:dataformats/cbor.adoc[CBOR] +
+| xref:3.4.x@components:dataformats:cbor-dataformat.adoc[CBOR] +
 (camel-cbor-starter) | 3.0 | Unmarshal a CBOR payload to POJO and back.
 
-| xref:3.4.x@components:dataformats/crypto.adoc[Crypto (Java Cryptographic Extension)] +
+| xref:3.4.x@components:dataformats:crypto-dataformat.adoc[Crypto (Java Cryptographic Extension)] +
 (camel-crypto-starter) | 2.3 | Encrypt and decrypt messages using Java Cryptography Extension (JCE).
 
-| xref:3.4.x@components:dataformats/csv.adoc[CSV] +
+| xref:3.4.x@components:dataformats:csv-dataformat.adoc[CSV] +
 (camel-csv-starter) | 1.3 | Handle CSV (Comma Separated Values) payloads.
 
-| xref:3.4.x@components:dataformats/fhirJson.adoc[FHIR JSon] +
+| xref:3.4.x@components:dataformats:fhirJson-dataformat.adoc[FHIR JSon] +
 (camel-fhir-starter) | 2.21 | Marshall and unmarshall FHIR objects to/from JSON.
 
-| xref:3.4.x@components:dataformats/fhirXml.adoc[FHIR XML] +
+| xref:3.4.x@components:dataformats:fhirXml-dataformat.adoc[FHIR XML] +
 (camel-fhir-starter) | 2.21 | Marshall and unmarshall FHIR objects to/from XML.
 
-| xref:3.4.x@components:dataformats/flatpack.adoc[Flatpack] +
+| xref:3.4.x@components:dataformats:flatpack-dataformat.adoc[Flatpack] +
 (camel-flatpack-starter) | 2.1 | Marshal and unmarshal Java lists and maps to/from flat files (such as CSV, delimited, or fixed length formats) using Flatpack library.
 
-| xref:3.4.x@components:dataformats/grok.adoc[Grok] +
+| xref:3.4.x@components:dataformats:grok-dataformat.adoc[Grok] +
 (camel-grok-starter) | 3.0 | Unmarshal unstructured data to objects using Logstash based Grok patterns.
 
-| xref:3.4.x@components:dataformats/gzipdeflater.adoc[GZip Deflater] +
+| xref:3.4.x@components:dataformats:gzipdeflater-dataformat.adoc[GZip Deflater] +
 (camel-zip-deflater-starter) | 2.0 | Compress and decompress messages using java.util.zip.GZIPStream.
 
-| xref:3.4.x@components:dataformats/hl7.adoc[HL7] +
+| xref:3.4.x@components:dataformats:hl7-dataformat.adoc[HL7] +
 (camel-hl7-starter) | 2.0 | Marshal and unmarshal HL7 (Health Care) model objects using the HL7 MLLP codec.
 
-| xref:3.4.x@components:dataformats/ical.adoc[iCal] +
+| xref:3.4.x@components:dataformats:ical-dataformat.adoc[iCal] +
 (camel-ical-starter) | 2.12 | Marshal and unmarshal iCal (.ics) documents to/from model objects provided by the iCal4j library.
 
-| xref:3.4.x@components:dataformats/jacksonxml.adoc[JacksonXML] +
+| xref:3.4.x@components:dataformats:jacksonxml-dataformat.adoc[JacksonXML] +
 (camel-jacksonxml-starter) | 2.16 | Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.
 
-| xref:3.4.x@components:dataformats/jaxb.adoc[JAXB] +
+| xref:3.4.x@components:dataformats:jaxb-dataformat.adoc[JAXB] +
 (camel-jaxb-starter) | 1.0 | Unmarshal XML payloads to POJOs and back using JAXB2 XML marshalling standard.
 
-| xref:3.4.x@components:dataformats/json-fastjson.adoc[JSON Fastjson] +
+| xref:3.4.x@components:dataformats:json-fastjson-dataformat.adoc[JSON Fastjson] +
 (camel-fastjson-starter) | 2.20 | Marshal POJOs to JSON and back.
 
-| xref:3.4.x@components:dataformats/json-gson.adoc[JSON Gson] +
+| xref:3.4.x@components:dataformats:json-gson-dataformat.adoc[JSON Gson] +
 (camel-gson-starter) | 2.10 | Marshal POJOs to JSON and back.
 
-| xref:3.4.x@components:dataformats/json-jackson.adoc[JSON Jackson] +
+| xref:3.4.x@components:dataformats:json-jackson-dataformat.adoc[JSON Jackson] +
 (camel-jackson-starter) | 2.0 | Marshal POJOs to JSON and back.
 
-| xref:3.4.x@components:dataformats/json-johnzon.adoc[JSON Johnzon] +
+| xref:3.4.x@components:dataformats:json-johnzon-dataformat.adoc[JSON Johnzon] +
 (camel-johnzon-starter) | 2.18 | Marshal POJOs to JSON and back.
 
-| xref:3.4.x@components:dataformats/json-jsonb.adoc[JSON JSON-B] +
+| xref:3.4.x@components:dataformats:json-jsonb-dataformat.adoc[JSON JSON-B] +
 (camel-jsonb-starter) | 3.7 | Marshal POJOs to JSON and back using JSON-B.
 
-| xref:3.4.x@components:dataformats/json-xstream.adoc[JSON XStream] +
+| xref:3.4.x@components:dataformats:json-xstream-dataformat.adoc[JSON XStream] +
 (camel-xstream-starter) | 2.0 | Marshal POJOs to JSON and back.
 
-| xref:3.4.x@components:dataformats/jsonApi.adoc[JSonApi] +
+| xref:3.4.x@components:dataformats:jsonApi-dataformat.adoc[JSonApi] +
 (camel-jsonapi-starter) | 3.0 | Marshal and unmarshal JSON:API resources using JSONAPI-Converter library.
 
-| xref:3.4.x@components:dataformats/lzf.adoc[LZF Deflate Compression] +
+| xref:3.4.x@components:dataformats:lzf-dataformat.adoc[LZF Deflate Compression] +
 (camel-lzf-starter) | 2.17 | Compress and decompress streams using LZF deflate algorithm.
 
-| xref:3.4.x@components:dataformats/mime-multipart.adoc[MIME Multipart] +
+| xref:3.4.x@components:dataformats:mime-multipart-dataformat.adoc[MIME Multipart] +
 (camel-mail-starter) | 2.17 | Marshal Camel messages with attachments into MIME-Multipart messages and back.
 
-| xref:3.4.x@components:dataformats/pgp.adoc[PGP] +
+| xref:3.4.x@components:dataformats:pgp-dataformat.adoc[PGP] +
 (camel-crypto-starter) | 2.9 | Encrypt and decrypt messages using Java Cryptographic Extension (JCE) and PGP.
 
-| xref:3.4.x@components:dataformats/protobuf.adoc[Protobuf] +
+| xref:3.4.x@components:dataformats:protobuf-dataformat.adoc[Protobuf] +
 (camel-protobuf-starter) | 2.2 | Serialize and deserialize Java objects using Google's Protocol buffers.
 
-| xref:3.4.x@components:dataformats/rss.adoc[RSS] +
+| xref:3.4.x@components:dataformats:rss-dataformat.adoc[RSS] +
 (camel-rss-starter) | 2.1 | Transform from ROME SyndFeed Java Objects to XML and vice-versa.
 
-| xref:3.4.x@components:dataformats/soapjaxb.adoc[SOAP] +
+| xref:3.4.x@components:dataformats:soapjaxb-dataformat.adoc[SOAP] +
 (camel-soap-starter) | 2.3 | Marshal Java objects to SOAP messages and back.
 
-| xref:3.4.x@components:dataformats/syslog.adoc[Syslog] +
+| xref:3.4.x@components:dataformats:syslog-dataformat.adoc[Syslog] +
 (camel-syslog-starter) | 2.6 | Marshall SyslogMessages to RFC3164 and RFC5424 messages and back.
 
-| xref:3.4.x@components:dataformats/tarfile.adoc[Tar File] +
+| xref:3.4.x@components:dataformats:tarfile-dataformat.adoc[Tar File] +
 (camel-tarfile-starter) | 2.16 | Archive files into tarballs or extract files from tarballs.
 
-| xref:3.4.x@components:dataformats/thrift.adoc[Thrift] +
+| xref:3.4.x@components:dataformats:thrift-dataformat.adoc[Thrift] +
 (camel-thrift-starter) | 2.20 | Serialize and deserialize messages using Apache Thrift binary data format.
 
-| xref:3.4.x@components:dataformats/tidyMarkup.adoc[TidyMarkup] +
+| xref:3.4.x@components:dataformats:tidyMarkup-dataformat.adoc[TidyMarkup] +
 (camel-tagsoup-starter) | 2.0 | Parse (potentially invalid) HTML into valid HTML or DOM.
 
-| xref:3.4.x@components:dataformats/univocity-csv.adoc[uniVocity CSV] +
+| xref:3.4.x@components:dataformats:univocity-csv-dataformat.adoc[uniVocity CSV] +
 (camel-univocity-parsers-starter) | 2.15 | Marshal and unmarshal Java objects from and to CSV (Comma Separated Values) using UniVocity Parsers.
 
-| xref:3.4.x@components:dataformats/univocity-fixed.adoc[uniVocity Fixed Length] +
+| xref:3.4.x@components:dataformats:univocity-fixed-dataformat.adoc[uniVocity Fixed Length] +
 (camel-univocity-parsers-starter) | 2.15 | Marshal and unmarshal Java objects from and to fixed length records using UniVocity Parsers.
 
-| xref:3.4.x@components:dataformats/univocity-tsv.adoc[uniVocity TSV] +
+| xref:3.4.x@components:dataformats:univocity-tsv-dataformat.adoc[uniVocity TSV] +
 (camel-univocity-parsers-starter) | 2.15 | Marshal and unmarshal Java objects from and to TSV (Tab-Separated Values) records using UniVocity Parsers.
 
-| xref:3.4.x@components:dataformats/secureXML.adoc[XML Security] +
+| xref:3.4.x@components:dataformats:secureXML-dataformat.adoc[XML Security] +
 (camel-xmlsecurity-starter) | 2.0 | Encrypt and decrypt XML payloads using Apache Santuario.
 
-| xref:3.4.x@components:dataformats/xstream.adoc[XStream] +
+| xref:3.4.x@components:dataformats:xstream-dataformat.adoc[XStream] +
 (camel-xstream-starter) | 1.3 | Marshal and unmarshal POJOs to/from XML using XStream library.
 
-| xref:3.4.x@components:dataformats/yaml-snakeyaml.adoc[YAML SnakeYAML] +
+| xref:3.4.x@components:dataformats:yaml-snakeyaml-dataformat.adoc[YAML SnakeYAML] +
 (camel-snakeyaml-starter) | 2.17 | Marshal and unmarshal Java objects to and from YAML.
 
-| xref:3.4.x@components:dataformats/zipdeflater.adoc[Zip Deflate Compression] +
+| xref:3.4.x@components:dataformats:zipdeflater-dataformat.adoc[Zip Deflate Compression] +
 (camel-zip-deflater-starter) | 2.12 | Compress and decompress streams using java.util.zip.Deflater and java.util.zip.Inflater.
 
-| xref:3.4.x@components:dataformats/zipfile.adoc[Zip File] +
+| xref:3.4.x@components:dataformats:zipfile-dataformat.adoc[Zip File] +
 (camel-zipfile-starter) | 2.11 | Compression and decompress streams using java.util.zip.ZipStream.
 |===
 // dataformats: END
@@ -1195,55 +1195,55 @@ Number of Camel languages: 17 in 11 JAR artifacts (0 deprecated)
 |===
 | Language | Since | Description
 
-| xref:3.4.x@components:languages/bean.adoc[Bean method] +
+| xref:3.4.x@components:languages:bean-language.adoc[Bean method] +
 (camel-bean-starter) | 1.3 | Call a method of the specified Java bean passing the Exchange, Body or specific headers to it.
 
-| xref:3.4.x@components:languages/constant.adoc[Constant] +
+| xref:3.4.x@components:languages:constant-language.adoc[Constant] +
 (camel-base) | 1.5 | To use a constant value in Camel expressions or predicates. Important: this is a fixed constant value that is only set once during starting up the route, do not use this if you want dynamic values during routing.
 
-| xref:3.4.x@components:languages/exchangeProperty.adoc[ExchangeProperty] +
+| xref:3.4.x@components:languages:exchangeProperty-language.adoc[ExchangeProperty] +
 (camel-base) | 2.0 | To use a Camel Exchange property in expressions or predicates.
 
-| xref:3.4.x@components:languages/file.adoc[File] +
+| xref:3.4.x@components:languages:file-language.adoc[File] +
 (camel-base) | 1.1 | For expressions and predicates using the file/simple language.
 
-| xref:3.4.x@components:languages/groovy.adoc[Groovy] +
+| xref:3.4.x@components:languages:groovy-language.adoc[Groovy] +
 (camel-groovy-starter) | 1.3 | Evaluate a Groovy script.
 
-| xref:3.4.x@components:languages/header.adoc[Header] +
+| xref:3.4.x@components:languages:header-language.adoc[Header] +
 (camel-base) | 1.5 | To use a Camel Message header in expressions or predicates.
 
-| xref:3.4.x@components:languages/hl7terser.adoc[HL7 Terser] +
+| xref:3.4.x@components:languages:hl7terser-language.adoc[HL7 Terser] +
 (camel-hl7-starter) | 2.11 | Get the value of an HL7 message field specified by terse location specification syntax.
 
-| xref:3.4.x@components:languages/jsonpath.adoc[JsonPath] +
+| xref:3.4.x@components:languages:jsonpath-language.adoc[JsonPath] +
 (camel-jsonpath-starter) | 2.13 | Evaluate a JsonPath expression against a JSON message body.
 
-| xref:3.4.x@components:languages/mvel.adoc[MVEL] +
+| xref:3.4.x@components:languages:mvel-language.adoc[MVEL] +
 (camel-mvel-starter) | 2.0 | Evaluate an MVEL template against the Camel Exchange.
 
-| xref:3.4.x@components:languages/ognl.adoc[OGNL] +
+| xref:3.4.x@components:languages:ognl-language.adoc[OGNL] +
 (camel-ognl-starter) | 1.1 | Evaluate an Apache Commons Object Graph Navigation Library (OGNL) expression against the Camel Exchange.
 
-| xref:3.4.x@components:languages/ref.adoc[Ref] +
+| xref:3.4.x@components:languages:ref-language.adoc[Ref] +
 (camel-base) | 2.8 | Reference to an existing Camel expression or predicate, which is looked up from the Camel registry.
 
-| xref:3.4.x@components:languages/simple.adoc[Simple] +
+| xref:3.4.x@components:languages:simple-language.adoc[Simple] +
 (camel-base) | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
 
-| xref:3.4.x@components:languages/spel.adoc[SpEL] +
+| xref:3.4.x@components:languages:spel-language.adoc[SpEL] +
 (camel-spring-starter) | 2.7 | Evaluate a Spring Expression Language (SpEL) expression against the Camel Exchange.
 
-| xref:3.4.x@components:languages/tokenize.adoc[Tokenize] +
+| xref:3.4.x@components:languages:tokenize-language.adoc[Tokenize] +
 (camel-base) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
 
-| xref:3.4.x@components:languages/xtokenize.adoc[XML Tokenize] +
+| xref:3.4.x@components:languages:xtokenize-language.adoc[XML Tokenize] +
 (camel-xml-jaxp-starter) | 2.14 | Tokenize XML payloads using the specified path expression.
 
-| xref:3.4.x@components:languages/xpath.adoc[XPath] +
+| xref:3.4.x@components:languages:xpath-language.adoc[XPath] +
 (camel-xpath-starter) | 1.1 | Evaluate an XPath expression against an XML payload.
 
-| xref:3.4.x@components:languages/xquery.adoc[XQuery] +
+| xref:3.4.x@components:languages:xquery-language.adoc[XQuery] +
 (camel-saxon-starter) | 1.0 | Evaluate an XQuery expressions against an XML payload.
 |===
 // languages: END
@@ -1258,82 +1258,82 @@ Number of miscellaneous extensions: 26 in 26 JAR artifacts (1 deprecated)
 |===
 | Extension | Since | Description
 
-| xref:3.4.x@components:others/aws-xray.adoc[AWS XRay] +
+| xref:3.4.x@components:others:aws-xray.adoc[AWS XRay] +
 (camel-aws-xray-starter) | 2.21 | Distributed tracing using AWS XRay
 
-| xref:3.4.x@components:others/cxf-transport.adoc[CXF Transport] +
+| xref:3.4.x@components:others:cxf-transport.adoc[CXF Transport] +
 (camel-cxf-transport-starter) | 2.8 | Camel Transport for Apache CXF
 
-| xref:3.4.x@components:others/etcd3.adoc[Etcd3] +
+| xref:3.4.x@components:others:etcd3.adoc[Etcd3] +
 (camel-etcd3-starter) | 3.5 | Aggregation repository using EtcD as datastore
 
-| xref:3.4.x@components:others/hystrix.adoc[Hystrix] +
+| xref:3.4.x@components:others:hystrix.adoc[Hystrix] +
 (camel-hystrix-starter) | 2.18 | *deprecated* Circuit Breaker EIP using Netflix Hystrix
 
-| xref:3.4.x@components:others/jasypt.adoc[Jasypt] +
+| xref:3.4.x@components:others:jasypt.adoc[Jasypt] +
 (camel-jasypt-starter) | 2.5 | Security using Jasypt
 
-| xref:3.4.x@components:others/leveldb.adoc[LevelDB] +
+| xref:3.4.x@components:others:leveldb.adoc[LevelDB] +
 (camel-leveldb-starter) | 2.10 | Using LevelDB as persistent EIP store
 
-| xref:3.4.x@components:others/leveldb-legacy.adoc[LevelDB-legacy] +
+| xref:3.4.x@components:others:leveldb-legacy.adoc[LevelDB-legacy] +
 (camel-leveldb-legacy-starter) | 2.10 | Using LevelDB as persistent EIP store
 
-| xref:3.4.x@components:others/lra.adoc[LRA] +
+| xref:3.4.x@components:others:lra.adoc[LRA] +
 (camel-lra-starter) | 2.21 | Camel saga binding for Long-Running-Action framework
 
-| xref:3.4.x@components:others/openapi-java.adoc[Openapi Java] +
+| xref:3.4.x@components:others:openapi-java.adoc[Openapi Java] +
 (camel-openapi-java-starter) | 3.1 | Rest-dsl support for using openapi doc
 
-| xref:3.4.x@components:others/opentelemetry.adoc[OpenTelemetry] +
+| xref:3.4.x@components:others:opentelemetry.adoc[OpenTelemetry] +
 (camel-opentelemetry-starter) | 3.5 | Distributed tracing using OpenTelemetry
 
-| xref:3.4.x@components:others/opentracing.adoc[OpenTracing] +
+| xref:3.4.x@components:others:opentracing.adoc[OpenTracing] +
 (camel-opentracing-starter) | 2.19 | Distributed tracing using OpenTracing
 
-| xref:3.4.x@components:others/reactive-executor-vertx.adoc[Reactive Executor Vert.x] +
+| xref:3.4.x@components:others:reactive-executor-vertx.adoc[Reactive Executor Vert.x] +
 (camel-reactive-executor-vertx-starter) | 3.0 | Reactive Executor for camel-core using Vert.x
 
-| xref:3.4.x@components:others/reactor.adoc[Reactor] +
+| xref:3.4.x@components:others:reactor.adoc[Reactor] +
 (camel-reactor-starter) | 2.20 | Reactor based back-end for Camel's reactive streams component
 
-| xref:3.4.x@components:others/resilience4j.adoc[Resilience4j] +
+| xref:3.4.x@components:others:resilience4j.adoc[Resilience4j] +
 (camel-resilience4j-starter) | 3.0 | Circuit Breaker EIP using Resilience4j
 
-| xref:3.4.x@components:others/ribbon.adoc[Ribbon] +
+| xref:3.4.x@components:others:ribbon.adoc[Ribbon] +
 (camel-ribbon-starter) | 2.18 | Using Netflix Ribbon for client side load balancing
 
-| xref:3.4.x@components:others/rxjava.adoc[RxJava] +
+| xref:3.4.x@components:others:rxjava.adoc[RxJava] +
 (camel-rxjava-starter) | 2.22 | RxJava based back-end for Camel's reactive streams component
 
-| xref:3.4.x@components:others/shiro.adoc[Shiro] +
+| xref:3.4.x@components:others:shiro.adoc[Shiro] +
 (camel-shiro-starter) | 2.5 | Security using Shiro
 
-| xref:3.4.x@components:others/spring-cloud.adoc[Spring Cloud] +
+| xref:3.4.x@components:others:spring-cloud.adoc[Spring Cloud] +
 (camel-spring-cloud-starter) | 2.19 | Camel Cloud integration with Spring Cloud
 
-| xref:3.4.x@components:others/spring-cloud-consul.adoc[Spring Cloud Consul] +
+| xref:3.4.x@components:others:spring-cloud-consul.adoc[Spring Cloud Consul] +
 (camel-spring-cloud-consul-starter) | 2.19 | Camel Cloud integration with Spring Cloud Consul
 
-| xref:3.4.x@components:others/spring-cloud-netflix.adoc[Spring Cloud Netflix] +
+| xref:3.4.x@components:others:spring-cloud-netflix.adoc[Spring Cloud Netflix] +
 (camel-spring-cloud-netflix-starter) | 2.19 | Camel Cloud integration with Spring Cloud Netflix
 
-| xref:3.4.x@components:others/spring-cloud-zookeeper.adoc[Spring Cloud Zookeeper] +
+| xref:3.4.x@components:others:spring-cloud-zookeeper.adoc[Spring Cloud Zookeeper] +
 (camel-spring-cloud-zookeeper-starter) | 2.19 | Camel Cloud integration with Spring Cloud Zookeeper
 
-| xref:3.4.x@components:others/spring-javaconfig.adoc[Spring Java Configuration] +
+| xref:3.4.x@components:others:spring-javaconfig.adoc[Spring Java Configuration] +
 (camel-spring-javaconfig-starter) | 2.0 | Using Camel with Spring Java Configuration
 
-| xref:3.4.x@components:others/spring-security.adoc[Spring Security] +
+| xref:3.4.x@components:others:spring-security.adoc[Spring Security] +
 (camel-spring-security-starter) | 2.3 | Security using Spring Security
 
-| xref:3.4.x@components:others/swagger-java.adoc[Swagger Java] +
+| xref:3.4.x@components:others:swagger-java.adoc[Swagger Java] +
 (camel-swagger-java-starter) | 2.16 | Rest-dsl support for using swagger api-doc
 
-| xref:3.4.x@components:others/undertow-spring-security.adoc[Undertow Spring Security] +
+| xref:3.4.x@components:others:undertow-spring-security.adoc[Undertow Spring Security] +
 (camel-undertow-spring-security-starter) | 3.3 | Spring Security Provider for camel-undertow
 
-| xref:3.4.x@components:others/zipkin.adoc[Zipkin] +
+| xref:3.4.x@components:others:zipkin.adoc[Zipkin] +
 (camel-zipkin-starter) | 2.18 | Distributed message tracing using Zipkin
 |===
 // others: END
diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc
index becc654..22d5432 100644
--- a/docs/modules/ROOT/pages/list.adoc
+++ b/docs/modules/ROOT/pages/list.adoc
@@ -1046,142 +1046,142 @@ Number of Camel data formats: 46 in 38 JAR artifacts (0 deprecated)
 |===
 | Data Format | Since | Description
 
-| xref:3.4.x@components:dataformats/any23.adoc[Any23] +
+| xref:3.4.x@components:dataformats:any23-dataformat.adoc[Any23] +
 (camel-any23-starter) | 3.0 | Extract RDF data from HTML documents.
 
-| xref:3.4.x@components:dataformats/asn1.adoc[ASN.1 File] +
+| xref:3.4.x@components:dataformats:asn1-dataformat.adoc[ASN.1 File] +
 (camel-asn1-starter) | 2.20 | Encode and decode data structures using Abstract Syntax Notation One (ASN.1).
 
-| xref:3.4.x@components:dataformats/avro.adoc[Avro] +
+| xref:3.4.x@components:dataformats:avro-dataformat.adoc[Avro] +
 (camel-avro-starter) | 2.14 | Serialize and deserialize messages using Apache Avro binary data format.
 
-| xref:3.4.x@components:dataformats/barcode.adoc[Barcode] +
+| xref:3.4.x@components:dataformats:barcode-dataformat.adoc[Barcode] +
 (camel-barcode-starter) | 2.14 | Transform strings to various 1D/2D barcode bitmap formats and back.
 
-| xref:3.4.x@components:dataformats/base64.adoc[Base64] +
+| xref:3.4.x@components:dataformats:base64-dataformat.adoc[Base64] +
 (camel-base64-starter) | 2.11 | Encode and decode data using Base64.
 
-| xref:3.4.x@components:dataformats/beanio.adoc[BeanIO] +
+| xref:3.4.x@components:dataformats:beanio-dataformat.adoc[BeanIO] +
 (camel-beanio-starter) | 2.10 | Marshal and unmarshal Java beans to and from flat files (such as CSV, delimited, or fixed length formats).
 
-| xref:3.4.x@components:dataformats/bindy.adoc[Bindy CSV] +
+| xref:3.4.x@components:dataformats:bindy-dataformat.adoc[Bindy CSV] +
 (camel-bindy-starter) | 2.0 | Marshal and unmarshal Java beans from and to flat payloads (such as CSV, delimited, fixed length formats, or FIX messages).
 
-| xref:3.4.x@components:dataformats/bindy.adoc[Bindy Fixed Length] +
+| xref:3.4.x@components:dataformats:bindy-dataformat.adoc[Bindy Fixed Length] +
 (camel-bindy-starter) | 2.0 | Marshal and unmarshal Java beans from and to flat payloads (such as CSV, delimited, fixed length formats, or FIX messages).
 
-| xref:3.4.x@components:dataformats/bindy.adoc[Bindy Key Value Pair] +
+| xref:3.4.x@components:dataformats:bindy-dataformat.adoc[Bindy Key Value Pair] +
 (camel-bindy-starter) | 2.0 | Marshal and unmarshal Java beans from and to flat payloads (such as CSV, delimited, fixed length formats, or FIX messages).
 
-| xref:3.4.x@components:dataformats/cbor.adoc[CBOR] +
+| xref:3.4.x@components:dataformats:cbor-dataformat.adoc[CBOR] +
 (camel-cbor-starter) | 3.0 | Unmarshal a CBOR payload to POJO and back.
 
-| xref:3.4.x@components:dataformats/crypto.adoc[Crypto (Java Cryptographic Extension)] +
+| xref:3.4.x@components:dataformats:crypto-dataformat.adoc[Crypto (Java Cryptographic Extension)] +
 (camel-crypto-starter) | 2.3 | Encrypt and decrypt messages using Java Cryptography Extension (JCE).
 
-| xref:3.4.x@components:dataformats/csv.adoc[CSV] +
+| xref:3.4.x@components:dataformats:csv-dataformat.adoc[CSV] +
 (camel-csv-starter) | 1.3 | Handle CSV (Comma Separated Values) payloads.
 
-| xref:3.4.x@components:dataformats/fhirJson.adoc[FHIR JSon] +
+| xref:3.4.x@components:dataformats:fhirJson-dataformat.adoc[FHIR JSon] +
 (camel-fhir-starter) | 2.21 | Marshall and unmarshall FHIR objects to/from JSON.
 
-| xref:3.4.x@components:dataformats/fhirXml.adoc[FHIR XML] +
+| xref:3.4.x@components:dataformats:fhirXml-dataformat.adoc[FHIR XML] +
 (camel-fhir-starter) | 2.21 | Marshall and unmarshall FHIR objects to/from XML.
 
-| xref:3.4.x@components:dataformats/flatpack.adoc[Flatpack] +
+| xref:3.4.x@components:dataformats:flatpack-dataformat.adoc[Flatpack] +
 (camel-flatpack-starter) | 2.1 | Marshal and unmarshal Java lists and maps to/from flat files (such as CSV, delimited, or fixed length formats) using Flatpack library.
 
-| xref:3.4.x@components:dataformats/grok.adoc[Grok] +
+| xref:3.4.x@components:dataformats:grok-dataformat.adoc[Grok] +
 (camel-grok-starter) | 3.0 | Unmarshal unstructured data to objects using Logstash based Grok patterns.
 
-| xref:3.4.x@components:dataformats/gzipdeflater.adoc[GZip Deflater] +
+| xref:3.4.x@components:dataformats:gzipdeflater-dataformat.adoc[GZip Deflater] +
 (camel-zip-deflater-starter) | 2.0 | Compress and decompress messages using java.util.zip.GZIPStream.
 
-| xref:3.4.x@components:dataformats/hl7.adoc[HL7] +
+| xref:3.4.x@components:dataformats:hl7-dataformat.adoc[HL7] +
 (camel-hl7-starter) | 2.0 | Marshal and unmarshal HL7 (Health Care) model objects using the HL7 MLLP codec.
 
-| xref:3.4.x@components:dataformats/ical.adoc[iCal] +
+| xref:3.4.x@components:dataformats:ical-dataformat.adoc[iCal] +
 (camel-ical-starter) | 2.12 | Marshal and unmarshal iCal (.ics) documents to/from model objects provided by the iCal4j library.
 
-| xref:3.4.x@components:dataformats/jacksonxml.adoc[JacksonXML] +
+| xref:3.4.x@components:dataformats:jacksonxml-dataformat.adoc[JacksonXML] +
 (camel-jacksonxml-starter) | 2.16 | Unmarshal a XML payloads to POJOs and back using XMLMapper extension of Jackson.
 
-| xref:3.4.x@components:dataformats/jaxb.adoc[JAXB] +
+| xref:3.4.x@components:dataformats:jaxb-dataformat.adoc[JAXB] +
 (camel-jaxb-starter) | 1.0 | Unmarshal XML payloads to POJOs and back using JAXB2 XML marshalling standard.
 
-| xref:3.4.x@components:dataformats/json-fastjson.adoc[JSON Fastjson] +
+| xref:3.4.x@components:dataformats:json-fastjson-dataformat.adoc[JSON Fastjson] +
 (camel-fastjson-starter) | 2.20 | Marshal POJOs to JSON and back.
 
-| xref:3.4.x@components:dataformats/json-gson.adoc[JSON Gson] +
+| xref:3.4.x@components:dataformats:json-gson-dataformat.adoc[JSON Gson] +
 (camel-gson-starter) | 2.10 | Marshal POJOs to JSON and back.
 
-| xref:3.4.x@components:dataformats/json-jackson.adoc[JSON Jackson] +
+| xref:3.4.x@components:dataformats:json-jackson-dataformat.adoc[JSON Jackson] +
 (camel-jackson-starter) | 2.0 | Marshal POJOs to JSON and back.
 
-| xref:3.4.x@components:dataformats/json-johnzon.adoc[JSON Johnzon] +
+| xref:3.4.x@components:dataformats:json-johnzon-dataformat.adoc[JSON Johnzon] +
 (camel-johnzon-starter) | 2.18 | Marshal POJOs to JSON and back.
 
-| xref:3.4.x@components:dataformats/json-jsonb.adoc[JSON JSON-B] +
+| xref:3.4.x@components:dataformats:json-jsonb-dataformat.adoc[JSON JSON-B] +
 (camel-jsonb-starter) | 3.7 | Marshal POJOs to JSON and back using JSON-B.
 
-| xref:3.4.x@components:dataformats/json-xstream.adoc[JSON XStream] +
+| xref:3.4.x@components:dataformats:json-xstream-dataformat.adoc[JSON XStream] +
 (camel-xstream-starter) | 2.0 | Marshal POJOs to JSON and back.
 
-| xref:3.4.x@components:dataformats/jsonApi.adoc[JSonApi] +
+| xref:3.4.x@components:dataformats:jsonApi-dataformat.adoc[JSonApi] +
 (camel-jsonapi-starter) | 3.0 | Marshal and unmarshal JSON:API resources using JSONAPI-Converter library.
 
-| xref:3.4.x@components:dataformats/lzf.adoc[LZF Deflate Compression] +
+| xref:3.4.x@components:dataformats:lzf-dataformat.adoc[LZF Deflate Compression] +
 (camel-lzf-starter) | 2.17 | Compress and decompress streams using LZF deflate algorithm.
 
-| xref:3.4.x@components:dataformats/mime-multipart.adoc[MIME Multipart] +
+| xref:3.4.x@components:dataformats:mime-multipart-dataformat.adoc[MIME Multipart] +
 (camel-mail-starter) | 2.17 | Marshal Camel messages with attachments into MIME-Multipart messages and back.
 
-| xref:3.4.x@components:dataformats/pgp.adoc[PGP] +
+| xref:3.4.x@components:dataformats:pgp-dataformat.adoc[PGP] +
 (camel-crypto-starter) | 2.9 | Encrypt and decrypt messages using Java Cryptographic Extension (JCE) and PGP.
 
-| xref:3.4.x@components:dataformats/protobuf.adoc[Protobuf] +
+| xref:3.4.x@components:dataformats:protobuf-dataformat.adoc[Protobuf] +
 (camel-protobuf-starter) | 2.2 | Serialize and deserialize Java objects using Google's Protocol buffers.
 
-| xref:3.4.x@components:dataformats/rss.adoc[RSS] +
+| xref:3.4.x@components:dataformats:rss-dataformat.adoc[RSS] +
 (camel-rss-starter) | 2.1 | Transform from ROME SyndFeed Java Objects to XML and vice-versa.
 
-| xref:3.4.x@components:dataformats/soapjaxb.adoc[SOAP] +
+| xref:3.4.x@components:dataformats:soapjaxb-dataformat.adoc[SOAP] +
 (camel-soap-starter) | 2.3 | Marshal Java objects to SOAP messages and back.
 
-| xref:3.4.x@components:dataformats/syslog.adoc[Syslog] +
+| xref:3.4.x@components:dataformats:syslog-dataformat.adoc[Syslog] +
 (camel-syslog-starter) | 2.6 | Marshall SyslogMessages to RFC3164 and RFC5424 messages and back.
 
-| xref:3.4.x@components:dataformats/tarfile.adoc[Tar File] +
+| xref:3.4.x@components:dataformats:tarfile-dataformat.adoc[Tar File] +
 (camel-tarfile-starter) | 2.16 | Archive files into tarballs or extract files from tarballs.
 
-| xref:3.4.x@components:dataformats/thrift.adoc[Thrift] +
+| xref:3.4.x@components:dataformats:thrift-dataformat.adoc[Thrift] +
 (camel-thrift-starter) | 2.20 | Serialize and deserialize messages using Apache Thrift binary data format.
 
-| xref:3.4.x@components:dataformats/tidyMarkup.adoc[TidyMarkup] +
+| xref:3.4.x@components:dataformats:tidyMarkup-dataformat.adoc[TidyMarkup] +
 (camel-tagsoup-starter) | 2.0 | Parse (potentially invalid) HTML into valid HTML or DOM.
 
-| xref:3.4.x@components:dataformats/univocity-csv.adoc[uniVocity CSV] +
+| xref:3.4.x@components:dataformats:univocity-csv-dataformat.adoc[uniVocity CSV] +
 (camel-univocity-parsers-starter) | 2.15 | Marshal and unmarshal Java objects from and to CSV (Comma Separated Values) using UniVocity Parsers.
 
-| xref:3.4.x@components:dataformats/univocity-fixed.adoc[uniVocity Fixed Length] +
+| xref:3.4.x@components:dataformats:univocity-fixed-dataformat.adoc[uniVocity Fixed Length] +
 (camel-univocity-parsers-starter) | 2.15 | Marshal and unmarshal Java objects from and to fixed length records using UniVocity Parsers.
 
-| xref:3.4.x@components:dataformats/univocity-tsv.adoc[uniVocity TSV] +
+| xref:3.4.x@components:dataformats:univocity-tsv-dataformat.adoc[uniVocity TSV] +
 (camel-univocity-parsers-starter) | 2.15 | Marshal and unmarshal Java objects from and to TSV (Tab-Separated Values) records using UniVocity Parsers.
 
-| xref:3.4.x@components:dataformats/secureXML.adoc[XML Security] +
+| xref:3.4.x@components:dataformats:secureXML-dataformat.adoc[XML Security] +
 (camel-xmlsecurity-starter) | 2.0 | Encrypt and decrypt XML payloads using Apache Santuario.
 
-| xref:3.4.x@components:dataformats/xstream.adoc[XStream] +
+| xref:3.4.x@components:dataformats:xstream-dataformat.adoc[XStream] +
 (camel-xstream-starter) | 1.3 | Marshal and unmarshal POJOs to/from XML using XStream library.
 
-| xref:3.4.x@components:dataformats/yaml-snakeyaml.adoc[YAML SnakeYAML] +
+| xref:3.4.x@components:dataformats:yaml-snakeyaml-dataformat.adoc[YAML SnakeYAML] +
 (camel-snakeyaml-starter) | 2.17 | Marshal and unmarshal Java objects to and from YAML.
 
-| xref:3.4.x@components:dataformats/zipdeflater.adoc[Zip Deflate Compression] +
+| xref:3.4.x@components:dataformats:zipdeflater-dataformat.adoc[Zip Deflate Compression] +
 (camel-zip-deflater-starter) | 2.12 | Compress and decompress streams using java.util.zip.Deflater and java.util.zip.Inflater.
 
-| xref:3.4.x@components:dataformats/zipfile.adoc[Zip File] +
+| xref:3.4.x@components:dataformats:zipfile-dataformat.adoc[Zip File] +
 (camel-zipfile-starter) | 2.11 | Compression and decompress streams using java.util.zip.ZipStream.
 |===
 // dataformats: END
@@ -1195,55 +1195,55 @@ Number of Camel languages: 17 in 11 JAR artifacts (0 deprecated)
 |===
 | Language | Since | Description
 
-| xref:3.4.x@components:languages/bean.adoc[Bean method] +
+| xref:3.4.x@components:languages:bean-language.adoc[Bean method] +
 (camel-bean-starter) | 1.3 | Call a method of the specified Java bean passing the Exchange, Body or specific headers to it.
 
-| xref:3.4.x@components:languages/constant.adoc[Constant] +
+| xref:3.4.x@components:languages:constant-language.adoc[Constant] +
 (camel-base) | 1.5 | To use a constant value in Camel expressions or predicates. Important: this is a fixed constant value that is only set once during starting up the route, do not use this if you want dynamic values during routing.
 
-| xref:3.4.x@components:languages/exchangeProperty.adoc[ExchangeProperty] +
+| xref:3.4.x@components:languages:exchangeProperty-language.adoc[ExchangeProperty] +
 (camel-base) | 2.0 | To use a Camel Exchange property in expressions or predicates.
 
-| xref:3.4.x@components:languages/file.adoc[File] +
+| xref:3.4.x@components:languages:file-language.adoc[File] +
 (camel-base) | 1.1 | For expressions and predicates using the file/simple language.
 
-| xref:3.4.x@components:languages/groovy.adoc[Groovy] +
+| xref:3.4.x@components:languages:groovy-language.adoc[Groovy] +
 (camel-groovy-starter) | 1.3 | Evaluate a Groovy script.
 
-| xref:3.4.x@components:languages/header.adoc[Header] +
+| xref:3.4.x@components:languages:header-language.adoc[Header] +
 (camel-base) | 1.5 | To use a Camel Message header in expressions or predicates.
 
-| xref:3.4.x@components:languages/hl7terser.adoc[HL7 Terser] +
+| xref:3.4.x@components:languages:hl7terser-language.adoc[HL7 Terser] +
 (camel-hl7-starter) | 2.11 | Get the value of an HL7 message field specified by terse location specification syntax.
 
-| xref:3.4.x@components:languages/jsonpath.adoc[JsonPath] +
+| xref:3.4.x@components:languages:jsonpath-language.adoc[JsonPath] +
 (camel-jsonpath-starter) | 2.13 | Evaluate a JsonPath expression against a JSON message body.
 
-| xref:3.4.x@components:languages/mvel.adoc[MVEL] +
+| xref:3.4.x@components:languages:mvel-language.adoc[MVEL] +
 (camel-mvel-starter) | 2.0 | Evaluate an MVEL template against the Camel Exchange.
 
-| xref:3.4.x@components:languages/ognl.adoc[OGNL] +
+| xref:3.4.x@components:languages:ognl-language.adoc[OGNL] +
 (camel-ognl-starter) | 1.1 | Evaluate an Apache Commons Object Graph Navigation Library (OGNL) expression against the Camel Exchange.
 
-| xref:3.4.x@components:languages/ref.adoc[Ref] +
+| xref:3.4.x@components:languages:ref-language.adoc[Ref] +
 (camel-base) | 2.8 | Reference to an existing Camel expression or predicate, which is looked up from the Camel registry.
 
-| xref:3.4.x@components:languages/simple.adoc[Simple] +
+| xref:3.4.x@components:languages:simple-language.adoc[Simple] +
 (camel-base) | 1.1 | To use Camels built-in Simple language in Camel expressions or predicates.
 
-| xref:3.4.x@components:languages/spel.adoc[SpEL] +
+| xref:3.4.x@components:languages:spel-language.adoc[SpEL] +
 (camel-spring-starter) | 2.7 | Evaluate a Spring Expression Language (SpEL) expression against the Camel Exchange.
 
-| xref:3.4.x@components:languages/tokenize.adoc[Tokenize] +
+| xref:3.4.x@components:languages:tokenize-language.adoc[Tokenize] +
 (camel-base) | 2.0 | To use Camel message body or header with a tokenizer in Camel expressions or predicates.
 
-| xref:3.4.x@components:languages/xtokenize.adoc[XML Tokenize] +
+| xref:3.4.x@components:languages:xtokenize-language.adoc[XML Tokenize] +
 (camel-xml-jaxp-starter) | 2.14 | Tokenize XML payloads using the specified path expression.
 
-| xref:3.4.x@components:languages/xpath.adoc[XPath] +
+| xref:3.4.x@components:languages:xpath-language.adoc[XPath] +
 (camel-xpath-starter) | 1.1 | Evaluate an XPath expression against an XML payload.
 
-| xref:3.4.x@components:languages/xquery.adoc[XQuery] +
+| xref:3.4.x@components:languages:xquery-language.adoc[XQuery] +
 (camel-saxon-starter) | 1.0 | Evaluate an XQuery expressions against an XML payload.
 |===
 // languages: END
@@ -1258,82 +1258,82 @@ Number of miscellaneous extensions: 26 in 26 JAR artifacts (1 deprecated)
 |===
 | Extension | Since | Description
 
-| xref:3.4.x@components:others/aws-xray.adoc[AWS XRay] +
+| xref:3.4.x@components:others:aws-xray.adoc[AWS XRay] +
 (camel-aws-xray-starter) | 2.21 | Distributed tracing using AWS XRay
 
-| xref:3.4.x@components:others/cxf-transport.adoc[CXF Transport] +
+| xref:3.4.x@components:others:cxf-transport.adoc[CXF Transport] +
 (camel-cxf-transport-starter) | 2.8 | Camel Transport for Apache CXF
 
-| xref:3.4.x@components:others/etcd3.adoc[Etcd3] +
+| xref:3.4.x@components:others:etcd3.adoc[Etcd3] +
 (camel-etcd3-starter) | 3.5 | Aggregation repository using EtcD as datastore
 
-| xref:3.4.x@components:others/hystrix.adoc[Hystrix] +
+| xref:3.4.x@components:others:hystrix.adoc[Hystrix] +
 (camel-hystrix-starter) | 2.18 | *deprecated* Circuit Breaker EIP using Netflix Hystrix
 
-| xref:3.4.x@components:others/jasypt.adoc[Jasypt] +
+| xref:3.4.x@components:others:jasypt.adoc[Jasypt] +
 (camel-jasypt-starter) | 2.5 | Security using Jasypt
 
-| xref:3.4.x@components:others/leveldb.adoc[LevelDB] +
+| xref:3.4.x@components:others:leveldb.adoc[LevelDB] +
 (camel-leveldb-starter) | 2.10 | Using LevelDB as persistent EIP store
 
-| xref:3.4.x@components:others/leveldb-legacy.adoc[LevelDB-legacy] +
+| xref:3.4.x@components:others:leveldb-legacy.adoc[LevelDB-legacy] +
 (camel-leveldb-legacy-starter) | 2.10 | Using LevelDB as persistent EIP store
 
-| xref:3.4.x@components:others/lra.adoc[LRA] +
+| xref:3.4.x@components:others:lra.adoc[LRA] +
 (camel-lra-starter) | 2.21 | Camel saga binding for Long-Running-Action framework
 
-| xref:3.4.x@components:others/openapi-java.adoc[Openapi Java] +
+| xref:3.4.x@components:others:openapi-java.adoc[Openapi Java] +
 (camel-openapi-java-starter) | 3.1 | Rest-dsl support for using openapi doc
 
-| xref:3.4.x@components:others/opentelemetry.adoc[OpenTelemetry] +
+| xref:3.4.x@components:others:opentelemetry.adoc[OpenTelemetry] +
 (camel-opentelemetry-starter) | 3.5 | Distributed tracing using OpenTelemetry
 
-| xref:3.4.x@components:others/opentracing.adoc[OpenTracing] +
+| xref:3.4.x@components:others:opentracing.adoc[OpenTracing] +
 (camel-opentracing-starter) | 2.19 | Distributed tracing using OpenTracing
 
-| xref:3.4.x@components:others/reactive-executor-vertx.adoc[Reactive Executor Vert.x] +
+| xref:3.4.x@components:others:reactive-executor-vertx.adoc[Reactive Executor Vert.x] +
 (camel-reactive-executor-vertx-starter) | 3.0 | Reactive Executor for camel-core using Vert.x
 
-| xref:3.4.x@components:others/reactor.adoc[Reactor] +
+| xref:3.4.x@components:others:reactor.adoc[Reactor] +
 (camel-reactor-starter) | 2.20 | Reactor based back-end for Camel's reactive streams component
 
-| xref:3.4.x@components:others/resilience4j.adoc[Resilience4j] +
+| xref:3.4.x@components:others:resilience4j.adoc[Resilience4j] +
 (camel-resilience4j-starter) | 3.0 | Circuit Breaker EIP using Resilience4j
 
-| xref:3.4.x@components:others/ribbon.adoc[Ribbon] +
+| xref:3.4.x@components:others:ribbon.adoc[Ribbon] +
 (camel-ribbon-starter) | 2.18 | Using Netflix Ribbon for client side load balancing
 
-| xref:3.4.x@components:others/rxjava.adoc[RxJava] +
+| xref:3.4.x@components:others:rxjava.adoc[RxJava] +
 (camel-rxjava-starter) | 2.22 | RxJava based back-end for Camel's reactive streams component
 
-| xref:3.4.x@components:others/shiro.adoc[Shiro] +
+| xref:3.4.x@components:others:shiro.adoc[Shiro] +
 (camel-shiro-starter) | 2.5 | Security using Shiro
 
-| xref:3.4.x@components:others/spring-cloud.adoc[Spring Cloud] +
+| xref:3.4.x@components:others:spring-cloud.adoc[Spring Cloud] +
 (camel-spring-cloud-starter) | 2.19 | Camel Cloud integration with Spring Cloud
 
-| xref:3.4.x@components:others/spring-cloud-consul.adoc[Spring Cloud Consul] +
+| xref:3.4.x@components:others:spring-cloud-consul.adoc[Spring Cloud Consul] +
 (camel-spring-cloud-consul-starter) | 2.19 | Camel Cloud integration with Spring Cloud Consul
 
-| xref:3.4.x@components:others/spring-cloud-netflix.adoc[Spring Cloud Netflix] +
+| xref:3.4.x@components:others:spring-cloud-netflix.adoc[Spring Cloud Netflix] +
 (camel-spring-cloud-netflix-starter) | 2.19 | Camel Cloud integration with Spring Cloud Netflix
 
-| xref:3.4.x@components:others/spring-cloud-zookeeper.adoc[Spring Cloud Zookeeper] +
+| xref:3.4.x@components:others:spring-cloud-zookeeper.adoc[Spring Cloud Zookeeper] +
 (camel-spring-cloud-zookeeper-starter) | 2.19 | Camel Cloud integration with Spring Cloud Zookeeper
 
-| xref:3.4.x@components:others/spring-javaconfig.adoc[Spring Java Configuration] +
+| xref:3.4.x@components:others:spring-javaconfig.adoc[Spring Java Configuration] +
 (camel-spring-javaconfig-starter) | 2.0 | Using Camel with Spring Java Configuration
 
-| xref:3.4.x@components:others/spring-security.adoc[Spring Security] +
+| xref:3.4.x@components:others:spring-security.adoc[Spring Security] +
 (camel-spring-security-starter) | 2.3 | Security using Spring Security
 
-| xref:3.4.x@components:others/swagger-java.adoc[Swagger Java] +
+| xref:3.4.x@components:others:swagger-java.adoc[Swagger Java] +
 (camel-swagger-java-starter) | 2.16 | Rest-dsl support for using swagger api-doc
 
-| xref:3.4.x@components:others/undertow-spring-security.adoc[Undertow Spring Security] +
+| xref:3.4.x@components:others:undertow-spring-security.adoc[Undertow Spring Security] +
 (camel-undertow-spring-security-starter) | 3.3 | Spring Security Provider for camel-undertow
 
-| xref:3.4.x@components:others/zipkin.adoc[Zipkin] +
+| xref:3.4.x@components:others:zipkin.adoc[Zipkin] +
 (camel-zipkin-starter) | 2.18 | Distributed message tracing using Zipkin
 |===
 // others: END
diff --git a/docs/modules/ROOT/pages/spring-boot.adoc b/docs/modules/ROOT/pages/spring-boot.adoc
index 2b7aa95..4522c6c 100644
--- a/docs/modules/ROOT/pages/spring-boot.adoc
+++ b/docs/modules/ROOT/pages/spring-boot.adoc
@@ -92,7 +92,7 @@ When using spring-boot with Spring Boot make sure to use the following Maven dep
 ----
 
 
-The component supports 148 options, which are listed below.
+The component supports 152 options, which are listed below.
 
 
 
@@ -247,6 +247,10 @@ The component supports 148 options, which are listed below.
 | *camel.threadpool.pool-size* | Sets the default core pool size (threads to keep minimum in pool) |  | Integer
 | *camel.threadpool.rejected-policy* | Sets the default handler for tasks which cannot be executed by the thread pool. |  | ThreadPoolRejectedPolicy
 | *camel.threadpool.time-unit* | Sets the default time unit used for keep alive time |  | TimeUnit
+| *management.endpoint.camelroutecontroller.enabled* | To turn on or off information about Camel Route Controller via actuator endpoint. | true | Boolean
+| *management.endpoint.camelroutes.enabled* | To turn on or off information about Camel Routes via actuator endpoint. | true | Boolean
+| *management.endpoint.camelroutes.read-only* | Whether Camel Routes actuator is in read-only mode. If not in read-only mode then operations to start/stop routes would be enabled. | true | Boolean
+| *management.info.camel.enabled* | Whether to enable Camel info. | true | Boolean
 |===
 // spring-boot-auto-configure options: END
 
diff --git a/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java b/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java
index 64044e9..d5de97b 100644
--- a/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java
+++ b/tooling/camel-spring-boot-docs-maven-plugin/src/main/java/org/apache/camel/springboot/maven/ExtMvelHelper.java
@@ -48,11 +48,11 @@ public class ExtMvelHelper {
         } else if (model instanceof ComponentModel) {
             return String.format("xref:3.4.x@components::%s-component.adoc", invokeGetter(model, "getScheme"));
         } else if (model instanceof DataFormatModel) {
-            return String.format("xref:3.4.x@components:dataformats/%s.adoc", invokeGetter(model, "getName"));
+            return String.format("xref:3.4.x@components:dataformats:%s-dataformat.adoc", invokeGetter(model, "getName"));
         } else if (model instanceof LanguageModel) {
-            return String.format("xref:3.4.x@components:languages/%s.adoc", invokeGetter(model, "getName"));
+            return String.format("xref:3.4.x@components:languages:%s-language.adoc", invokeGetter(model, "getName"));
         } else if (model instanceof OtherModel) {
-            return String.format("xref:3.4.x@components:others/%s.adoc", invokeGetter(model, "getName"));
+            return String.format("xref:3.4.x@components:others:%s.adoc", invokeGetter(model, "getName"));
         } else {
             return null;
         }