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.git
The following commit(s) were added to refs/heads/master by this push:
new 41fe149 Regen
41fe149 is described below
commit 41fe14917af267d29793c792161d6962528d9ff4
Author: Claus Ibsen <[email protected]>
AuthorDate: Sat Apr 20 09:16:01 2019 +0200
Regen
---
docs/components/modules/ROOT/pages/ftps-component.adoc | 2 +-
docs/components/modules/ROOT/pages/jdbc-component.adoc | 2 +-
.../camel/component/kafka/springboot/KafkaComponentConfiguration.java | 4 +---
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/docs/components/modules/ROOT/pages/ftps-component.adoc
b/docs/components/modules/ROOT/pages/ftps-component.adoc
index 6ce728a..06cb341 100644
--- a/docs/components/modules/ROOT/pages/ftps-component.adoc
+++ b/docs/components/modules/ROOT/pages/ftps-component.adoc
@@ -185,7 +185,7 @@ with the following path and query parameters:
| *ftpClientTrustStore Parameters* (security) | Set the trust store parameters
| | Map
| *isImplicit* (security) | Set the security mode(Implicit/Explicit). true -
Implicit Mode / False - Explicit Mode | false | boolean
| *password* (security) | Password to use for login | | String
-| *securityProtocol* (security) | Set the underlying security protocol. | TLS
| String
+| *securityProtocol* (security) | Set the underlying security protocol. |
TLSv1.2 | String
| *sslContextParameters* (security) | Gets the JSSE configuration that
overrides any settings in FtpsEndpoint#ftpClientKeyStoreParameters,
ftpClientTrustStoreParameters, and FtpsConfiguration#getSecurityProtocol(). |
| SSLContextParameters
| *username* (security) | Username to use for login | | String
|===
diff --git a/docs/components/modules/ROOT/pages/jdbc-component.adoc
b/docs/components/modules/ROOT/pages/jdbc-component.adoc
index 08067f4..b6e54cf 100644
--- a/docs/components/modules/ROOT/pages/jdbc-component.adoc
+++ b/docs/components/modules/ROOT/pages/jdbc-component.adoc
@@ -150,7 +150,7 @@ header.
|`CamelJdbcUpdateCount` |If the query is an `UPDATE`, query the update count
is returned in this
OUT header.
-|`CamelGeneratedKeysRows` |*Camel 2.10:* Rows that contains the generated kets.
+|`CamelGeneratedKeysRows` |*Camel 2.10:* Rows that contains the generated keys.
|`CamelGeneratedKeysRowCount` |*Camel 2.10:* The number of rows in the header
that contains generated
keys.
diff --git
a/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
b/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
index 82c99e09..5adbbe3 100644
---
a/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
+++
b/platforms/spring-boot/components-starter/camel-kafka-starter/src/main/java/org/apache/camel/component/kafka/springboot/KafkaComponentConfiguration.java
@@ -422,8 +422,6 @@ public class KafkaComponentConfiguration
* Default value is JKS
*/
private String sslKeystoreType = "JKS";
-
- // TODO : switch to TLSv1.3 when we fully upgrade to JDK11
/**
* The SSL protocol used to generate the SSLContext. Default setting is
* TLS, which is fine for most cases. Allowed values in recent JVMs are
@@ -431,7 +429,7 @@ public class KafkaComponentConfiguration
* older JVMs, but their usage is discouraged due to known security
* vulnerabilities.
*/
- private String sslProtocol = "TLSv1.2";
+ private String sslProtocol = "TLS";
/**
* The name of the security provider used for SSL connections. Default
* value is the default security provider of the JVM.
