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 c2ea582 Regen
c2ea582 is described below
commit c2ea582a37c0c6f6c22b01a9668376f8b7311a77
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu Mar 11 14:12:11 2021 +0100
Regen
---
.../catalog/components/google-mail-stream.json | 4 +--
.../camel/springboot/catalog/components/http.json | 2 +-
.../camel/springboot/catalog/components/https.json | 2 +-
.../springboot/catalog/components/vertx-kafka.json | 3 ++
components-starter/camel-corda-starter/pom.xml | 8 +++++
.../src/main/docs/google-mail-starter.adoc | 2 +-
.../GoogleMailStreamComponentConfiguration.java | 2 +-
components-starter/camel-iota-starter/pom.xml | 12 +++++++
components-starter/camel-slack-starter/pom.xml | 8 -----
.../src/main/docs/vertx-kafka-starter.adoc | 4 ++-
.../VertxKafkaComponentConfiguration.java | 41 ++++++++++++++++++++++
.../springboot/VertxKafkaComponentConverter.java | 2 ++
docs/modules/ROOT/pages/google-mail-starter.adoc | 2 +-
docs/modules/ROOT/pages/vertx-kafka-starter.adoc | 4 ++-
tooling/camel-spring-boot-dependencies/pom.xml | 25 +++++++++++++
15 files changed, 104 insertions(+), 17 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-mail-stream.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-mail-stream.json
index 888255d..d061053 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-mail-stream.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-mail-stream.json
@@ -26,7 +26,7 @@
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 me [...]
"clientId": { "kind": "property", "displayName": "Client Id", "group":
"consumer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration",
"configurationField": "configuration", "description": "Client ID of the mail
application" },
"labels": { "kind": "property", "displayName": "Labels", "group":
"consumer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration",
"configurationField": "configuration", "description": "Comma separated list of
labels to take into account" },
- "markAsRead": { "kind": "property", "displayName": "Mark As Read",
"group": "consumer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration",
"configurationField": "configuration", "description": "Mark the message as read
once it has been consumed" },
+ "markAsRead": { "kind": "property", "displayName": "Mark As Read",
"group": "consumer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration",
"configurationField": "configuration", "description": "Mark the message as read
once it has been consumed" },
"maxResults": { "kind": "property", "displayName": "Max Results", "group":
"consumer", "label": "", "required": false, "type": "integer", "javaType":
"long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 10, "configurationClass":
"org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration",
"configurationField": "configuration", "description": "Max results to be
returned" },
"query": { "kind": "property", "displayName": "Query", "group":
"consumer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "is:unread", "configurationClass":
"org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration",
"configurationField": "configuration", "description": "The query to execute on
gmail box" },
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
@@ -42,7 +42,7 @@
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 m [...]
"clientId": { "kind": "parameter", "displayName": "Client Id", "group":
"consumer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration",
"configurationField": "configuration", "description": "Client ID of the mail
application" },
"labels": { "kind": "parameter", "displayName": "Labels", "group":
"consumer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration",
"configurationField": "configuration", "description": "Comma separated list of
labels to take into account" },
- "markAsRead": { "kind": "parameter", "displayName": "Mark As Read",
"group": "consumer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration",
"configurationField": "configuration", "description": "Mark the message as read
once it has been consumed" },
+ "markAsRead": { "kind": "parameter", "displayName": "Mark As Read",
"group": "consumer", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration",
"configurationField": "configuration", "description": "Mark the message as read
once it has been consumed" },
"maxResults": { "kind": "parameter", "displayName": "Max Results",
"group": "consumer", "label": "", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 10, "configurationClass":
"org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration",
"configurationField": "configuration", "description": "Max results to be
returned" },
"query": { "kind": "parameter", "displayName": "Query", "group":
"consumer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "is:unread", "configurationClass":
"org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration",
"configurationField": "configuration", "description": "The query to execute on
gmail box" },
"sendEmptyMessageWhenIdle": { "kind": "parameter", "displayName": "Send
Empty Message When Idle", "group": "consumer", "label": "consumer", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false, "description": "If
the polling consumer did not poll any files, you can enable this option to send
an empty message (no body) instead." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
index 267469f..51a0a60 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/http.json
@@ -15,7 +15,7 @@
"scheme": "http",
"extendsScheme": "",
"alternativeSchemes": "http,https",
- "syntax": "http:httpUri",
+ "syntax": "http:\/\/httpUri",
"async": false,
"api": false,
"consumerOnly": false,
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
index d170241..c238fc5 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/https.json
@@ -15,7 +15,7 @@
"scheme": "https",
"extendsScheme": "",
"alternativeSchemes": "http,https",
- "syntax": "https:httpUri",
+ "syntax": "https:\/\/httpUri",
"async": false,
"api": false,
"consumerOnly": false,
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-kafka.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-kafka.json
index 809d05f..8db6a01 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-kafka.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/vertx-kafka.json
@@ -45,6 +45,7 @@
"socketConnectionSetupTimeoutMaxMs": { "kind": "property", "displayName":
"Socket Connection Setup Timeout Max Ms", "group": "common", "label": "common",
"required": false, "type": "duration", "javaType": "long", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "2m7s",
"configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "The maximum amount of
time the clien [...]
"socketConnectionSetupTimeoutMs": { "kind": "property", "displayName":
"Socket Connection Setup Timeout Ms", "group": "common", "label": "common",
"required": false, "type": "duration", "javaType": "long", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "10s",
"configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "The amount of time the
client will wait for [...]
"allowAutoCreateTopics": { "kind": "property", "displayName": "Allow Auto
Create Topics", "group": "consumer", "label": "consumer", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "Allow automatic topic
creation on the broker when subscrib [...]
+ "allowManualCommit": { "kind": "property", "displayName": "Allow Manual
Commit", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "Whether to allow doing
manual commits via org.apache.camel.compone [...]
"autoCommitIntervalMs": { "kind": "property", "displayName": "Auto Commit
Interval Ms", "group": "consumer", "label": "consumer", "required": false,
"type": "duration", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "5s", "configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "The frequency in
milliseconds that the consumer offsets are aut [...]
"autoOffsetReset": { "kind": "property", "displayName": "Auto Offset
Reset", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "enum": [ "latest", "earliest",
"none" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "latest", "configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "What to do when t [...]
"bridgeErrorHandler": { "kind": "property", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 me [...]
@@ -69,6 +70,7 @@
"seekToPosition": { "kind": "property", "displayName": "Seek To Position",
"group": "consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "enum": [ "beginning", "end" ], "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "Set if KafkaConsumer
will read from beginning or end on [...]
"sessionTimeoutMs": { "kind": "property", "displayName": "Session Timeout
Ms", "group": "consumer", "label": "consumer", "required": false, "type":
"duration", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "10s", "configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "The timeout used to
detect client failures when using Kafka's group man [...]
"valueDeserializer": { "kind": "property", "displayName": "Value
Deserializer", "group": "consumer", "label": "consumer", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue":
"org.apache.kafka.common.serialization.StringDeserializer",
"configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "Deseri [...]
+ "kafkaManualCommitFactory": { "kind": "property", "displayName": "Kafka
Manual Commit Factory", "group": "consumer (advanced)", "label":
"consumer,advanced", "required": false, "type": "object", "javaType":
"org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommitFactory",
"deprecated": false, "autowired": true, "secret": false, "description":
"Factory to use for creating
org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit instances.
This allows to plugin [...]
"acks": { "kind": "property", "displayName": "Acks", "group": "producer",
"label": "producer", "required": false, "type": "string", "javaType":
"java.lang.String", "enum": [ "all", "-1", "0", "1" ], "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "1", "configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "The number of
acknowledgments the producer requires t [...]
"batchSize": { "kind": "property", "displayName": "Batch Size", "group":
"producer", "label": "producer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 16384, "configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "The producer will
attempt to batch records together into fewer requests whenever multip [...]
"bufferMemory": { "kind": "property", "displayName": "Buffer Memory",
"group": "producer", "label": "producer", "required": false, "type": "integer",
"javaType": "long", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": 33554432, "configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "The total bytes of
memory the producer can use to buffer records waiting to b [...]
@@ -151,6 +153,7 @@
"socketConnectionSetupTimeoutMaxMs": { "kind": "parameter", "displayName":
"Socket Connection Setup Timeout Max Ms", "group": "common", "label": "common",
"required": false, "type": "duration", "javaType": "long", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "2m7s",
"configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "The maximum amount of
time the clie [...]
"socketConnectionSetupTimeoutMs": { "kind": "parameter", "displayName":
"Socket Connection Setup Timeout Ms", "group": "common", "label": "common",
"required": false, "type": "duration", "javaType": "long", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "10s",
"configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "The amount of time the
client will wait for [...]
"allowAutoCreateTopics": { "kind": "parameter", "displayName": "Allow Auto
Create Topics", "group": "consumer", "label": "consumer", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "Allow automatic topic
creation on the broker when subscri [...]
+ "allowManualCommit": { "kind": "parameter", "displayName": "Allow Manual
Commit", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "Whether to allow doing
manual commits via org.apache.camel.compon [...]
"autoCommitIntervalMs": { "kind": "parameter", "displayName": "Auto Commit
Interval Ms", "group": "consumer", "label": "consumer", "required": false,
"type": "duration", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "5s", "configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "The frequency in
milliseconds that the consumer offsets are au [...]
"autoOffsetReset": { "kind": "parameter", "displayName": "Auto Offset
Reset", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "enum": [ "latest", "earliest",
"none" ], "deprecated": false, "autowired": false, "secret": false,
"defaultValue": "latest", "configurationClass":
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration",
"configurationField": "configuration", "description": "What to do when [...]
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 m [...]
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index b215b27..4aa7023 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -41,6 +41,14 @@
<!--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>
+ <exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
diff --git
a/components-starter/camel-google-mail-starter/src/main/docs/google-mail-starter.adoc
b/components-starter/camel-google-mail-starter/src/main/docs/google-mail-starter.adoc
index 85bce02..549d541 100644
---
a/components-starter/camel-google-mail-starter/src/main/docs/google-mail-starter.adoc
+++
b/components-starter/camel-google-mail-starter/src/main/docs/google-mail-starter.adoc
@@ -34,7 +34,7 @@ The component supports 25 options, which are listed below.
| *camel.component.google-mail-stream.configuration* | The configuration. The
option is a
org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration
type. | | GoogleMailStreamConfiguration
| *camel.component.google-mail-stream.enabled* | Whether to enable auto
configuration of the google-mail-stream component. This is enabled by default.
| | Boolean
| *camel.component.google-mail-stream.labels* | Comma separated list of labels
to take into account | | String
-| *camel.component.google-mail-stream.mark-as-read* | Mark the message as read
once it has been consumed | false | Boolean
+| *camel.component.google-mail-stream.mark-as-read* | Mark the message as read
once it has been consumed | true | Boolean
| *camel.component.google-mail-stream.max-results* | Max results to be
returned | 10 | Long
| *camel.component.google-mail-stream.query* | The query to execute on gmail
box | is:unread | String
| *camel.component.google-mail-stream.refresh-token* | OAuth 2 refresh token.
Using this, the Google Calendar component can obtain a new accessToken whenever
the current one expires - a necessity if the application is long-lived. | |
String
diff --git
a/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
b/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
index f7e7155..26bde76 100644
---
a/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
+++
b/components-starter/camel-google-mail-starter/src/main/java/org/apache/camel/component/google/mail/stream/springboot/GoogleMailStreamComponentConfiguration.java
@@ -62,7 +62,7 @@ public class GoogleMailStreamComponentConfiguration
/**
* Mark the message as read once it has been consumed
*/
- private Boolean markAsRead = false;
+ private Boolean markAsRead = true;
/**
* Max results to be returned
*/
diff --git a/components-starter/camel-iota-starter/pom.xml
b/components-starter/camel-iota-starter/pom.xml
index 1cdd52f..3656ac0 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-iota</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-slack-starter/pom.xml
b/components-starter/camel-slack-starter/pom.xml
index da6ab1a..fe2a269 100644
--- a/components-starter/camel-slack-starter/pom.xml
+++ b/components-starter/camel-slack-starter/pom.xml
@@ -38,14 +38,6 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-slack</artifactId>
<version>${camel-version}</version>
- <!--START OF GENERATED CODE-->
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/components-starter/camel-vertx-kafka-starter/src/main/docs/vertx-kafka-starter.adoc
b/components-starter/camel-vertx-kafka-starter/src/main/docs/vertx-kafka-starter.adoc
index ff57de6..098a7c5 100644
---
a/components-starter/camel-vertx-kafka-starter/src/main/docs/vertx-kafka-starter.adoc
+++
b/components-starter/camel-vertx-kafka-starter/src/main/docs/vertx-kafka-starter.adoc
@@ -17,7 +17,7 @@ When using vertx-kafka with Spring Boot make sure to use the
following Maven dep
----
-The component supports 105 options, which are listed below.
+The component supports 107 options, which are listed below.
@@ -27,6 +27,7 @@ The component supports 105 options, which are listed below.
| *camel.component.vertx-kafka.acks* | The number of acknowledgments the
producer requires the leader to have received before considering a request
complete. This controls the durability of records that are sent. The following
settings are allowed: acks=0 If set to zero then the producer will not wait for
any acknowledgment from the server at all. The record will be immediately added
to the socket buffer and considered sent. No guarantee can be made that the
server has received the recor [...]
| *camel.component.vertx-kafka.additional-properties* | Sets additional
properties for either kafka consumer or kafka producer in case they can't be
set directly on the camel configurations (e.g: new Kafka properties that are
not reflected yet in Camel configurations), the properties have to be prefixed
with additionalProperties.. E.g:
additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=\http://localhost:8811/avro
| | Map
| *camel.component.vertx-kafka.allow-auto-create-topics* | Allow automatic
topic creation on the broker when subscribing to or assigning a topic. A topic
being subscribed to will be automatically created only if the broker allows for
it using auto.create.topics.enable broker configuration. This configuration
must be set to false when using brokers older than 0.11.0 | true | Boolean
+| *camel.component.vertx-kafka.allow-manual-commit* | Whether to allow doing
manual commits via
org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit. If this
option is enabled then an instance of
org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit is stored
on the Exchange message header, which allows end users to access this API and
perform manual offset commits via the Kafka consumer. Note: To take full
control of the offset committing, you may need to [...]
| *camel.component.vertx-kafka.auto-commit-interval-ms* | The frequency in
milliseconds that the consumer offsets are auto-committed to Kafka if
enable.auto.commit is set to true. The option is a int type. | 5000 | Integer
| *camel.component.vertx-kafka.auto-offset-reset* | What to do when there is
no initial offset in Kafka or if the current offset does not exist any more on
the server (e.g. because that data has been deleted): earliest: automatically
reset the offset to the earliest offsetlatest: automatically reset the offset
to the latest offsetnone: throw exception to the consumer if no previous offset
is found for the consumer's groupanything else: throw exception to the
consumer. | latest | String
| *camel.component.vertx-kafka.autowired-enabled* | Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which then gets configured on the component. This
can be used for automatic configuring JDBC data sources, JMS connection
factories, AWS Clients, etc. | true | Boolean
@@ -56,6 +57,7 @@ The component supports 105 options, which are listed below.
| *camel.component.vertx-kafka.heartbeat-interval-ms* | The expected time
between heartbeats to the consumer coordinator when using Kafka's group
management facilities. Heartbeats are used to ensure that the consumer's
session stays active and to facilitate rebalancing when new consumers join or
leave the group. The value must be set lower than session.timeout.ms, but
typically should be set no higher than 1/3 of that value. It can be adjusted
even lower to control the expected time for [...]
| *camel.component.vertx-kafka.interceptor-classes* | A list of classes to use
as interceptors. Implementing the
org.apache.kafka.clients.producer.ProducerInterceptor interface allows you to
intercept (and possibly mutate) the records received by the producer before
they are published to the Kafka cluster. By default, there are no interceptors.
| | String
| *camel.component.vertx-kafka.isolation-level* | Controls how to read
messages written transactionally. If set to read_committed, consumer.poll()
will only return transactional messages which have been committed. If set to
read_uncommitted' (the default), consumer.poll() will return all messages, even
transactional messages which have been aborted. Non-transactional messages will
be returned unconditionally in either mode. Messages will always be returned in
offset order. Hence, in read [...]
+| *camel.component.vertx-kafka.kafka-manual-commit-factory* | Factory to use
for creating
org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit instances.
This allows to plugin a custom factory to create custom
org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit instances
in case special logic is needed when doing manual commits that deviates from
the default implementation that comes out of the box. The option is a
org.apache.camel.component.vertx.kafka.o [...]
| *camel.component.vertx-kafka.key-deserializer* | Deserializer class for key
that implements the org.apache.kafka.common.serialization.Deserializer
interface. | org.apache.kafka.common.serialization.StringDeserializer | String
| *camel.component.vertx-kafka.key-serializer* | Serializer class for key that
implements the org.apache.kafka.common.serialization.Serializer interface. |
org.apache.kafka.common.serialization.StringSerializer | String
| *camel.component.vertx-kafka.lazy-start-producer* | 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 route to fail being started.
By deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processe [...]
diff --git
a/components-starter/camel-vertx-kafka-starter/src/main/java/org/apache/camel/component/vertx/kafka/springboot/VertxKafkaComponentConfiguration.java
b/components-starter/camel-vertx-kafka-starter/src/main/java/org/apache/camel/component/vertx/kafka/springboot/VertxKafkaComponentConfiguration.java
index eba4156..ce04a5e 100644
---
a/components-starter/camel-vertx-kafka-starter/src/main/java/org/apache/camel/component/vertx/kafka/springboot/VertxKafkaComponentConfiguration.java
+++
b/components-starter/camel-vertx-kafka-starter/src/main/java/org/apache/camel/component/vertx/kafka/springboot/VertxKafkaComponentConfiguration.java
@@ -22,6 +22,7 @@ import io.vertx.core.Vertx;
import io.vertx.core.VertxOptions;
import org.apache.camel.component.vertx.kafka.VertxKafkaClientFactory;
import
org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration;
+import
org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommitFactory;
import org.apache.camel.spi.HeaderFilterStrategy;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -206,6 +207,18 @@ public class VertxKafkaComponentConfiguration
*/
private Boolean allowAutoCreateTopics = true;
/**
+ * Whether to allow doing manual commits via
+ * org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit. If
+ * this option is enabled then an instance of
+ * org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit is
+ * stored on the Exchange message header, which allows end users to access
+ * this API and perform manual offset commits via the Kafka consumer. Note:
+ * To take full control of the offset committing, you may need to disable
+ * the Kafka Consumer default auto commit behavior by setting
+ * 'enableAutoCommit' to 'false'.
+ */
+ private Boolean allowManualCommit = false;
+ /**
* The frequency in milliseconds that the consumer offsets are
* auto-committed to Kafka if enable.auto.commit is set to true. The option
* is a int type.
@@ -403,6 +416,17 @@ public class VertxKafkaComponentConfiguration
*/
private String valueDeserializer =
"org.apache.kafka.common.serialization.StringDeserializer";
/**
+ * Factory to use for creating
+ * org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit
+ * instances. This allows to plugin a custom factory to create custom
+ * org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit
+ * instances in case special logic is needed when doing manual commits that
+ * deviates from the default implementation that comes out of the box. The
+ * option is a
+ *
org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommitFactory
type.
+ */
+ private VertxKafkaManualCommitFactory kafkaManualCommitFactory;
+ /**
* The number of acknowledgments the producer requires the leader to have
* received before considering a request complete. This controls the
* durability of records that are sent. The following settings are allowed:
@@ -1038,6 +1062,14 @@ public class VertxKafkaComponentConfiguration
this.allowAutoCreateTopics = allowAutoCreateTopics;
}
+ public Boolean getAllowManualCommit() {
+ return allowManualCommit;
+ }
+
+ public void setAllowManualCommit(Boolean allowManualCommit) {
+ this.allowManualCommit = allowManualCommit;
+ }
+
public Integer getAutoCommitIntervalMs() {
return autoCommitIntervalMs;
}
@@ -1231,6 +1263,15 @@ public class VertxKafkaComponentConfiguration
this.valueDeserializer = valueDeserializer;
}
+ public VertxKafkaManualCommitFactory getKafkaManualCommitFactory() {
+ return kafkaManualCommitFactory;
+ }
+
+ public void setKafkaManualCommitFactory(
+ VertxKafkaManualCommitFactory kafkaManualCommitFactory) {
+ this.kafkaManualCommitFactory = kafkaManualCommitFactory;
+ }
+
public String getAcks() {
return acks;
}
diff --git
a/components-starter/camel-vertx-kafka-starter/src/main/java/org/apache/camel/component/vertx/kafka/springboot/VertxKafkaComponentConverter.java
b/components-starter/camel-vertx-kafka-starter/src/main/java/org/apache/camel/component/vertx/kafka/springboot/VertxKafkaComponentConverter.java
index 1409d1c..f190f3a 100644
---
a/components-starter/camel-vertx-kafka-starter/src/main/java/org/apache/camel/component/vertx/kafka/springboot/VertxKafkaComponentConverter.java
+++
b/components-starter/camel-vertx-kafka-starter/src/main/java/org/apache/camel/component/vertx/kafka/springboot/VertxKafkaComponentConverter.java
@@ -43,6 +43,7 @@ public class VertxKafkaComponentConverter implements
GenericConverter {
Set<ConvertiblePair> answer = new LinkedHashSet<>();
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.spi.HeaderFilterStrategy.class));
+ answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommitFactory.class));
answer.add(new ConvertiblePair(String.class,
io.vertx.core.Vertx.class));
answer.add(new ConvertiblePair(String.class,
org.apache.camel.component.vertx.kafka.VertxKafkaClientFactory.class));
answer.add(new ConvertiblePair(String.class,
io.vertx.core.VertxOptions.class));
@@ -64,6 +65,7 @@ public class VertxKafkaComponentConverter implements
GenericConverter {
switch (targetType.getName()) {
case
"org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration":
return applicationContext.getBean(ref,
org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration.class);
case "org.apache.camel.spi.HeaderFilterStrategy": return
applicationContext.getBean(ref,
org.apache.camel.spi.HeaderFilterStrategy.class);
+ case
"org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommitFactory":
return applicationContext.getBean(ref,
org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommitFactory.class);
case "io.vertx.core.Vertx": return applicationContext.getBean(ref,
io.vertx.core.Vertx.class);
case
"org.apache.camel.component.vertx.kafka.VertxKafkaClientFactory": return
applicationContext.getBean(ref,
org.apache.camel.component.vertx.kafka.VertxKafkaClientFactory.class);
case "io.vertx.core.VertxOptions": return
applicationContext.getBean(ref, io.vertx.core.VertxOptions.class);
diff --git a/docs/modules/ROOT/pages/google-mail-starter.adoc
b/docs/modules/ROOT/pages/google-mail-starter.adoc
index 85bce02..549d541 100644
--- a/docs/modules/ROOT/pages/google-mail-starter.adoc
+++ b/docs/modules/ROOT/pages/google-mail-starter.adoc
@@ -34,7 +34,7 @@ The component supports 25 options, which are listed below.
| *camel.component.google-mail-stream.configuration* | The configuration. The
option is a
org.apache.camel.component.google.mail.stream.GoogleMailStreamConfiguration
type. | | GoogleMailStreamConfiguration
| *camel.component.google-mail-stream.enabled* | Whether to enable auto
configuration of the google-mail-stream component. This is enabled by default.
| | Boolean
| *camel.component.google-mail-stream.labels* | Comma separated list of labels
to take into account | | String
-| *camel.component.google-mail-stream.mark-as-read* | Mark the message as read
once it has been consumed | false | Boolean
+| *camel.component.google-mail-stream.mark-as-read* | Mark the message as read
once it has been consumed | true | Boolean
| *camel.component.google-mail-stream.max-results* | Max results to be
returned | 10 | Long
| *camel.component.google-mail-stream.query* | The query to execute on gmail
box | is:unread | String
| *camel.component.google-mail-stream.refresh-token* | OAuth 2 refresh token.
Using this, the Google Calendar component can obtain a new accessToken whenever
the current one expires - a necessity if the application is long-lived. | |
String
diff --git a/docs/modules/ROOT/pages/vertx-kafka-starter.adoc
b/docs/modules/ROOT/pages/vertx-kafka-starter.adoc
index ff57de6..098a7c5 100644
--- a/docs/modules/ROOT/pages/vertx-kafka-starter.adoc
+++ b/docs/modules/ROOT/pages/vertx-kafka-starter.adoc
@@ -17,7 +17,7 @@ When using vertx-kafka with Spring Boot make sure to use the
following Maven dep
----
-The component supports 105 options, which are listed below.
+The component supports 107 options, which are listed below.
@@ -27,6 +27,7 @@ The component supports 105 options, which are listed below.
| *camel.component.vertx-kafka.acks* | The number of acknowledgments the
producer requires the leader to have received before considering a request
complete. This controls the durability of records that are sent. The following
settings are allowed: acks=0 If set to zero then the producer will not wait for
any acknowledgment from the server at all. The record will be immediately added
to the socket buffer and considered sent. No guarantee can be made that the
server has received the recor [...]
| *camel.component.vertx-kafka.additional-properties* | Sets additional
properties for either kafka consumer or kafka producer in case they can't be
set directly on the camel configurations (e.g: new Kafka properties that are
not reflected yet in Camel configurations), the properties have to be prefixed
with additionalProperties.. E.g:
additionalProperties.transactional.id=12345&additionalProperties.schema.registry.url=\http://localhost:8811/avro
| | Map
| *camel.component.vertx-kafka.allow-auto-create-topics* | Allow automatic
topic creation on the broker when subscribing to or assigning a topic. A topic
being subscribed to will be automatically created only if the broker allows for
it using auto.create.topics.enable broker configuration. This configuration
must be set to false when using brokers older than 0.11.0 | true | Boolean
+| *camel.component.vertx-kafka.allow-manual-commit* | Whether to allow doing
manual commits via
org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit. If this
option is enabled then an instance of
org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit is stored
on the Exchange message header, which allows end users to access this API and
perform manual offset commits via the Kafka consumer. Note: To take full
control of the offset committing, you may need to [...]
| *camel.component.vertx-kafka.auto-commit-interval-ms* | The frequency in
milliseconds that the consumer offsets are auto-committed to Kafka if
enable.auto.commit is set to true. The option is a int type. | 5000 | Integer
| *camel.component.vertx-kafka.auto-offset-reset* | What to do when there is
no initial offset in Kafka or if the current offset does not exist any more on
the server (e.g. because that data has been deleted): earliest: automatically
reset the offset to the earliest offsetlatest: automatically reset the offset
to the latest offsetnone: throw exception to the consumer if no previous offset
is found for the consumer's groupanything else: throw exception to the
consumer. | latest | String
| *camel.component.vertx-kafka.autowired-enabled* | Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which then gets configured on the component. This
can be used for automatic configuring JDBC data sources, JMS connection
factories, AWS Clients, etc. | true | Boolean
@@ -56,6 +57,7 @@ The component supports 105 options, which are listed below.
| *camel.component.vertx-kafka.heartbeat-interval-ms* | The expected time
between heartbeats to the consumer coordinator when using Kafka's group
management facilities. Heartbeats are used to ensure that the consumer's
session stays active and to facilitate rebalancing when new consumers join or
leave the group. The value must be set lower than session.timeout.ms, but
typically should be set no higher than 1/3 of that value. It can be adjusted
even lower to control the expected time for [...]
| *camel.component.vertx-kafka.interceptor-classes* | A list of classes to use
as interceptors. Implementing the
org.apache.kafka.clients.producer.ProducerInterceptor interface allows you to
intercept (and possibly mutate) the records received by the producer before
they are published to the Kafka cluster. By default, there are no interceptors.
| | String
| *camel.component.vertx-kafka.isolation-level* | Controls how to read
messages written transactionally. If set to read_committed, consumer.poll()
will only return transactional messages which have been committed. If set to
read_uncommitted' (the default), consumer.poll() will return all messages, even
transactional messages which have been aborted. Non-transactional messages will
be returned unconditionally in either mode. Messages will always be returned in
offset order. Hence, in read [...]
+| *camel.component.vertx-kafka.kafka-manual-commit-factory* | Factory to use
for creating
org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit instances.
This allows to plugin a custom factory to create custom
org.apache.camel.component.vertx.kafka.offset.VertxKafkaManualCommit instances
in case special logic is needed when doing manual commits that deviates from
the default implementation that comes out of the box. The option is a
org.apache.camel.component.vertx.kafka.o [...]
| *camel.component.vertx-kafka.key-deserializer* | Deserializer class for key
that implements the org.apache.kafka.common.serialization.Deserializer
interface. | org.apache.kafka.common.serialization.StringDeserializer | String
| *camel.component.vertx-kafka.key-serializer* | Serializer class for key that
implements the org.apache.kafka.common.serialization.Serializer interface. |
org.apache.kafka.common.serialization.StringSerializer | String
| *camel.component.vertx-kafka.lazy-start-producer* | 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 route to fail being started.
By deferring this startup to be lazy then the startup failure can be handled
during routing messages via Camel's routing error handlers. Beware that when
the first message is processe [...]
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 4ccd176..76df4f7 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -2059,6 +2059,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-aws-parent</artifactId>
+ <version>3.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-aws-xray</artifactId>
<version>3.9.0-SNAPSHOT</version>
</dependency>
@@ -2164,6 +2169,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-azure-parent</artifactId>
+ <version>3.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-azure-storage-blob</artifactId>
<version>3.9.0-SNAPSHOT</version>
</dependency>
@@ -2459,6 +2469,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-debezium-common-parent</artifactId>
+ <version>3.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-debezium-maven-plugin</artifactId>
<version>3.9.0-SNAPSHOT</version>
</dependency>
@@ -2679,6 +2694,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-google-parent</artifactId>
+ <version>3.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-google-pubsub</artifactId>
<version>3.9.0-SNAPSHOT</version>
</dependency>
@@ -3144,6 +3164,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-microprofile-parent</artifactId>
+ <version>3.9.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-milo</artifactId>
<version>3.9.0-SNAPSHOT</version>
</dependency>
