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 d01da43d211 Regen
d01da43d211 is described below
commit d01da43d21178507c10e98c8e1713f1c87561af9
Author: Andrea Cosentino <[email protected]>
AuthorDate: Fri Jan 27 11:17:07 2023 +0100
Regen
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../org/apache/camel/springboot/catalog/components/kafka.json | 4 ++--
.../org/apache/camel/springboot/catalog/dataformats.properties | 2 +-
components-starter/camel-kafka-starter/src/main/docs/kafka.json | 2 +-
.../camel/component/kafka/springboot/KafkaComponentConfiguration.java | 4 ++--
4 files changed, 6 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 17b77d93358..8e6742ef355 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
@@ -113,7 +113,7 @@
"saslJaasConfig": { "kind": "property", "displayName": "Sasl Jaas Config",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": true, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "Expose the kafka sasl.jaas.config parameter
Example: org.apache.kafka.common.security.plain.PlainLoginModu [...]
"saslKerberosServiceName": { "kind": "property", "displayName": "Sasl
Kerberos Service Name", "group": "security", "label": "common,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The Kerberos principal name that Kafka runs
as. This can be defined either in Kafka's [...]
"saslMechanism": { "kind": "property", "displayName": "Sasl Mechanism",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "GSSAPI", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The Simple Authentication and Security Layer
(SASL) Mechanism used. For the valid [...]
- "securityProtocol": { "kind": "property", "displayName": "Security
Protocol", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "PLAINTEXT",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "Protocol used to
communicate with brokers. SASL_PLAINTEXT, PLAINTEXT and [...]
+ "securityProtocol": { "kind": "property", "displayName": "Security
Protocol", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "PLAINTEXT",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "Protocol used to
communicate with brokers. SASL_PLAINTEXT, PLAINTEXT, SAS [...]
"sslCipherSuites": { "kind": "property", "displayName": "Ssl Cipher
Suites", "group": "security", "label": "common,security", "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 list of cipher suites. This is a named
combination of authentication, encryption, MAC and key exchang [...]
"sslContextParameters": { "kind": "property", "displayName": "Ssl Context
Parameters", "group": "security", "label": "common,security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "SSL configuration using a Camel
SSLContextParameters object [...]
"sslEnabledProtocols": { "kind": "property", "displayName": "Ssl Enabled
Protocols", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The list of protocols enabled for SSL
connections. The default is TLSv1.2,TLSv1.3 when running [...]
@@ -234,7 +234,7 @@
"saslJaasConfig": { "kind": "parameter", "displayName": "Sasl Jaas
Config", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": true, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "Expose the kafka sasl.jaas.config parameter
Example: org.apache.kafka.common.security.plain.PlainLoginMod [...]
"saslKerberosServiceName": { "kind": "parameter", "displayName": "Sasl
Kerberos Service Name", "group": "security", "label": "common,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The Kerberos principal name that Kafka runs
as. This can be defined either in Kafka's [...]
"saslMechanism": { "kind": "parameter", "displayName": "Sasl Mechanism",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "GSSAPI", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The Simple Authentication and Security Layer
(SASL) Mechanism used. For the valid [...]
- "securityProtocol": { "kind": "parameter", "displayName": "Security
Protocol", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "PLAINTEXT",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "Protocol used to
communicate with brokers. SASL_PLAINTEXT, PLAINTEXT and [...]
+ "securityProtocol": { "kind": "parameter", "displayName": "Security
Protocol", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "PLAINTEXT",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "Protocol used to
communicate with brokers. SASL_PLAINTEXT, PLAINTEXT, SA [...]
"sslCipherSuites": { "kind": "parameter", "displayName": "Ssl Cipher
Suites", "group": "security", "label": "common,security", "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 list of cipher suites. This is a named
combination of authentication, encryption, MAC and key exchan [...]
"sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context
Parameters", "group": "security", "label": "common,security", "required":
false, "type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "SSL configuration using a Camel
SSLContextParameters objec [...]
"sslEnabledProtocols": { "kind": "parameter", "displayName": "Ssl Enabled
Protocols", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The list of protocols enabled for SSL
connections. The default is TLSv1.2,TLSv1.3 when running [...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats.properties
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats.properties
index 6edae4e6d77..645420488ef 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats.properties
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/dataformats.properties
@@ -41,4 +41,4 @@ xmlSecurity
xstream
xstreamJson
zipDeflater
-zipFile
+zipFile
\ No newline at end of file
diff --git a/components-starter/camel-kafka-starter/src/main/docs/kafka.json
b/components-starter/camel-kafka-starter/src/main/docs/kafka.json
index 4b17296efda..e86a21339e6 100644
--- a/components-starter/camel-kafka-starter/src/main/docs/kafka.json
+++ b/components-starter/camel-kafka-starter/src/main/docs/kafka.json
@@ -540,7 +540,7 @@
{
"name": "camel.component.kafka.security-protocol",
"type": "java.lang.String",
- "description": "Protocol used to communicate with brokers.
SASL_PLAINTEXT, PLAINTEXT and SSL are supported",
+ "description": "Protocol used to communicate with brokers.
SASL_PLAINTEXT, PLAINTEXT, SASL_SSL and SSL are supported",
"sourceType":
"org.apache.camel.component.kafka.springboot.KafkaComponentConfiguration",
"defaultValue": "PLAINTEXT"
},
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 692c931396b..fd44e6d56ad 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
@@ -733,8 +733,8 @@ public class KafkaComponentConfiguration
*/
private String saslMechanism = "GSSAPI";
/**
- * Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT and
- * SSL are supported
+ * Protocol used to communicate with brokers. SASL_PLAINTEXT, PLAINTEXT,
+ * SASL_SSL and SSL are supported
*/
private String securityProtocol = "PLAINTEXT";
/**
