This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 12bd0d9 Regen
12bd0d9 is described below
commit 12bd0d9a020755ffb5e85e2d870b9010e3035a25
Author: Andrea Cosentino <[email protected]>
AuthorDate: Wed Apr 15 12:19:27 2020 +0200
Regen
---
.../camel/springboot/catalog/components/amqp.json | 2 +-
.../springboot/catalog/components/azure-blob.json | 2 +-
.../src/main/docs/amqp-starter.adoc | 2 +-
.../amqp/springboot/AMQPComponentConfiguration.java | 6 +++---
components-starter/camel-corda-starter/pom.xml | 12 ++++++++++++
components-starter/camel-spring-boot-starter/pom.xml | 16 ++++++++++++++++
.../camel-spring-cloud-consul-starter/pom.xml | 20 ++++++++++++++++++++
.../camel-spring-cloud-netflix-starter/pom.xml | 20 ++++++++++++++++++++
.../camel-spring-cloud-starter/pom.xml | 20 ++++++++++++++++++++
.../camel-spring-cloud-zookeeper-starter/pom.xml | 20 ++++++++++++++++++++
docs/modules/ROOT/pages/amqp-starter.adoc | 2 +-
11 files changed, 115 insertions(+), 7 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/amqp.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/amqp.json
index aaf8166..2da5737 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/amqp.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/amqp.json
@@ -25,7 +25,7 @@
"connectionFactory": { "kind": "property", "displayName": "Connection
Factory", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "javax.jms.ConnectionFactory", "deprecated": false, "secret":
false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": "The connection factory
to be use. A connection factory must be configured either on the component or
endpoint." },
"disableReplyTo": { "kind": "property", "displayName": "Disable Reply To",
"group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": "Specifies whether Camel
ignores the JMSReplyTo header in messages. If true, Camel does not send a reply
back to the destination spe [...]
"durableSubscriptionName": { "kind": "property", "displayName": "Durable
Subscription Name", "group": "common", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": "The durable subscriber
name for specifying durable topic subscriptions. The clientId option must be
configured as well." },
- "includeAmqpAnnotations": { "kind": "property", "displayName": "Include
Amqp Annotations", "group": "common", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "description": "Whether to include AMQP annotations when mapping from
AMQP to Camel Message. Setting this to true will map AMQP message annotations
to message headers. Due to limitations in Apache Qpid JMS API, currently
delivery annotations are ignored." },
+ "includeAmqpAnnotations": { "kind": "property", "displayName": "Include
Amqp Annotations", "group": "common", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "description": "Whether to include AMQP annotations when mapping from
AMQP to Camel Message. Setting this to true maps AMQP message annotations that
contain a JMS_AMQP_MA_ prefix to message headers. Due to limitations in Apache
Qpid JMS API, currently deli [...]
"jmsMessageType": { "kind": "property", "displayName": "Jms Message Type",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.jms.JmsMessageType", "enum": [ "Bytes",
"Map", "Object", "Stream", "Text" ], "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": "Allows you to force the
use of a specific javax.jms.Message i [...]
"testConnectionOnStartup": { "kind": "property", "displayName": "Test
Connection On Startup", "group": "common", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Specifies whether to test the connection on
startup. This ensures that when Camel starts that all the JMS consum [...]
"acknowledgementModeName": { "kind": "property", "displayName":
"Acknowledgement Mode Name", "group": "consumer", "label": "consumer",
"required": false, "type": "string", "javaType": "java.lang.String", "enum": [
"SESSION_TRANSACTED", "CLIENT_ACKNOWLEDGE", "AUTO_ACKNOWLEDGE",
"DUPS_OK_ACKNOWLEDGE" ], "deprecated": false, "secret": false, "defaultValue":
"AUTO_ACKNOWLEDGE", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", [...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-blob.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-blob.json
index 36322f6..a0a8657 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-blob.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/azure-blob.json
@@ -5,7 +5,7 @@
"scheme": "azure-blob",
"extendsScheme": "",
"syntax": "azure-blob:containerOrBlobUri",
- "title": "Azure Storage Blob Service",
+ "title": "Azure Storage Blob Service (Legacy)",
"description": "The azure-blob component is used for storing and
retrieving blobs from Azure Storage Blob Service.",
"label": "cloud,database,nosql",
"deprecated": false,
diff --git
a/components-starter/camel-amqp-starter/src/main/docs/amqp-starter.adoc
b/components-starter/camel-amqp-starter/src/main/docs/amqp-starter.adoc
index b82e12b..bed3c04 100644
--- a/components-starter/camel-amqp-starter/src/main/docs/amqp-starter.adoc
+++ b/components-starter/camel-amqp-starter/src/main/docs/amqp-starter.adoc
@@ -71,7 +71,7 @@ The component supports 98 options, which are listed below.
| *camel.component.amqp.idle-consumer-limit* | Specify the limit for the
number of consumers that are allowed to be idle at any given time. | 1 | Integer
| *camel.component.amqp.idle-task-execution-limit* | Specifies the limit for
idle executions of a receive task, not having received any message within its
execution. If this limit is reached, the task will shut down and leave
receiving to other executing tasks (in the case of dynamic scheduling; see the
maxConcurrentConsumers setting). There is additional doc available from Spring.
| 1 | Integer
| *camel.component.amqp.include-all-jmsx-properties* | Whether to include all
JMSXxxx properties when mapping from JMS to Camel Message. Setting this to true
will include properties such as JMSXAppID, and JMSXUserID etc. Note: If you are
using a custom headerFilterStrategy then this option does not apply. | false |
Boolean
-| *camel.component.amqp.include-amqp-annotations* | Whether to include AMQP
annotations when mapping from AMQP to Camel Message. Setting this to true will
map AMQP message annotations to message headers. Due to limitations in Apache
Qpid JMS API, currently delivery annotations are ignored. | false | Boolean
+| *camel.component.amqp.include-amqp-annotations* | Whether to include AMQP
annotations when mapping from AMQP to Camel Message. Setting this to true maps
AMQP message annotations that contain a JMS_AMQP_MA_ prefix to message headers.
Due to limitations in Apache Qpid JMS API, currently delivery annotations are
ignored. | false | Boolean
| *camel.component.amqp.include-sent-jms-message-id* | Only applicable when
sending to JMS destination using InOnly (eg fire and forget). Enabling this
option will enrich the Camel Exchange with the actual JMSMessageID that was
used by the JMS client when the message was sent to the JMS destination. |
false | Boolean
| *camel.component.amqp.jms-key-format-strategy* | Pluggable strategy for
encoding and decoding JMS keys so they can be compliant with the JMS
specification. Camel provides two implementations out of the box: default and
passthrough. The default strategy will safely marshal dots and hyphens (. and
-). The passthrough strategy leaves the key as is. Can be used for JMS brokers
which do not care whether JMS header keys contain illegal characters. You can
provide your own implementation of t [...]
| *camel.component.amqp.jms-message-type* | Allows you to force the use of a
specific javax.jms.Message implementation for sending JMS messages. Possible
values are: Bytes, Map, Object, Stream, Text. By default, Camel would determine
which JMS message type to use from the In body type. This option allows you to
specify it. | | JmsMessageType
diff --git
a/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
b/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
index f358fa3..a2eabd4 100644
---
a/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
+++
b/components-starter/camel-amqp-starter/src/main/java/org/apache/camel/component/amqp/springboot/AMQPComponentConfiguration.java
@@ -74,9 +74,9 @@ public class AMQPComponentConfiguration
private String durableSubscriptionName;
/**
* Whether to include AMQP annotations when mapping from AMQP to Camel
- * Message. Setting this to true will map AMQP message annotations to
- * message headers. Due to limitations in Apache Qpid JMS API, currently
- * delivery annotations are ignored.
+ * Message. Setting this to true maps AMQP message annotations that contain
+ * a JMS_AMQP_MA_ prefix to message headers. Due to limitations in Apache
+ * Qpid JMS API, currently delivery annotations are ignored.
*/
private Boolean includeAmqpAnnotations = false;
/**
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 0391c60..f29dca1 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-corda</artifactId>
<version>${camel-version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-boot-starter/pom.xml
b/components-starter/camel-spring-boot-starter/pom.xml
index ef4dde9..a044dd9 100644
--- a/components-starter/camel-spring-boot-starter/pom.xml
+++ b/components-starter/camel-spring-boot-starter/pom.xml
@@ -48,6 +48,22 @@
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
</exclusions>
<!--END OF GENERATED CODE-->
</dependency>
diff --git a/components-starter/camel-spring-cloud-consul-starter/pom.xml
b/components-starter/camel-spring-cloud-consul-starter/pom.xml
index 5df3ca4..6e257e9 100644
--- a/components-starter/camel-spring-cloud-consul-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-consul-starter/pom.xml
@@ -38,6 +38,26 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-consul</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-cloud-netflix-starter/pom.xml
b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
index fbba09a..beacbb0 100644
--- a/components-starter/camel-spring-cloud-netflix-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
@@ -38,6 +38,26 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-netflix</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-cloud-starter/pom.xml
b/components-starter/camel-spring-cloud-starter/pom.xml
index 0f4ff7d..35eb6a5 100644
--- a/components-starter/camel-spring-cloud-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-starter/pom.xml
@@ -38,6 +38,26 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
index 168d968..b29563b 100644
--- a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
@@ -38,6 +38,26 @@
<groupId>org.apache.camel.springboot</groupId>
<artifactId>camel-spring-cloud-zookeeper</artifactId>
<version>${project.version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/docs/modules/ROOT/pages/amqp-starter.adoc
b/docs/modules/ROOT/pages/amqp-starter.adoc
index b82e12b..bed3c04 100644
--- a/docs/modules/ROOT/pages/amqp-starter.adoc
+++ b/docs/modules/ROOT/pages/amqp-starter.adoc
@@ -71,7 +71,7 @@ The component supports 98 options, which are listed below.
| *camel.component.amqp.idle-consumer-limit* | Specify the limit for the
number of consumers that are allowed to be idle at any given time. | 1 | Integer
| *camel.component.amqp.idle-task-execution-limit* | Specifies the limit for
idle executions of a receive task, not having received any message within its
execution. If this limit is reached, the task will shut down and leave
receiving to other executing tasks (in the case of dynamic scheduling; see the
maxConcurrentConsumers setting). There is additional doc available from Spring.
| 1 | Integer
| *camel.component.amqp.include-all-jmsx-properties* | Whether to include all
JMSXxxx properties when mapping from JMS to Camel Message. Setting this to true
will include properties such as JMSXAppID, and JMSXUserID etc. Note: If you are
using a custom headerFilterStrategy then this option does not apply. | false |
Boolean
-| *camel.component.amqp.include-amqp-annotations* | Whether to include AMQP
annotations when mapping from AMQP to Camel Message. Setting this to true will
map AMQP message annotations to message headers. Due to limitations in Apache
Qpid JMS API, currently delivery annotations are ignored. | false | Boolean
+| *camel.component.amqp.include-amqp-annotations* | Whether to include AMQP
annotations when mapping from AMQP to Camel Message. Setting this to true maps
AMQP message annotations that contain a JMS_AMQP_MA_ prefix to message headers.
Due to limitations in Apache Qpid JMS API, currently delivery annotations are
ignored. | false | Boolean
| *camel.component.amqp.include-sent-jms-message-id* | Only applicable when
sending to JMS destination using InOnly (eg fire and forget). Enabling this
option will enrich the Camel Exchange with the actual JMSMessageID that was
used by the JMS client when the message was sent to the JMS destination. |
false | Boolean
| *camel.component.amqp.jms-key-format-strategy* | Pluggable strategy for
encoding and decoding JMS keys so they can be compliant with the JMS
specification. Camel provides two implementations out of the box: default and
passthrough. The default strategy will safely marshal dots and hyphens (. and
-). The passthrough strategy leaves the key as is. Can be used for JMS brokers
which do not care whether JMS header keys contain illegal characters. You can
provide your own implementation of t [...]
| *camel.component.amqp.jms-message-type* | Allows you to force the use of a
specific javax.jms.Message implementation for sending JMS messages. Possible
values are: Bytes, Map, Object, Stream, Text. By default, Camel would determine
which JMS message type to use from the In body type. This option allows you to
specify it. | | JmsMessageType
