You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/12/09 09:02:19 UTC
[camel-spring-boot] branch master updated: [create-pull-request]
automated change (#245)
This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 5b86ab3 [create-pull-request] automated change (#245)
5b86ab3 is described below
commit 5b86ab39fea7dafefbeea1a1ed9949a35857f182
Author: github-actions[bot] <41...@users.noreply.github.com>
AuthorDate: Wed Dec 9 10:02:12 2020 +0100
[create-pull-request] automated change (#245)
Co-authored-by: github-actions[bot] <41...@users.noreply.github.com>
---
.../org/apache/camel/springboot/catalog/components/vertx-kafka.json | 4 ++--
.../camel-vertx-kafka-starter/src/main/docs/vertx-kafka-starter.adoc | 2 +-
.../vertx/kafka/springboot/VertxKafkaComponentConfiguration.java | 2 +-
docs/modules/ROOT/pages/vertx-kafka-starter.adoc | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
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 95b2258..8063a2b 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
@@ -105,7 +105,7 @@
"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.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "Protocol used to communicate with brokers. Valid [...]
"securityProviders": { "kind": "property", "displayName": "Security Providers", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "A list of configurable creator classes each returning a provider implementi [...]
"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.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "A list of cipher suites. This is a named combination of authentication, encryp [...]
- "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, "defaultValue": "TLSv1.2", "configurationClass": "org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "The list of protocols enabled for SSL conne [...]
+ "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, "defaultValue": "TLSv1.2,TLSv1.3", "configurationClass": "org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "The list of protocols enabled for S [...]
"sslEndpointIdentificationAlgorithm": { "kind": "property", "displayName": "Ssl Endpoint Identification Algorithm", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "https", "configurationClass": "org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "The endpoint i [...]
"sslEngineFactoryClass": { "kind": "property", "displayName": "Ssl Engine Factory Class", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "The class of type org.apache.kafka.common.security.auth.SslEngine [...]
"sslKeymanagerAlgorithm": { "kind": "property", "displayName": "Ssl Keymanager Algorithm", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "SunX509", "configurationClass": "org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "The algorithm used by key manager fac [...]
@@ -205,7 +205,7 @@
"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.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "Protocol used to communicate with brokers. Vali [...]
"securityProviders": { "kind": "parameter", "displayName": "Security Providers", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "A list of configurable creator classes each returning a provider implement [...]
"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.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "A list of cipher suites. This is a named combination of authentication, encry [...]
- "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, "defaultValue": "TLSv1.2", "configurationClass": "org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "The list of protocols enabled for SSL conn [...]
+ "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, "defaultValue": "TLSv1.2,TLSv1.3", "configurationClass": "org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "The list of protocols enabled for [...]
"sslEndpointIdentificationAlgorithm": { "kind": "parameter", "displayName": "Ssl Endpoint Identification Algorithm", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "https", "configurationClass": "org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "The endpoint [...]
"sslEngineFactoryClass": { "kind": "parameter", "displayName": "Ssl Engine Factory Class", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "configurationClass": "org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "The class of type org.apache.kafka.common.security.auth.SslEngin [...]
"sslKeymanagerAlgorithm": { "kind": "parameter", "displayName": "Ssl Keymanager Algorithm", "group": "security", "label": "common,security", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "SunX509", "configurationClass": "org.apache.camel.component.vertx.kafka.configuration.VertxKafkaConfiguration", "configurationField": "configuration", "description": "The algorithm used by key manager fa [...]
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 2407f96..8bc6f30 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
@@ -102,7 +102,7 @@ The component supports 99 options, which are listed below.
| *camel.component.vertx-kafka.send-buffer-bytes* | The size of the TCP send buffer (SO_SNDBUF) to use when sending data. If the value is -1, the OS default will be used. | 131072 | Integer
| *camel.component.vertx-kafka.session-timeout-ms* | The timeout used to detect client failures when using Kafka's group management facility. The client sends periodic heartbeats to indicate its liveness to the broker. If no heartbeats are received by the broker before the expiration of this session timeout, then the broker will remove this client from the group and initiate a rebalance. Note that the value must be in the allowable range as configured in the broker configuration by group [...]
| *camel.component.vertx-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.vertx-kafka.ssl-enabled-protocols* | The list of protocols enabled for SSL connections. The default is 'TLSv1.2,TLSv1.3' when running with Java 11 or newer, 'TLSv1.2' otherwise. With the default value for Java 11, clients and servers will prefer TLSv1.3 if both support it and fallback to TLSv1.2 otherwise (assuming both support at least TLSv1.2). This default should be fine for most cases. Also see the config documentation for ssl.protocol. | TLSv1.2 | String
+| *camel.component.vertx-kafka.ssl-enabled-protocols* | The list of protocols enabled for SSL connections. The default is 'TLSv1.2,TLSv1.3' when running with Java 11 or newer, 'TLSv1.2' otherwise. With the default value for Java 11, clients and servers will prefer TLSv1.3 if both support it and fallback to TLSv1.2 otherwise (assuming both support at least TLSv1.2). This default should be fine for most cases. Also see the config documentation for ssl.protocol. | TLSv1.2,TLSv1.3 | String
| *camel.component.vertx-kafka.ssl-endpoint-identification-algorithm* | The endpoint identification algorithm to validate server hostname using server certificate. | https | String
| *camel.component.vertx-kafka.ssl-engine-factory-class* | The class of type org.apache.kafka.common.security.auth.SslEngineFactory to provide SSLEngine objects. Default value is org.apache.kafka.common.security.ssl.DefaultSslEngineFactory | | String
| *camel.component.vertx-kafka.ssl-key-password* | The password of the private key in the key store file. This is optional for client. | | String
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 8fd7948..42de0c0 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
@@ -720,7 +720,7 @@ public class VertxKafkaComponentConfiguration
* (assuming both support at least TLSv1.2). This default should be fine for
* most cases. Also see the config documentation for ssl.protocol.
*/
- private String sslEnabledProtocols = "TLSv1.2";
+ private String sslEnabledProtocols = "TLSv1.2,TLSv1.3";
/**
* The endpoint identification algorithm to validate server hostname using
* server certificate.
diff --git a/docs/modules/ROOT/pages/vertx-kafka-starter.adoc b/docs/modules/ROOT/pages/vertx-kafka-starter.adoc
index 2407f96..8bc6f30 100644
--- a/docs/modules/ROOT/pages/vertx-kafka-starter.adoc
+++ b/docs/modules/ROOT/pages/vertx-kafka-starter.adoc
@@ -102,7 +102,7 @@ The component supports 99 options, which are listed below.
| *camel.component.vertx-kafka.send-buffer-bytes* | The size of the TCP send buffer (SO_SNDBUF) to use when sending data. If the value is -1, the OS default will be used. | 131072 | Integer
| *camel.component.vertx-kafka.session-timeout-ms* | The timeout used to detect client failures when using Kafka's group management facility. The client sends periodic heartbeats to indicate its liveness to the broker. If no heartbeats are received by the broker before the expiration of this session timeout, then the broker will remove this client from the group and initiate a rebalance. Note that the value must be in the allowable range as configured in the broker configuration by group [...]
| *camel.component.vertx-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.vertx-kafka.ssl-enabled-protocols* | The list of protocols enabled for SSL connections. The default is 'TLSv1.2,TLSv1.3' when running with Java 11 or newer, 'TLSv1.2' otherwise. With the default value for Java 11, clients and servers will prefer TLSv1.3 if both support it and fallback to TLSv1.2 otherwise (assuming both support at least TLSv1.2). This default should be fine for most cases. Also see the config documentation for ssl.protocol. | TLSv1.2 | String
+| *camel.component.vertx-kafka.ssl-enabled-protocols* | The list of protocols enabled for SSL connections. The default is 'TLSv1.2,TLSv1.3' when running with Java 11 or newer, 'TLSv1.2' otherwise. With the default value for Java 11, clients and servers will prefer TLSv1.3 if both support it and fallback to TLSv1.2 otherwise (assuming both support at least TLSv1.2). This default should be fine for most cases. Also see the config documentation for ssl.protocol. | TLSv1.2,TLSv1.3 | String
| *camel.component.vertx-kafka.ssl-endpoint-identification-algorithm* | The endpoint identification algorithm to validate server hostname using server certificate. | https | String
| *camel.component.vertx-kafka.ssl-engine-factory-class* | The class of type org.apache.kafka.common.security.auth.SslEngineFactory to provide SSLEngine objects. Default value is org.apache.kafka.common.security.ssl.DefaultSslEngineFactory | | String
| *camel.component.vertx-kafka.ssl-key-password* | The password of the private key in the key store file. This is optional for client. | | String