This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new f5510cd Regen and sync deps
f5510cd is described below
commit f5510cd40f5784dfb81132a1ee0ed5c5528e3884
Author: Andrea Cosentino <[email protected]>
AuthorDate: Tue Jun 15 14:33:53 2021 +0200
Regen and sync deps
---
.../camel/springboot/catalog/components/kafka.json | 2 ++
.../src/main/docs/kafka-starter.adoc | 3 ++-
.../kafka/springboot/KafkaComponentConfiguration.java | 19 +++++++++++++++++++
docs/modules/ROOT/pages/kafka-starter.adoc | 3 ++-
tooling/camel-spring-boot-dependencies/pom.xml | 13 +++++++++----
5 files changed, 34 insertions(+), 6 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 02de12e..9417fb5 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
@@ -44,6 +44,7 @@
"fetchMinBytes": { "kind": "property", "displayName": "Fetch Min Bytes",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "1", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The minimum amount of data the server should
return for a fetch request. If insufficient da [...]
"fetchWaitMaxMs": { "kind": "property", "displayName": "Fetch Wait Max
Ms", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "500", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The maximum amount of time the server will
block before answering the fetch request if [...]
"groupId": { "kind": "property", "displayName": "Group Id", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "A string that uniquely identifies the group of
consumer processes to which this consumer belongs. By setting the same group id
[...]
+ "groupInstanceId": { "kind": "property", "displayName": "Group Instance
Id", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "A unique identifier of the consumer instance
provided by the end user. Only non-empty strings are permitted. I [...]
"headerDeserializer": { "kind": "property", "displayName": "Header
Deserializer", "group": "consumer", "label": "consumer", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.kafka.serde.KafkaHeaderDeserializer", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "To use a custom KafkaHeaderDeserializer to
deserialize kafk [...]
"heartbeatIntervalMs": { "kind": "property", "displayName": "Heartbeat
Interval Ms", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "3000",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The expected time
between heartbeats to the consumer coordinator when using [...]
"keyDeserializer": { "kind": "property", "displayName": "Key
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.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "Deserializer class for
key that imp [...]
@@ -148,6 +149,7 @@
"fetchMinBytes": { "kind": "parameter", "displayName": "Fetch Min Bytes",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "java.lang.Integer", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "1", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The minimum amount of data the server should
return for a fetch request. If insufficient d [...]
"fetchWaitMaxMs": { "kind": "parameter", "displayName": "Fetch Wait Max
Ms", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "500", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The maximum amount of time the server will
block before answering the fetch request i [...]
"groupId": { "kind": "parameter", "displayName": "Group Id", "group":
"consumer", "label": "consumer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "A string that uniquely identifies the group of
consumer processes to which this consumer belongs. By setting the same group id
[...]
+ "groupInstanceId": { "kind": "parameter", "displayName": "Group Instance
Id", "group": "consumer", "label": "consumer", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "A unique identifier of the consumer instance
provided by the end user. Only non-empty strings are permitted. [...]
"headerDeserializer": { "kind": "parameter", "displayName": "Header
Deserializer", "group": "consumer", "label": "consumer", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.kafka.serde.KafkaHeaderDeserializer", "deprecated":
false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "To use a custom KafkaHeaderDeserializer to
deserialize kaf [...]
"heartbeatIntervalMs": { "kind": "parameter", "displayName": "Heartbeat
Interval Ms", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "3000",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The expected time
between heartbeats to the consumer coordinator when using [...]
"keyDeserializer": { "kind": "parameter", "displayName": "Key
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.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "Deserializer class for
key that im [...]
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 3b6907e..3209c75 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 103 options, which are listed below.
+The component supports 104 options, which are listed below.
@@ -50,6 +50,7 @@ The component supports 103 options, which are listed below.
| *camel.component.kafka.fetch-min-bytes* | The minimum amount of data the
server should return for a fetch request. If insufficient data is available the
request will wait for that much data to accumulate before answering the
request. | 1 | Integer
| *camel.component.kafka.fetch-wait-max-ms* | The maximum amount of time the
server will block before answering the fetch request if there isn't sufficient
data to immediately satisfy fetch.min.bytes | 500 | Integer
| *camel.component.kafka.group-id* | A string that uniquely identifies the
group of consumer processes to which this consumer belongs. By setting the same
group id multiple processes indicate that they are all part of the same
consumer group. This option is required for consumers. | | String
+| *camel.component.kafka.group-instance-id* | A unique identifier of the
consumer instance provided by the end user. Only non-empty strings are
permitted. If set, the consumer is treated as a static member, which means that
only one instance with this ID is allowed in the consumer group at any time.
This can be used in combination with a larger session timeout to avoid group
rebalances caused by transient unavailability (e.g. process restarts). If not
set, the consumer will join the grou [...]
| *camel.component.kafka.header-deserializer* | To use a custom
KafkaHeaderDeserializer to deserialize kafka headers values. The option is a
org.apache.camel.component.kafka.serde.KafkaHeaderDeserializer type. | |
KafkaHeaderDeserializer
| *camel.component.kafka.header-filter-strategy* | To use a custom
HeaderFilterStrategy to filter header to and from Camel message. The option is
a org.apache.camel.spi.HeaderFilterStrategy type. | | HeaderFilterStrategy
| *camel.component.kafka.header-serializer* | To use a custom
KafkaHeaderSerializer to serialize kafka headers values. The option is a
org.apache.camel.component.kafka.serde.KafkaHeaderSerializer type. | |
KafkaHeaderSerializer
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 7dc6798..461daf3 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
@@ -197,6 +197,17 @@ public class KafkaComponentConfiguration
*/
private String groupId;
/**
+ * A unique identifier of the consumer instance provided by the end user.
+ * Only non-empty strings are permitted. If set, the consumer is treated as
+ * a static member, which means that only one instance with this ID is
+ * allowed in the consumer group at any time. This can be used in
+ * combination with a larger session timeout to avoid group rebalances
+ * caused by transient unavailability (e.g. process restarts). If not set,
+ * the consumer will join the group as a dynamic member, which is the
+ * traditional behavior.
+ */
+ private String groupInstanceId;
+ /**
* To use a custom KafkaHeaderDeserializer to deserialize kafka headers
* values. The option is a
* org.apache.camel.component.kafka.serde.KafkaHeaderDeserializer type.
@@ -913,6 +924,14 @@ public class KafkaComponentConfiguration
this.groupId = groupId;
}
+ public String getGroupInstanceId() {
+ return groupInstanceId;
+ }
+
+ public void setGroupInstanceId(String groupInstanceId) {
+ this.groupInstanceId = groupInstanceId;
+ }
+
public KafkaHeaderDeserializer getHeaderDeserializer() {
return headerDeserializer;
}
diff --git a/docs/modules/ROOT/pages/kafka-starter.adoc
b/docs/modules/ROOT/pages/kafka-starter.adoc
index 3b6907e..3209c75 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 103 options, which are listed below.
+The component supports 104 options, which are listed below.
@@ -50,6 +50,7 @@ The component supports 103 options, which are listed below.
| *camel.component.kafka.fetch-min-bytes* | The minimum amount of data the
server should return for a fetch request. If insufficient data is available the
request will wait for that much data to accumulate before answering the
request. | 1 | Integer
| *camel.component.kafka.fetch-wait-max-ms* | The maximum amount of time the
server will block before answering the fetch request if there isn't sufficient
data to immediately satisfy fetch.min.bytes | 500 | Integer
| *camel.component.kafka.group-id* | A string that uniquely identifies the
group of consumer processes to which this consumer belongs. By setting the same
group id multiple processes indicate that they are all part of the same
consumer group. This option is required for consumers. | | String
+| *camel.component.kafka.group-instance-id* | A unique identifier of the
consumer instance provided by the end user. Only non-empty strings are
permitted. If set, the consumer is treated as a static member, which means that
only one instance with this ID is allowed in the consumer group at any time.
This can be used in combination with a larger session timeout to avoid group
rebalances caused by transient unavailability (e.g. process restarts). If not
set, the consumer will join the grou [...]
| *camel.component.kafka.header-deserializer* | To use a custom
KafkaHeaderDeserializer to deserialize kafka headers values. The option is a
org.apache.camel.component.kafka.serde.KafkaHeaderDeserializer type. | |
KafkaHeaderDeserializer
| *camel.component.kafka.header-filter-strategy* | To use a custom
HeaderFilterStrategy to filter header to and from Camel message. The option is
a org.apache.camel.spi.HeaderFilterStrategy type. | | HeaderFilterStrategy
| *camel.component.kafka.header-serializer* | To use a custom
KafkaHeaderSerializer to serialize kafka headers values. The option is a
org.apache.camel.component.kafka.serde.KafkaHeaderSerializer type. | |
KafkaHeaderSerializer
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index ab417e1..b858257 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -3059,6 +3059,11 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
+ <artifactId>camel-huawei-parent</artifactId>
+ <version>3.11.0-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
<artifactId>camel-huaweicloud-functiongraph</artifactId>
<version>3.11.0-SNAPSHOT</version>
</dependency>
@@ -4565,22 +4570,22 @@
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>fontbox</artifactId>
- <version>2.0.23</version>
+ <version>2.0.24</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox</artifactId>
- <version>2.0.23</version>
+ <version>2.0.24</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox-debugger</artifactId>
- <version>2.0.23</version>
+ <version>2.0.24</version>
</dependency>
<dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>pdfbox-tools</artifactId>
- <version>2.0.23</version>
+ <version>2.0.24</version>
</dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
