You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/12/14 15:39:01 UTC
[camel] branch camel-3.7.x updated: CAMEL-15946: Fix javadoc build
error about & sign
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch camel-3.7.x
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/camel-3.7.x by this push:
new dccad63 CAMEL-15946: Fix javadoc build error about & sign
dccad63 is described below
commit dccad6324bb218b8fc94f5383b39546307cdd6dd
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon Dec 14 16:37:40 2020 +0100
CAMEL-15946: Fix javadoc build error about & sign
---
.../org/apache/camel/catalog/docs/dataset-component.adoc | 2 +-
.../org/apache/camel/catalog/docs/jclouds-component.adoc | 2 +-
.../resources/org/apache/camel/component/dataset/dataset.json | 2 +-
components/camel-dataset/src/main/docs/dataset-component.adoc | 2 +-
.../java/org/apache/camel/component/dataset/DataSetEndpoint.java | 2 +-
.../resources/org/apache/camel/component/jclouds/jclouds.json | 2 +-
components/camel-jclouds/src/main/docs/jclouds-component.adoc | 2 +-
.../java/org/apache/camel/component/jclouds/JcloudsEndpoint.java | 2 +-
.../apache/camel/builder/component/ComponentsBuilderFactory.java | 4 ++--
.../builder/component/dsl/DatasetComponentBuilderFactory.java | 4 ++--
.../builder/component/dsl/JcloudsComponentBuilderFactory.java | 4 ++--
core/camel-componentdsl/src/generated/resources/metadata.json | 4 ++--
.../org/apache/camel/builder/endpoint/StaticEndpointBuilders.java | 8 ++++----
.../camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java | 6 +++---
.../camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java | 6 +++---
docs/components/modules/ROOT/pages/dataset-component.adoc | 2 +-
docs/components/modules/ROOT/pages/jclouds-component.adoc | 2 +-
17 files changed, 28 insertions(+), 28 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/dataset-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/dataset-component.adoc
index ecf3954..35fc7e0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/dataset-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/dataset-component.adoc
@@ -2,7 +2,7 @@
= Dataset Component
:docTitle: Dataset
:artifactId: camel-dataset
-:description: Provide data for load & soak testing of your Camel application.
+:description: Provide data for load and soak testing of your Camel application.
:since: 1.3
:supportLevel: Stable
:component-header: Both producer and consumer are supported
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jclouds-component.adoc b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jclouds-component.adoc
index d438db0..954b79c 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jclouds-component.adoc
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/jclouds-component.adoc
@@ -2,7 +2,7 @@
= JClouds Component
:docTitle: JClouds
:artifactId: camel-jclouds
-:description: Interact with jclouds compute & blobstore service.
+:description: Interact with jclouds compute and blobstore service.
:since: 2.9
:supportLevel: Stable
:component-header: Both producer and consumer are supported
diff --git a/components/camel-dataset/src/generated/resources/org/apache/camel/component/dataset/dataset.json b/components/camel-dataset/src/generated/resources/org/apache/camel/component/dataset/dataset.json
index 67f0446..abed52a 100644
--- a/components/camel-dataset/src/generated/resources/org/apache/camel/component/dataset/dataset.json
+++ b/components/camel-dataset/src/generated/resources/org/apache/camel/component/dataset/dataset.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "dataset",
"title": "Dataset",
- "description": "Provide data for load & soak testing of your Camel application.",
+ "description": "Provide data for load and soak testing of your Camel application.",
"deprecated": false,
"firstVersion": "1.3.0",
"label": "core,testing",
diff --git a/components/camel-dataset/src/main/docs/dataset-component.adoc b/components/camel-dataset/src/main/docs/dataset-component.adoc
index ecf3954..35fc7e0 100644
--- a/components/camel-dataset/src/main/docs/dataset-component.adoc
+++ b/components/camel-dataset/src/main/docs/dataset-component.adoc
@@ -2,7 +2,7 @@
= Dataset Component
:docTitle: Dataset
:artifactId: camel-dataset
-:description: Provide data for load & soak testing of your Camel application.
+:description: Provide data for load and soak testing of your Camel application.
:since: 1.3
:supportLevel: Stable
:component-header: Both producer and consumer are supported
diff --git a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
index d6a2e1d..1f13b95 100644
--- a/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
+++ b/components/camel-dataset/src/main/java/org/apache/camel/component/dataset/DataSetEndpoint.java
@@ -40,7 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Provide data for load & soak testing of your Camel application.
+ * Provide data for load and soak testing of your Camel application.
*
* It works by allowing you to create DataSet instances both as a source of messages and as a way to assert that the
* data set is received. Camel will use the throughput logger when sending dataset's.
diff --git a/components/camel-jclouds/src/generated/resources/org/apache/camel/component/jclouds/jclouds.json b/components/camel-jclouds/src/generated/resources/org/apache/camel/component/jclouds/jclouds.json
index f28b01b..409466c 100644
--- a/components/camel-jclouds/src/generated/resources/org/apache/camel/component/jclouds/jclouds.json
+++ b/components/camel-jclouds/src/generated/resources/org/apache/camel/component/jclouds/jclouds.json
@@ -3,7 +3,7 @@
"kind": "component",
"name": "jclouds",
"title": "JClouds",
- "description": "Interact with jclouds compute & blobstore service.",
+ "description": "Interact with jclouds compute and blobstore service.",
"deprecated": false,
"firstVersion": "2.9.0",
"label": "api,cloud,compute",
diff --git a/components/camel-jclouds/src/main/docs/jclouds-component.adoc b/components/camel-jclouds/src/main/docs/jclouds-component.adoc
index d438db0..954b79c 100644
--- a/components/camel-jclouds/src/main/docs/jclouds-component.adoc
+++ b/components/camel-jclouds/src/main/docs/jclouds-component.adoc
@@ -2,7 +2,7 @@
= JClouds Component
:docTitle: JClouds
:artifactId: camel-jclouds
-:description: Interact with jclouds compute & blobstore service.
+:description: Interact with jclouds compute and blobstore service.
:since: 2.9
:supportLevel: Stable
:component-header: Both producer and consumer are supported
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsEndpoint.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsEndpoint.java
index 29b8557..85cb5bf 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsEndpoint.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsEndpoint.java
@@ -22,7 +22,7 @@ import org.apache.camel.spi.UriParam;
import org.apache.camel.support.DefaultEndpoint;
/**
- * Interact with jclouds compute & blobstore service.
+ * Interact with jclouds compute and blobstore service.
*/
@UriEndpoint(firstVersion = "2.9.0", scheme = "jclouds", title = "JClouds", syntax = "jclouds:command:providerId",
category = { Category.API, Category.CLOUD, Category.COMPUTE })
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
index 39dc417..1339238 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/ComponentsBuilderFactory.java
@@ -1135,7 +1135,7 @@ public interface ComponentsBuilderFactory {
}
/**
* Dataset (camel-dataset)
- * Provide data for load & soak testing of your Camel application.
+ * Provide data for load and soak testing of your Camel application.
*
* Category: core,testing
* Since: 1.3
@@ -2109,7 +2109,7 @@ public interface ComponentsBuilderFactory {
}
/**
* JClouds (camel-jclouds)
- * Interact with jclouds compute & blobstore service.
+ * Interact with jclouds compute and blobstore service.
*
* Category: api,cloud,compute
* Since: 2.9
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DatasetComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DatasetComponentBuilderFactory.java
index 0ea54c4..25fefd8 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DatasetComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/DatasetComponentBuilderFactory.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.component.ComponentBuilder;
import org.apache.camel.component.dataset.DataSetComponent;
/**
- * Provide data for load & soak testing of your Camel application.
+ * Provide data for load and soak testing of your Camel application.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@@ -32,7 +32,7 @@ public interface DatasetComponentBuilderFactory {
/**
* Dataset (camel-dataset)
- * Provide data for load & soak testing of your Camel application.
+ * Provide data for load and soak testing of your Camel application.
*
* Category: core,testing
* Since: 1.3
diff --git a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java
index c175eac..79cad94 100644
--- a/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java
+++ b/core/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/JcloudsComponentBuilderFactory.java
@@ -23,7 +23,7 @@ import org.apache.camel.builder.component.ComponentBuilder;
import org.apache.camel.component.jclouds.JcloudsComponent;
/**
- * Interact with jclouds compute & blobstore service.
+ * Interact with jclouds compute and blobstore service.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@@ -32,7 +32,7 @@ public interface JcloudsComponentBuilderFactory {
/**
* JClouds (camel-jclouds)
- * Interact with jclouds compute & blobstore service.
+ * Interact with jclouds compute and blobstore service.
*
* Category: api,cloud,compute
* Since: 2.9
diff --git a/core/camel-componentdsl/src/generated/resources/metadata.json b/core/camel-componentdsl/src/generated/resources/metadata.json
index 3d69967..0ff3ca2 100644
--- a/core/camel-componentdsl/src/generated/resources/metadata.json
+++ b/core/camel-componentdsl/src/generated/resources/metadata.json
@@ -2174,7 +2174,7 @@
"kind": "component",
"name": "dataset",
"title": "Dataset",
- "description": "Provide data for load & soak testing of your Camel application.",
+ "description": "Provide data for load and soak testing of your Camel application.",
"deprecated": false,
"firstVersion": "1.3.0",
"label": "core,testing",
@@ -4106,7 +4106,7 @@
"kind": "component",
"name": "jclouds",
"title": "JClouds",
- "description": "Interact with jclouds compute & blobstore service.",
+ "description": "Interact with jclouds compute and blobstore service.",
"deprecated": false,
"firstVersion": "2.9.0",
"label": "api,cloud,compute",
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index e536eed..fb45d33 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -4188,7 +4188,7 @@ public class StaticEndpointBuilders {
}
/**
* Dataset (camel-dataset)
- * Provide data for load & soak testing of your Camel application.
+ * Provide data for load and soak testing of your Camel application.
*
* Category: core,testing
* Since: 1.3
@@ -4207,7 +4207,7 @@ public class StaticEndpointBuilders {
}
/**
* Dataset (camel-dataset)
- * Provide data for load & soak testing of your Camel application.
+ * Provide data for load and soak testing of your Camel application.
*
* Category: core,testing
* Since: 1.3
@@ -8005,7 +8005,7 @@ public class StaticEndpointBuilders {
}
/**
* JClouds (camel-jclouds)
- * Interact with jclouds compute & blobstore service.
+ * Interact with jclouds compute and blobstore service.
*
* Category: api,cloud,compute
* Since: 2.9
@@ -8029,7 +8029,7 @@ public class StaticEndpointBuilders {
}
/**
* JClouds (camel-jclouds)
- * Interact with jclouds compute & blobstore service.
+ * Interact with jclouds compute and blobstore service.
*
* Category: api,cloud,compute
* Since: 2.9
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
index 5942b13..687fc89 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/DataSetEndpointBuilderFactory.java
@@ -24,7 +24,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.ExceptionHandler;
/**
- * Provide data for load & soak testing of your Camel application.
+ * Provide data for load and soak testing of your Camel application.
*
* Generated by camel build tools - do NOT edit this file!
*/
@@ -855,7 +855,7 @@ public interface DataSetEndpointBuilderFactory {
public interface DataSetBuilders {
/**
* Dataset (camel-dataset)
- * Provide data for load & soak testing of your Camel application.
+ * Provide data for load and soak testing of your Camel application.
*
* Category: core,testing
* Since: 1.3
@@ -873,7 +873,7 @@ public interface DataSetEndpointBuilderFactory {
}
/**
* Dataset (camel-dataset)
- * Provide data for load & soak testing of your Camel application.
+ * Provide data for load and soak testing of your Camel application.
*
* Category: core,testing
* Since: 1.3
diff --git a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
index 6f5b995..6c5ad1e 100644
--- a/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
+++ b/core/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/JcloudsEndpointBuilderFactory.java
@@ -24,7 +24,7 @@ import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
import org.apache.camel.spi.ExceptionHandler;
/**
- * Interact with jclouds compute & blobstore service.
+ * Interact with jclouds compute and blobstore service.
*
* Generated by camel build tools - do NOT edit this file!
*/
@@ -470,7 +470,7 @@ public interface JcloudsEndpointBuilderFactory {
public interface JcloudsBuilders {
/**
* JClouds (camel-jclouds)
- * Interact with jclouds compute & blobstore service.
+ * Interact with jclouds compute and blobstore service.
*
* Category: api,cloud,compute
* Since: 2.9
@@ -493,7 +493,7 @@ public interface JcloudsEndpointBuilderFactory {
}
/**
* JClouds (camel-jclouds)
- * Interact with jclouds compute & blobstore service.
+ * Interact with jclouds compute and blobstore service.
*
* Category: api,cloud,compute
* Since: 2.9
diff --git a/docs/components/modules/ROOT/pages/dataset-component.adoc b/docs/components/modules/ROOT/pages/dataset-component.adoc
index 69ae494..4dcf8dc 100644
--- a/docs/components/modules/ROOT/pages/dataset-component.adoc
+++ b/docs/components/modules/ROOT/pages/dataset-component.adoc
@@ -4,7 +4,7 @@
:page-source: components/camel-dataset/src/main/docs/dataset-component.adoc
:docTitle: Dataset
:artifactId: camel-dataset
-:description: Provide data for load & soak testing of your Camel application.
+:description: Provide data for load and soak testing of your Camel application.
:since: 1.3
:supportLevel: Stable
:component-header: Both producer and consumer are supported
diff --git a/docs/components/modules/ROOT/pages/jclouds-component.adoc b/docs/components/modules/ROOT/pages/jclouds-component.adoc
index 4e8f22f..cf01780 100644
--- a/docs/components/modules/ROOT/pages/jclouds-component.adoc
+++ b/docs/components/modules/ROOT/pages/jclouds-component.adoc
@@ -4,7 +4,7 @@
:page-source: components/camel-jclouds/src/main/docs/jclouds-component.adoc
:docTitle: JClouds
:artifactId: camel-jclouds
-:description: Interact with jclouds compute & blobstore service.
+:description: Interact with jclouds compute and blobstore service.
:since: 2.9
:supportLevel: Stable
:component-header: Both producer and consumer are supported