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 1a2807c CAMEL-14812 - camel-karaf - We should not maintain versions
in its root pom.xml, lets do the same for camel-spring-boot and regen
1a2807c is described below
commit 1a2807cdc195ab722b6a8a21050ca3ba48ae18fc
Author: Andrea Cosentino <[email protected]>
AuthorDate: Mon May 4 20:47:26 2020 +0200
CAMEL-14812 - camel-karaf - We should not maintain versions in its root
pom.xml, lets do the same for camel-spring-boot and regen
---
.../springboot/catalog/components/activemq.json | 1 -
.../camel/springboot/catalog/components/amqp.json | 1 -
.../camel/springboot/catalog/components/jms.json | 1 -
.../src/main/docs/activemq-starter.adoc | 3 +--
.../springboot/ActiveMQComponentConfiguration.java | 17 -----------------
.../src/main/docs/amqp-starter.adoc | 3 +--
.../amqp/springboot/AMQPComponentConfiguration.java | 17 -----------------
components-starter/camel-corda-starter/pom.xml | 12 ++++++++++++
.../camel-jms-starter/src/main/docs/jms-starter.adoc | 3 +--
.../jms/springboot/JmsComponentConfiguration.java | 17 -----------------
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/activemq-starter.adoc | 3 +--
docs/modules/ROOT/pages/amqp-starter.adoc | 3 +--
docs/modules/ROOT/pages/jms-starter.adoc | 3 +--
pom.xml | 6 +++---
tooling/camel-spring-boot-dependencies/pom.xml | 4 ++--
20 files changed, 119 insertions(+), 71 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
index 8772778..1c0c401 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/activemq.json
@@ -35,7 +35,6 @@
"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", [...]
"asyncConsumer": { "kind": "property", "displayName": "Async Consumer",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": "Whether the JmsConsumer
processes the Exchange asynchronously. If enabled then the JmsConsumer may
pickup the next message f [...]
"autoStartup": { "kind": "property", "displayName": "Auto Startup",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"true", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Specifies whether the consumer container
should auto-startup." },
- "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by [...]
"cacheLevel": { "kind": "property", "displayName": "Cache Level", "group":
"consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Sets the cache level by ID for the underlying
JMS resources. See cacheLevelName option for more details." },
"cacheLevelName": { "kind": "property", "displayName": "Cache Level Name",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "CACHE_AUTO", "CACHE_CONNECTION",
"CACHE_CONSUMER", "CACHE_NONE", "CACHE_SESSION" ], "deprecated": false,
"secret": false, "defaultValue": "CACHE_AUTO", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Sets the ca [...]
"concurrentConsumers": { "kind": "property", "displayName": "Concurrent
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "1", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Specifies the default number of concurrent
consumers when consuming from JMS (not for request\/reply over JMS). See al
[...]
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 5d05a17..1bf633c 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
@@ -31,7 +31,6 @@
"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", [...]
"asyncConsumer": { "kind": "property", "displayName": "Async Consumer",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": "Whether the JmsConsumer
processes the Exchange asynchronously. If enabled then the JmsConsumer may
pickup the next message f [...]
"autoStartup": { "kind": "property", "displayName": "Auto Startup",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"true", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Specifies whether the consumer container
should auto-startup." },
- "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by [...]
"cacheLevel": { "kind": "property", "displayName": "Cache Level", "group":
"consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Sets the cache level by ID for the underlying
JMS resources. See cacheLevelName option for more details." },
"cacheLevelName": { "kind": "property", "displayName": "Cache Level Name",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "CACHE_AUTO", "CACHE_CONNECTION",
"CACHE_CONSUMER", "CACHE_NONE", "CACHE_SESSION" ], "deprecated": false,
"secret": false, "defaultValue": "CACHE_AUTO", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Sets the ca [...]
"concurrentConsumers": { "kind": "property", "displayName": "Concurrent
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "1", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Specifies the default number of concurrent
consumers when consuming from JMS (not for request\/reply over JMS). See al
[...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json
index 4dc61e3..91d4ee4 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jms.json
@@ -31,7 +31,6 @@
"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", [...]
"asyncConsumer": { "kind": "property", "displayName": "Async Consumer",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass": "org.apache.camel.component.jms.JmsConfiguration",
"configurationField": "configuration", "description": "Whether the JmsConsumer
processes the Exchange asynchronously. If enabled then the JmsConsumer may
pickup the next message f [...]
"autoStartup": { "kind": "property", "displayName": "Auto Startup",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"true", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Specifies whether the consumer container
should auto-startup." },
- "bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Allows for bridging the consumer to the
Camel routing Error Handler, which mean any exceptions occurred while the
consumer is trying to pickup incoming messages, or the likes, will now be
processed as a message and handled by [...]
"cacheLevel": { "kind": "property", "displayName": "Cache Level", "group":
"consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Sets the cache level by ID for the underlying
JMS resources. See cacheLevelName option for more details." },
"cacheLevelName": { "kind": "property", "displayName": "Cache Level Name",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "CACHE_AUTO", "CACHE_CONNECTION",
"CACHE_CONSUMER", "CACHE_NONE", "CACHE_SESSION" ], "deprecated": false,
"secret": false, "defaultValue": "CACHE_AUTO", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Sets the ca [...]
"concurrentConsumers": { "kind": "property", "displayName": "Concurrent
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "1", "configurationClass":
"org.apache.camel.component.jms.JmsConfiguration", "configurationField":
"configuration", "description": "Specifies the default number of concurrent
consumers when consuming from JMS (not for request\/reply over JMS). See al
[...]
diff --git
a/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc
b/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc
index 610cc19..3fe1d0b 100644
---
a/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc
+++
b/components-starter/camel-activemq-starter/src/main/docs/activemq-starter.adoc
@@ -17,7 +17,7 @@ When using activemq with Spring Boot make sure to use the
following Maven depend
----
-The component supports 101 options, which are listed below.
+The component supports 100 options, which are listed below.
@@ -39,7 +39,6 @@ The component supports 101 options, which are listed below.
| *camel.component.activemq.async-stop-listener* | Whether to stop the
JmsConsumer message listener asynchronously, when stopping a route. | false |
Boolean
| *camel.component.activemq.auto-startup* | Specifies whether the consumer
container should auto-startup. | true | Boolean
| *camel.component.activemq.basic-property-binding* | Whether the component
should use basic property binding (Camel 2.x) or the newer property binding
with additional capabilities | false | Boolean
-| *camel.component.activemq.bridge-error-handler* | Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a message and handled by the routing Error Handler. By
default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
with exceptions, that will be logged at WARN or ERROR level and ignored. |
false | Boolean
| *camel.component.activemq.broker-url* | Sets the broker URL to use to
connect to ActiveMQ | | String
| *camel.component.activemq.cache-level* | Sets the cache level by ID for the
underlying JMS resources. See cacheLevelName option for more details. | |
Integer
| *camel.component.activemq.cache-level-name* | Sets the cache level by name
for the underlying JMS resources. Possible values are: CACHE_AUTO,
CACHE_CONNECTION, CACHE_CONSUMER, CACHE_NONE, and CACHE_SESSION. The default
setting is CACHE_AUTO. See the Spring documentation and Transactions Cache
Levels for more information. | CACHE_AUTO | String
diff --git
a/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
b/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
index 0db8652..635e0f1 100644
---
a/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
+++
b/components-starter/camel-activemq-starter/src/main/java/org/apache/camel/component/activemq/springboot/ActiveMQComponentConfiguration.java
@@ -144,15 +144,6 @@ public class ActiveMQComponentConfiguration
*/
private Boolean autoStartup = true;
/**
- * Allows for bridging the consumer to the Camel routing Error Handler,
- * which mean any exceptions occurred while the consumer is trying to
pickup
- * incoming messages, or the likes, will now be processed as a message and
- * handled by the routing Error Handler. By default the consumer will use
- * the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that
- * will be logged at WARN or ERROR level and ignored.
- */
- private Boolean bridgeErrorHandler = false;
- /**
* Sets the cache level by ID for the underlying JMS resources. See
* cacheLevelName option for more details.
*/
@@ -880,14 +871,6 @@ public class ActiveMQComponentConfiguration
this.autoStartup = autoStartup;
}
- public Boolean getBridgeErrorHandler() {
- return bridgeErrorHandler;
- }
-
- public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
- this.bridgeErrorHandler = bridgeErrorHandler;
- }
-
public Integer getCacheLevel() {
return cacheLevel;
}
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 bed3c04..4ca596d 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
@@ -17,7 +17,7 @@ When using amqp with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 98 options, which are listed below.
+The component supports 97 options, which are listed below.
@@ -39,7 +39,6 @@ The component supports 98 options, which are listed below.
| *camel.component.amqp.async-stop-listener* | Whether to stop the JmsConsumer
message listener asynchronously, when stopping a route. | false | Boolean
| *camel.component.amqp.auto-startup* | Specifies whether the consumer
container should auto-startup. | true | Boolean
| *camel.component.amqp.basic-property-binding* | Whether the component should
use basic property binding (Camel 2.x) or the newer property binding with
additional capabilities | false | Boolean
-| *camel.component.amqp.bridge-error-handler* | Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a message and handled by the routing Error Handler. By
default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
with exceptions, that will be logged at WARN or ERROR level and ignored. |
false | Boolean
| *camel.component.amqp.cache-level* | Sets the cache level by ID for the
underlying JMS resources. See cacheLevelName option for more details. | |
Integer
| *camel.component.amqp.cache-level-name* | Sets the cache level by name for
the underlying JMS resources. Possible values are: CACHE_AUTO,
CACHE_CONNECTION, CACHE_CONSUMER, CACHE_NONE, and CACHE_SESSION. The default
setting is CACHE_AUTO. See the Spring documentation and Transactions Cache
Levels for more information. | CACHE_AUTO | String
| *camel.component.amqp.client-id* | Sets the JMS client ID to use. Note that
this value, if specified, must be unique and can only be used by a single JMS
connection instance. It is typically only required for durable topic
subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics
instead. | | String
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 a2eabd4..78c77f7 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
@@ -116,15 +116,6 @@ public class AMQPComponentConfiguration
*/
private Boolean autoStartup = true;
/**
- * Allows for bridging the consumer to the Camel routing Error Handler,
- * which mean any exceptions occurred while the consumer is trying to
pickup
- * incoming messages, or the likes, will now be processed as a message and
- * handled by the routing Error Handler. By default the consumer will use
- * the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that
- * will be logged at WARN or ERROR level and ignored.
- */
- private Boolean bridgeErrorHandler = false;
- /**
* Sets the cache level by ID for the underlying JMS resources. See
* cacheLevelName option for more details.
*/
@@ -825,14 +816,6 @@ public class AMQPComponentConfiguration
this.autoStartup = autoStartup;
}
- public Boolean getBridgeErrorHandler() {
- return bridgeErrorHandler;
- }
-
- public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
- this.bridgeErrorHandler = bridgeErrorHandler;
- }
-
public Integer getCacheLevel() {
return cacheLevel;
}
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-jms-starter/src/main/docs/jms-starter.adoc
b/components-starter/camel-jms-starter/src/main/docs/jms-starter.adoc
index 6f7e8d7..51f2105 100644
--- a/components-starter/camel-jms-starter/src/main/docs/jms-starter.adoc
+++ b/components-starter/camel-jms-starter/src/main/docs/jms-starter.adoc
@@ -17,7 +17,7 @@ When using jms with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 97 options, which are listed below.
+The component supports 96 options, which are listed below.
@@ -39,7 +39,6 @@ The component supports 97 options, which are listed below.
| *camel.component.jms.async-stop-listener* | Whether to stop the JmsConsumer
message listener asynchronously, when stopping a route. | false | Boolean
| *camel.component.jms.auto-startup* | Specifies whether the consumer
container should auto-startup. | true | Boolean
| *camel.component.jms.basic-property-binding* | Whether the component should
use basic property binding (Camel 2.x) or the newer property binding with
additional capabilities | false | Boolean
-| *camel.component.jms.bridge-error-handler* | Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a message and handled by the routing Error Handler. By
default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
with exceptions, that will be logged at WARN or ERROR level and ignored. |
false | Boolean
| *camel.component.jms.cache-level* | Sets the cache level by ID for the
underlying JMS resources. See cacheLevelName option for more details. | |
Integer
| *camel.component.jms.cache-level-name* | Sets the cache level by name for
the underlying JMS resources. Possible values are: CACHE_AUTO,
CACHE_CONNECTION, CACHE_CONSUMER, CACHE_NONE, and CACHE_SESSION. The default
setting is CACHE_AUTO. See the Spring documentation and Transactions Cache
Levels for more information. | CACHE_AUTO | String
| *camel.component.jms.client-id* | Sets the JMS client ID to use. Note that
this value, if specified, must be unique and can only be used by a single JMS
connection instance. It is typically only required for durable topic
subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics
instead. | | String
diff --git
a/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
b/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
index 9ec7ef8..f3ce473 100644
---
a/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
+++
b/components-starter/camel-jms-starter/src/main/java/org/apache/camel/component/jms/springboot/JmsComponentConfiguration.java
@@ -109,15 +109,6 @@ public class JmsComponentConfiguration
*/
private Boolean autoStartup = true;
/**
- * Allows for bridging the consumer to the Camel routing Error Handler,
- * which mean any exceptions occurred while the consumer is trying to
pickup
- * incoming messages, or the likes, will now be processed as a message and
- * handled by the routing Error Handler. By default the consumer will use
- * the org.apache.camel.spi.ExceptionHandler to deal with exceptions, that
- * will be logged at WARN or ERROR level and ignored.
- */
- private Boolean bridgeErrorHandler = false;
- /**
* Sets the cache level by ID for the underlying JMS resources. See
* cacheLevelName option for more details.
*/
@@ -810,14 +801,6 @@ public class JmsComponentConfiguration
this.autoStartup = autoStartup;
}
- public Boolean getBridgeErrorHandler() {
- return bridgeErrorHandler;
- }
-
- public void setBridgeErrorHandler(Boolean bridgeErrorHandler) {
- this.bridgeErrorHandler = bridgeErrorHandler;
- }
-
public Integer getCacheLevel() {
return cacheLevel;
}
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/activemq-starter.adoc
b/docs/modules/ROOT/pages/activemq-starter.adoc
index 610cc19..3fe1d0b 100644
--- a/docs/modules/ROOT/pages/activemq-starter.adoc
+++ b/docs/modules/ROOT/pages/activemq-starter.adoc
@@ -17,7 +17,7 @@ When using activemq with Spring Boot make sure to use the
following Maven depend
----
-The component supports 101 options, which are listed below.
+The component supports 100 options, which are listed below.
@@ -39,7 +39,6 @@ The component supports 101 options, which are listed below.
| *camel.component.activemq.async-stop-listener* | Whether to stop the
JmsConsumer message listener asynchronously, when stopping a route. | false |
Boolean
| *camel.component.activemq.auto-startup* | Specifies whether the consumer
container should auto-startup. | true | Boolean
| *camel.component.activemq.basic-property-binding* | Whether the component
should use basic property binding (Camel 2.x) or the newer property binding
with additional capabilities | false | Boolean
-| *camel.component.activemq.bridge-error-handler* | Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a message and handled by the routing Error Handler. By
default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
with exceptions, that will be logged at WARN or ERROR level and ignored. |
false | Boolean
| *camel.component.activemq.broker-url* | Sets the broker URL to use to
connect to ActiveMQ | | String
| *camel.component.activemq.cache-level* | Sets the cache level by ID for the
underlying JMS resources. See cacheLevelName option for more details. | |
Integer
| *camel.component.activemq.cache-level-name* | Sets the cache level by name
for the underlying JMS resources. Possible values are: CACHE_AUTO,
CACHE_CONNECTION, CACHE_CONSUMER, CACHE_NONE, and CACHE_SESSION. The default
setting is CACHE_AUTO. See the Spring documentation and Transactions Cache
Levels for more information. | CACHE_AUTO | String
diff --git a/docs/modules/ROOT/pages/amqp-starter.adoc
b/docs/modules/ROOT/pages/amqp-starter.adoc
index bed3c04..4ca596d 100644
--- a/docs/modules/ROOT/pages/amqp-starter.adoc
+++ b/docs/modules/ROOT/pages/amqp-starter.adoc
@@ -17,7 +17,7 @@ When using amqp with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 98 options, which are listed below.
+The component supports 97 options, which are listed below.
@@ -39,7 +39,6 @@ The component supports 98 options, which are listed below.
| *camel.component.amqp.async-stop-listener* | Whether to stop the JmsConsumer
message listener asynchronously, when stopping a route. | false | Boolean
| *camel.component.amqp.auto-startup* | Specifies whether the consumer
container should auto-startup. | true | Boolean
| *camel.component.amqp.basic-property-binding* | Whether the component should
use basic property binding (Camel 2.x) or the newer property binding with
additional capabilities | false | Boolean
-| *camel.component.amqp.bridge-error-handler* | Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a message and handled by the routing Error Handler. By
default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
with exceptions, that will be logged at WARN or ERROR level and ignored. |
false | Boolean
| *camel.component.amqp.cache-level* | Sets the cache level by ID for the
underlying JMS resources. See cacheLevelName option for more details. | |
Integer
| *camel.component.amqp.cache-level-name* | Sets the cache level by name for
the underlying JMS resources. Possible values are: CACHE_AUTO,
CACHE_CONNECTION, CACHE_CONSUMER, CACHE_NONE, and CACHE_SESSION. The default
setting is CACHE_AUTO. See the Spring documentation and Transactions Cache
Levels for more information. | CACHE_AUTO | String
| *camel.component.amqp.client-id* | Sets the JMS client ID to use. Note that
this value, if specified, must be unique and can only be used by a single JMS
connection instance. It is typically only required for durable topic
subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics
instead. | | String
diff --git a/docs/modules/ROOT/pages/jms-starter.adoc
b/docs/modules/ROOT/pages/jms-starter.adoc
index 6f7e8d7..51f2105 100644
--- a/docs/modules/ROOT/pages/jms-starter.adoc
+++ b/docs/modules/ROOT/pages/jms-starter.adoc
@@ -17,7 +17,7 @@ When using jms with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 97 options, which are listed below.
+The component supports 96 options, which are listed below.
@@ -39,7 +39,6 @@ The component supports 97 options, which are listed below.
| *camel.component.jms.async-stop-listener* | Whether to stop the JmsConsumer
message listener asynchronously, when stopping a route. | false | Boolean
| *camel.component.jms.auto-startup* | Specifies whether the consumer
container should auto-startup. | true | Boolean
| *camel.component.jms.basic-property-binding* | Whether the component should
use basic property binding (Camel 2.x) or the newer property binding with
additional capabilities | false | Boolean
-| *camel.component.jms.bridge-error-handler* | Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a message and handled by the routing Error Handler. By
default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal
with exceptions, that will be logged at WARN or ERROR level and ignored. |
false | Boolean
| *camel.component.jms.cache-level* | Sets the cache level by ID for the
underlying JMS resources. See cacheLevelName option for more details. | |
Integer
| *camel.component.jms.cache-level-name* | Sets the cache level by name for
the underlying JMS resources. Possible values are: CACHE_AUTO,
CACHE_CONNECTION, CACHE_CONSUMER, CACHE_NONE, and CACHE_SESSION. The default
setting is CACHE_AUTO. See the Spring documentation and Transactions Cache
Levels for more information. | CACHE_AUTO | String
| *camel.component.jms.client-id* | Sets the JMS client ID to use. Note that
this value, if specified, must be unique and can only be used by a single JMS
connection instance. It is typically only required for durable topic
subscriptions. If using Apache ActiveMQ you may prefer to use Virtual Topics
instead. | | String
diff --git a/pom.xml b/pom.xml
index 5173283..54330a0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,9 +21,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>21</version>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-dependencies</artifactId>
+ <version>3.3.0-SNAPSHOT</version>
</parent>
<groupId>org.apache.camel.springboot</groupId>
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 31e3367..31189b0 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -4042,12 +4042,12 @@
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client</artifactId>
- <version>2.5.0</version>
+ <version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-admin</artifactId>
- <version>2.5.0</version>
+ <version>2.5.1</version>
</dependency>
<dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
