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 6412c7f Regen
6412c7f is described below
commit 6412c7ffc3e6af97f8b48a3c2f848f66f36f86f9
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Thu May 7 10:20:15 2020 +0200
Regen
---
.../apache/camel/springboot/catalog/components/kafka.json | 8 ++++----
components-starter/camel-corda-starter/pom.xml | 12 ++++++++++++
.../camel-kafka-starter/src/main/docs/kafka-starter.adoc | 4 ++--
.../kafka/springboot/KafkaComponentConfiguration.java | 4 ++--
4 files changed, 20 insertions(+), 8 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 95f6225..b205c54 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
@@ -104,14 +104,14 @@
"securityProtocol": { "kind": "property", "displayName": "Security
Protocol", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": 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 SSL are supported" },
"sslCipherSuites": { "kind": "property", "displayName": "Ssl Cipher
Suites", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": 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 exchange algorithm used
to [...]
"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,
"secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "SSL configuration using a Camel
SSLContextParameters object. If configured it's [...]
- "sslEnabledProtocols": { "kind": "property", "displayName": "Ssl Enabled
Protocols", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "defaultValue": "TLSv1.2,TLSv1.1,TLSv1", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The list of protocols enabled for SSL
connections. TLSv1.2, TLSv1.1 and TL [...]
+ "sslEnabledProtocols": { "kind": "property", "displayName": "Ssl Enabled
Protocols", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "defaultValue": "TLSv1.2", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The list of protocols enabled for SSL
connections. TLSv1.2, TLSv1.1 and TLSv1 are enable [...]
"sslEndpointAlgorithm": { "kind": "property", "displayName": "Ssl Endpoint
Algorithm", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The endpoint identification algorithm to
validate server hostname using server certificate." },
"sslKeymanagerAlgorithm": { "kind": "property", "displayName": "Ssl
Keymanager Algorithm", "group": "security", "label": "common,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "defaultValue": "SunX509",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The algorithm used by
key manager factory for SSL connections. Default value is th [...]
"sslKeyPassword": { "kind": "property", "displayName": "Ssl Key Password",
"group": "security", "label": "producer,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": true,
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The password of the
private key in the key store file. This is optional for client." },
"sslKeystoreLocation": { "kind": "property", "displayName": "Ssl Keystore
Location", "group": "security", "label": "producer,security", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The location of the key store file. This is
optional for client and can be used for two-way authentication for cl [...]
"sslKeystorePassword": { "kind": "property", "displayName": "Ssl Keystore
Password", "group": "security", "label": "producer,security", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": true, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The store password for the key store file.This
is optional for client and only needed if ssl.keystore.location is [...]
"sslKeystoreType": { "kind": "property", "displayName": "Ssl Keystore
Type", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "defaultValue": "JKS", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The file format of the key store file. This is
optional for client. Default value is JKS" },
- "sslProtocol": { "kind": "property", "displayName": "Ssl Protocol",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"defaultValue": "TLS", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The SSL protocol used to generate the
SSLContext. Default setting is TLS, which is fine for most cases. Allow [...]
+ "sslProtocol": { "kind": "property", "displayName": "Ssl Protocol",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"defaultValue": "TLSv1.2", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The SSL protocol used to generate the
SSLContext. Default setting is TLS, which is fine for most cases. A [...]
"sslProvider": { "kind": "property", "displayName": "Ssl Provider",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The name of the security
provider used for SSL connections. Default value is the default security
provider of the JVM." },
"sslTrustmanagerAlgorithm": { "kind": "property", "displayName": "Ssl
Trustmanager Algorithm", "group": "security", "label": "common,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "defaultValue": "PKIX",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The algorithm used by
trust manager factory for SSL connections. Default value is [...]
"sslTruststoreLocation": { "kind": "property", "displayName": "Ssl
Truststore Location", "group": "security", "label": "producer,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The location of the trust store file." },
@@ -205,14 +205,14 @@
"securityProtocol": { "kind": "parameter", "displayName": "Security
Protocol", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": 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 SSL are supported" },
"sslCipherSuites": { "kind": "parameter", "displayName": "Ssl Cipher
Suites", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": 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 exchange algorithm used
to [...]
"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,
"secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "SSL configuration using a Camel
SSLContextParameters object. If configured it' [...]
- "sslEnabledProtocols": { "kind": "parameter", "displayName": "Ssl Enabled
Protocols", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "defaultValue": "TLSv1.2,TLSv1.1,TLSv1", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The list of protocols enabled for SSL
connections. TLSv1.2, TLSv1.1 and T [...]
+ "sslEnabledProtocols": { "kind": "parameter", "displayName": "Ssl Enabled
Protocols", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "defaultValue": "TLSv1.2", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The list of protocols enabled for SSL
connections. TLSv1.2, TLSv1.1 and TLSv1 are enabl [...]
"sslEndpointAlgorithm": { "kind": "parameter", "displayName": "Ssl
Endpoint Algorithm", "group": "security", "label": "common,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The endpoint identification algorithm to
validate server hostname using server certificate." },
"sslKeymanagerAlgorithm": { "kind": "parameter", "displayName": "Ssl
Keymanager Algorithm", "group": "security", "label": "common,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "defaultValue": "SunX509",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The algorithm used by
key manager factory for SSL connections. Default value is t [...]
"sslKeyPassword": { "kind": "parameter", "displayName": "Ssl Key
Password", "group": "security", "label": "producer,security", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": true, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The password of the private key in the key
store file. This is optional for client." },
"sslKeystoreLocation": { "kind": "parameter", "displayName": "Ssl Keystore
Location", "group": "security", "label": "producer,security", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The location of the key store file. This is
optional for client and can be used for two-way authentication for c [...]
"sslKeystorePassword": { "kind": "parameter", "displayName": "Ssl Keystore
Password", "group": "security", "label": "producer,security", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": true, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The store password for the key store file.This
is optional for client and only needed if ssl.keystore.location is [...]
"sslKeystoreType": { "kind": "parameter", "displayName": "Ssl Keystore
Type", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "defaultValue": "JKS", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The file format of the key store file. This is
optional for client. Default value is JKS" },
- "sslProtocol": { "kind": "parameter", "displayName": "Ssl Protocol",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"defaultValue": "TLS", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The SSL protocol used to generate the
SSLContext. Default setting is TLS, which is fine for most cases. Allo [...]
+ "sslProtocol": { "kind": "parameter", "displayName": "Ssl Protocol",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"defaultValue": "TLSv1.2", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The SSL protocol used to generate the
SSLContext. Default setting is TLS, which is fine for most cases. [...]
"sslProvider": { "kind": "parameter", "displayName": "Ssl Provider",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The name of the security
provider used for SSL connections. Default value is the default security
provider of the JVM." },
"sslTrustmanagerAlgorithm": { "kind": "parameter", "displayName": "Ssl
Trustmanager Algorithm", "group": "security", "label": "common,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "defaultValue": "PKIX",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The algorithm used by
trust manager factory for SSL connections. Default value i [...]
"sslTruststoreLocation": { "kind": "parameter", "displayName": "Ssl
Truststore Location", "group": "security", "label": "producer,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The location of the trust store file." },
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 0391c60..f29dca1 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-corda</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-kafka-starter/src/main/docs/kafka-starter.adoc
b/components-starter/camel-kafka-starter/src/main/docs/kafka-starter.adoc
index de92f4f..e250870 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
@@ -103,14 +103,14 @@ The component supports 98 options, which are listed below.
| *camel.component.kafka.specific-avro-reader* | This enables the use of a
specific Avro reader for use with the Confluent Platform schema registry and
the io.confluent.kafka.serializers.KafkaAvroDeserializer. This option is only
available in the Confluent Platform (not standard Apache Kafka) | false |
Boolean
| *camel.component.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.kafka.ssl-context-parameters* | SSL configuration using a
Camel SSLContextParameters object. If configured it's applied before the other
SSL endpoint parameters. The option is a
org.apache.camel.support.jsse.SSLContextParameters type. | | String
-| *camel.component.kafka.ssl-enabled-protocols* | The list of protocols
enabled for SSL connections. TLSv1.2, TLSv1.1 and TLSv1 are enabled by default.
| TLSv1.2,TLSv1.1,TLSv1 | String
+| *camel.component.kafka.ssl-enabled-protocols* | The list of protocols
enabled for SSL connections. TLSv1.2, TLSv1.1 and TLSv1 are enabled by default.
| TLSv1.2 | String
| *camel.component.kafka.ssl-endpoint-algorithm* | The endpoint identification
algorithm to validate server hostname using server certificate. | | String
| *camel.component.kafka.ssl-key-password* | The password of the private key
in the key store file. This is optional for client. | | String
| *camel.component.kafka.ssl-keymanager-algorithm* | The algorithm used by key
manager factory for SSL connections. Default value is the key manager factory
algorithm configured for the Java Virtual Machine. | SunX509 | String
| *camel.component.kafka.ssl-keystore-location* | The location of the key
store file. This is optional for client and can be used for two-way
authentication for client. | | String
| *camel.component.kafka.ssl-keystore-password* | The store password for the
key store file.This is optional for client and only needed if
ssl.keystore.location is configured. | | String
| *camel.component.kafka.ssl-keystore-type* | The file format of the key store
file. This is optional for client. Default value is JKS | JKS | String
-| *camel.component.kafka.ssl-protocol* | The SSL protocol used to generate the
SSLContext. Default setting is TLS, which is fine for most cases. Allowed
values in recent JVMs are TLS, TLSv1.1 and TLSv1.2. SSL, SSLv2 and SSLv3 may be
supported in older JVMs, but their usage is discouraged due to known security
vulnerabilities. | TLS | String
+| *camel.component.kafka.ssl-protocol* | The SSL protocol used to generate the
SSLContext. Default setting is TLS, which is fine for most cases. Allowed
values in recent JVMs are TLS, TLSv1.1 and TLSv1.2. SSL, SSLv2 and SSLv3 may be
supported in older JVMs, but their usage is discouraged due to known security
vulnerabilities. | TLSv1.2 | String
| *camel.component.kafka.ssl-provider* | The name of the security provider
used for SSL connections. Default value is the default security provider of the
JVM. | | String
| *camel.component.kafka.ssl-trustmanager-algorithm* | The algorithm used by
trust manager factory for SSL connections. Default value is the trust manager
factory algorithm configured for the Java Virtual Machine. | PKIX | String
| *camel.component.kafka.ssl-truststore-location* | The location of the trust
store file. | | String
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 9975f83..92e77d3 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
@@ -611,7 +611,7 @@ public class KafkaComponentConfiguration
* The list of protocols enabled for SSL connections. TLSv1.2, TLSv1.1 and
* TLSv1 are enabled by default.
*/
- private String sslEnabledProtocols = "TLSv1.2,TLSv1.1,TLSv1";
+ private String sslEnabledProtocols = "TLSv1.2";
/**
* The endpoint identification algorithm to validate server hostname using
* server certificate.
@@ -649,7 +649,7 @@ public class KafkaComponentConfiguration
* TLSv1.1 and TLSv1.2. SSL, SSLv2 and SSLv3 may be supported in older
JVMs,
* but their usage is discouraged due to known security vulnerabilities.
*/
- private String sslProtocol = "TLS";
+ private String sslProtocol = "TLSv1.2";
/**
* The name of the security provider used for SSL connections. Default
value
* is the default security provider of the JVM.
