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 6551cb8 [create-pull-request] automated change
6551cb8 is described below
commit 6551cb89910320876275172876be4bccc6649017
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Thu May 7 00:56:59 2020 +0000
[create-pull-request] automated change
---
.../camel/springboot/catalog/components/kafka.json | 2 ++
.../catalog/components/mongodb-gridfs.json | 6 +++---
components-starter/camel-corda-starter/pom.xml | 12 ------------
.../src/main/docs/kafka-starter.adoc | 3 ++-
.../springboot/KafkaComponentConfiguration.java | 13 +++++++++++++
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/kafka-starter.adoc | 3 ++-
11 files changed, 22 insertions(+), 113 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
index dd6a707..95f6225 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
@@ -27,6 +27,7 @@
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.kafka.KafkaConfiguration",
"deprecated": false, "secret": false, "description": "Allows to pre-configure
the Kafka component with common options that the endpoints will reuse." },
"headerFilterStrategy": { "kind": "property", "displayName": "Header
Filter Strategy", "group": "common", "label": "common", "required": false,
"type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "To use a custom HeaderFilterStrategy to filter
header to and from Camel message." },
"reconnectBackoffMaxMs": { "kind": "property", "displayName": "Reconnect
Backoff Max Ms", "group": "common", "label": "common", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"secret": false, "defaultValue": "1000", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The maximum amount of time in milliseconds to
wait when reconnecting to a broker that has repea [...]
+ "shutdownTimeout": { "kind": "property", "displayName": "Shutdown
Timeout", "group": "common", "label": "common", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "30000", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "Timeout in milli seconds to wait gracefully
for the consumer or producer to shutdown and terminate its worker threads." },
"allowManualCommit": { "kind": "property", "displayName": "Allow Manual
Commit", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "Whether to allow doing manual commits via
KafkaManualCommit. If this option is enabled then an instance of Kafk [...]
"autoCommitEnable": { "kind": "property", "displayName": "Auto Commit
Enable", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret":
false, "defaultValue": "true", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "If true, periodically commit to ZooKeeper the
offset of messages already fetched by the consumer. This [...]
"autoCommitIntervalMs": { "kind": "property", "displayName": "Auto Commit
Interval Ms", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"secret": false, "defaultValue": "5000", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The frequency in ms that the consumer offsets
are committed to zookeeper." },
@@ -125,6 +126,7 @@
"clientId": { "kind": "parameter", "displayName": "Client Id", "group":
"common", "label": "common", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The client id is a user-specified string sent
in each request to help trace calls. It should logically identify the
application making the request." },
"headerFilterStrategy": { "kind": "parameter", "displayName": "Header
Filter Strategy", "group": "common", "label": "common", "required": false,
"type": "object", "javaType": "org.apache.camel.spi.HeaderFilterStrategy",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "To use a custom HeaderFilterStrategy to filter
header to and from Camel message." },
"reconnectBackoffMaxMs": { "kind": "parameter", "displayName": "Reconnect
Backoff Max Ms", "group": "common", "label": "common", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"secret": false, "defaultValue": "1000", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The maximum amount of time in milliseconds to
wait when reconnecting to a broker that has repe [...]
+ "shutdownTimeout": { "kind": "parameter", "displayName": "Shutdown
Timeout", "group": "common", "label": "common", "required": false, "type":
"integer", "javaType": "int", "deprecated": false, "secret": false,
"defaultValue": "30000", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "Timeout in milli seconds to wait gracefully
for the consumer or producer to shutdown and terminate its worker threads." },
"allowManualCommit": { "kind": "parameter", "displayName": "Allow Manual
Commit", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "Whether to allow doing manual commits via
KafkaManualCommit. If this option is enabled then an instance of Kaf [...]
"autoCommitEnable": { "kind": "parameter", "displayName": "Auto Commit
Enable", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "java.lang.Boolean", "deprecated": false, "secret":
false, "defaultValue": "true", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "If true, periodically commit to ZooKeeper the
offset of messages already fetched by the consumer. Thi [...]
"autoCommitIntervalMs": { "kind": "parameter", "displayName": "Auto Commit
Interval Ms", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"secret": false, "defaultValue": "5000", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The frequency in ms that the consumer offsets
are committed to zookeeper." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb-gridfs.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb-gridfs.json
index 67b1030..a5da05c 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb-gridfs.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/mongodb-gridfs.json
@@ -26,11 +26,11 @@
"basicPropertyBinding": { "kind": "property", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" }
},
"properties": {
- "connectionBean": { "kind": "path", "displayName": "Connection Bean",
"group": "common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "Name of com.mongodb.MongoClient to use." },
+ "connectionBean": { "kind": "path", "displayName": "Connection Bean",
"group": "common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "Name of com.mongodb.client.MongoClient to use." },
"bucket": { "kind": "parameter", "displayName": "Bucket", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "defaultValue": "fs",
"description": "Sets the name of the GridFS bucket within the database. Default
is fs." },
"database": { "kind": "parameter", "displayName": "Database", "group":
"common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "Sets the name of the MongoDB database to target" },
"readPreference": { "kind": "parameter", "displayName": "Read Preference",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "com.mongodb.ReadPreference", "deprecated": false, "secret": false,
"description": "Sets a MongoDB ReadPreference on the Mongo connection. Read
preferences set directly on the connection will be overridden by this setting.
The com.mongodb.ReadPreference#valueOf(String) utility method is used to
resolve the passed readPreference va [...]
- "writeConcern": { "kind": "parameter", "displayName": "Write Concern",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "com.mongodb.WriteConcern", "enum": [ "ACKNOWLEDGED", "W1", "W2",
"W3", "UNACKNOWLEDGED", "JOURNALED", "MAJORITY", "SAFE" ], "deprecated": false,
"secret": false, "description": "Set the WriteConcern for write operations on
MongoDB using the standard ones. Resolved from the fields of the WriteConcern
class by calling the WriteConcern# [...]
+ "writeConcern": { "kind": "parameter", "displayName": "Write Concern",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "com.mongodb.WriteConcern", "enum": [ "ACKNOWLEDGED", "W1", "W2",
"W3", "UNACKNOWLEDGED", "JOURNALED", "MAJORITY" ], "deprecated": false,
"secret": false, "description": "Set the WriteConcern for write operations on
MongoDB using the standard ones. Resolved from the fields of the WriteConcern
class by calling the WriteConcern#valueOf( [...]
"bridgeErrorHandler": { "kind": "parameter", "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 b [...]
"delay": { "kind": "parameter", "displayName": "Delay", "group":
"consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "secret": false, "defaultValue":
"500", "description": "Sets the delay between polls within the Consumer.
Default is 500ms" },
"fileAttributeName": { "kind": "parameter", "displayName": "File Attribute
Name", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"defaultValue": "camel-processed", "description": "If the QueryType uses a
FileAttribute, this sets the name of the attribute that is used. Default is
camel-processed." },
@@ -42,7 +42,7 @@
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "secret": false, "description": "To let the consumer use a
custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled
then this option is not in use. By default the consumer will deal with [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the [...]
- "operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "Sets the operation this endpoint will execute against GridRS."
},
+ "operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"description": "Sets the operation this endpoint will execute against GridFs."
},
"basicPropertyBinding": { "kind": "parameter", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the endpoint should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
"synchronous": { "kind": "parameter", "displayName": "Synchronous",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"false", "description": "Sets whether synchronous processing should be strictly
used, or Camel is allowed to use asynchronous processing (if supported)." }
}
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index f29dca1..0391c60 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,18 +38,6 @@
<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-kafka-starter/src/main/docs/kafka-starter.adoc
b/components-starter/camel-kafka-starter/src/main/docs/kafka-starter.adoc
index 46e0cef..de92f4f 100644
--- a/components-starter/camel-kafka-starter/src/main/docs/kafka-starter.adoc
+++ b/components-starter/camel-kafka-starter/src/main/docs/kafka-starter.adoc
@@ -17,7 +17,7 @@ When using kafka with Spring Boot make sure to use the
following Maven dependenc
----
-The component supports 97 options, which are listed below.
+The component supports 98 options, which are listed below.
@@ -99,6 +99,7 @@ The component supports 97 options, which are listed below.
| *camel.component.kafka.send-buffer-bytes* | Socket write buffer size |
131072 | Integer
| *camel.component.kafka.serializer-class* | The serializer class for
messages. | org.apache.kafka.common.serialization.StringSerializer | String
| *camel.component.kafka.session-timeout-ms* | The timeout used to detect
failures when using Kafka's group management facilities. | 10000 | Integer
+| *camel.component.kafka.shutdown-timeout* | Timeout in milli seconds to wait
gracefully for the consumer or producer to shutdown and terminate its worker
threads. | 30000 | Integer
| *camel.component.kafka.specific-avro-reader* | This enables the use of a
specific Avro reader for use with the Confluent Platform schema registry and
the io.confluent.kafka.serializers.KafkaAvroDeserializer. This option is only
available in the Confluent Platform (not standard Apache Kafka) | false |
Boolean
| *camel.component.kafka.ssl-cipher-suites* | A list of cipher suites. This is
a named combination of authentication, encryption, MAC and key exchange
algorithm used to negotiate the security settings for a network connection
using TLS or SSL network protocol.By default all the available cipher suites
are supported. | | String
| *camel.component.kafka.ssl-context-parameters* | SSL configuration using a
Camel SSLContextParameters object. If configured it's applied before the other
SSL endpoint parameters. The option is a
org.apache.camel.support.jsse.SSLContextParameters type. | | String
diff --git
a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
index b179a58..9975f83 100644
---
a/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
+++
b/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
@@ -78,6 +78,11 @@ public class KafkaComponentConfiguration
*/
private Integer reconnectBackoffMaxMs = 1000;
/**
+ * Timeout in milli seconds to wait gracefully for the consumer or producer
+ * to shutdown and terminate its worker threads.
+ */
+ private Integer shutdownTimeout = 30000;
+ /**
* Whether to allow doing manual commits via KafkaManualCommit. If this
* option is enabled then an instance of KafkaManualCommit is stored on the
* Exchange message header, which allows end users to access this API and
@@ -721,6 +726,14 @@ public class KafkaComponentConfiguration
this.reconnectBackoffMaxMs = reconnectBackoffMaxMs;
}
+ public Integer getShutdownTimeout() {
+ return shutdownTimeout;
+ }
+
+ public void setShutdownTimeout(Integer shutdownTimeout) {
+ this.shutdownTimeout = shutdownTimeout;
+ }
+
public Boolean getAllowManualCommit() {
return allowManualCommit;
}
diff --git a/components-starter/camel-spring-boot-starter/pom.xml
b/components-starter/camel-spring-boot-starter/pom.xml
index a044dd9..ef4dde9 100644
--- a/components-starter/camel-spring-boot-starter/pom.xml
+++ b/components-starter/camel-spring-boot-starter/pom.xml
@@ -48,22 +48,6 @@
<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 6e257e9..5df3ca4 100644
--- a/components-starter/camel-spring-cloud-consul-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-consul-starter/pom.xml
@@ -38,26 +38,6 @@
<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 beacbb0..fbba09a 100644
--- a/components-starter/camel-spring-cloud-netflix-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-netflix-starter/pom.xml
@@ -38,26 +38,6 @@
<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 35eb6a5..0f4ff7d 100644
--- a/components-starter/camel-spring-cloud-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-starter/pom.xml
@@ -38,26 +38,6 @@
<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 b29563b..168d968 100644
--- a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
+++ b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml
@@ -38,26 +38,6 @@
<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/kafka-starter.adoc
b/docs/modules/ROOT/pages/kafka-starter.adoc
index 46e0cef..de92f4f 100644
--- a/docs/modules/ROOT/pages/kafka-starter.adoc
+++ b/docs/modules/ROOT/pages/kafka-starter.adoc
@@ -17,7 +17,7 @@ When using kafka with Spring Boot make sure to use the
following Maven dependenc
----
-The component supports 97 options, which are listed below.
+The component supports 98 options, which are listed below.
@@ -99,6 +99,7 @@ The component supports 97 options, which are listed below.
| *camel.component.kafka.send-buffer-bytes* | Socket write buffer size |
131072 | Integer
| *camel.component.kafka.serializer-class* | The serializer class for
messages. | org.apache.kafka.common.serialization.StringSerializer | String
| *camel.component.kafka.session-timeout-ms* | The timeout used to detect
failures when using Kafka's group management facilities. | 10000 | Integer
+| *camel.component.kafka.shutdown-timeout* | Timeout in milli seconds to wait
gracefully for the consumer or producer to shutdown and terminate its worker
threads. | 30000 | Integer
| *camel.component.kafka.specific-avro-reader* | This enables the use of a
specific Avro reader for use with the Confluent Platform schema registry and
the io.confluent.kafka.serializers.KafkaAvroDeserializer. This option is only
available in the Confluent Platform (not standard Apache Kafka) | false |
Boolean
| *camel.component.kafka.ssl-cipher-suites* | A list of cipher suites. This is
a named combination of authentication, encryption, MAC and key exchange
algorithm used to negotiate the security settings for a network connection
using TLS or SSL network protocol.By default all the available cipher suites
are supported. | | String
| *camel.component.kafka.ssl-context-parameters* | SSL configuration using a
Camel SSLContextParameters object. If configured it's applied before the other
SSL endpoint parameters. The option is a
org.apache.camel.support.jsse.SSLContextParameters type. | | String