This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 fd85fbabeef Regen
fd85fbabeef is described below
commit fd85fbabeefad2f2eb99b8fdb870f2d2522120aa
Author: Claus Ibsen <[email protected]>
AuthorDate: Fri Sep 9 13:50:15 2022 +0200
Regen
---
.../camel/springboot/catalog/components/ftps.json | 2 +-
.../camel/springboot/catalog/components/kafka.json | 24 +++++++-------
.../springboot/catalog/components/netty-http.json | 4 +--
.../camel/springboot/catalog/components/netty.json | 4 +--
.../camel-kafka-starter/src/main/docs/kafka.json | 12 +++----
.../springboot/KafkaComponentConfiguration.java | 38 +++++++++++++++-------
.../src/main/docs/netty-http.json | 2 +-
.../NettyHttpComponentConfiguration.java | 2 +-
.../camel-netty-starter/src/main/docs/netty.json | 2 +-
.../springboot/NettyComponentConfiguration.java | 2 +-
10 files changed, 53 insertions(+), 39 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ftps.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ftps.json
index 6c5433a488d..8e5edcfca0d 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ftps.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/ftps.json
@@ -157,7 +157,7 @@
"ftpClientTrustStoreParameters": { "kind": "parameter", "displayName":
"Ftp Client Trust Store Parameters", "group": "security", "label": "security",
"required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.Object>", "prefix":
"ftpClient.trustStore.", "multiValue": true, "deprecated": false, "autowired":
false, "secret": false, "description": "Set the trust store parameters" },
"implicit": { "kind": "parameter", "displayName": "Implicit", "group":
"security", "label": "security", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.file.remote.FtpsConfiguration",
"configurationField": "configuration", "description": "Set the security mode
(Implicit\/Explicit). true - Implicit Mode \/ False - Explicit Mode" },
"password": { "kind": "parameter", "displayName": "Password", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.file.remote.FtpsConfiguration",
"configurationField": "configuration", "description": "Password to use for
login" },
- "securityProtocol": { "kind": "parameter", "displayName": "Security
Protocol", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "TLSv1.2", "configurationClass":
"org.apache.camel.component.file.remote.FtpsConfiguration",
"configurationField": "configuration", "description": "Set the underlying
security protocol." },
+ "securityProtocol": { "kind": "parameter", "displayName": "Security
Protocol", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "TLSv1.3", "configurationClass":
"org.apache.camel.component.file.remote.FtpsConfiguration",
"configurationField": "configuration", "description": "Set the underlying
security protocol." },
"sslContextParameters": { "kind": "parameter", "displayName": "Ssl Context
Parameters", "group": "security", "label": "security", "required": false,
"type": "object", "javaType":
"org.apache.camel.support.jsse.SSLContextParameters", "deprecated": false,
"autowired": false, "secret": false, "description": "Gets the JSSE
configuration that overrides any settings in
FtpsEndpoint#ftpClientKeyStoreParameters, ftpClientTrustStoreParameters, and
FtpsConfiguration#getSecurityProtocol()." },
"username": { "kind": "parameter", "displayName": "Username", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.file.remote.FtpsConfiguration",
"configurationField": "configuration", "description": "Username to use for
login" },
"shuffle": { "kind": "parameter", "displayName": "Shuffle", "group":
"sort", "label": "consumer,sort", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": false, "description": "To shuffle the list of files
(sort in random order)" },
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 166832c9621..bdf4e7e7474 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,20 +113,20 @@
"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 [...]
- "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 [...]
+ "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. TLSv1.2, TLSv1.1 and TLSv1 are enabled by de [...]
+ "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 [...]
"sslEndpointAlgorithm": { "kind": "property", "displayName": "Ssl Endpoint
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.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The endpoint
identification algorithm to validate server hostname us [...]
"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.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The algorithm used by key manager factory for
SSL connections. [...]
- "sslKeyPassword": { "kind": "property", "displayName": "Ssl Key Password",
"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": "The password of the private key in the key
store file. This is optional for client." },
+ "sslKeyPassword": { "kind": "property", "displayName": "Ssl Key Password",
"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": "The password of the private key in the key
store file or the PEM key specified in sslKeystoreKey. This is [...]
"sslKeystoreLocation": { "kind": "property", "displayName": "Ssl Keystore
Location", "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 location of the key store file. This is
optional for client and can be used for two-way aut [...]
- "sslKeystorePassword": { "kind": "property", "displayName": "Ssl Keystore
Password", "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": "The store password for the key store file.This
is optional for client and only needed if ssl.key [...]
+ "sslKeystorePassword": { "kind": "property", "displayName": "Ssl Keystore
Password", "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": "The store password for the key store file.
This is optional for client and only needed if sslKey [...]
"sslKeystoreType": { "kind": "property", "displayName": "Ssl Keystore
Type", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": 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 valu [...]
- "sslProtocol": { "kind": "property", "displayName": "Ssl Protocol",
"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 SSL protocol used to generate the
SSLContext. Default setting is TLS, which is fine for most cases. Allowed [...]
+ "sslProtocol": { "kind": "property", "displayName": "Ssl Protocol",
"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 SSL protocol used to generate the
SSLContext. The default is TLSv1.3 when running with Java 11 or newer, TLS [...]
"sslProvider": { "kind": "property", "displayName": "Ssl Provider",
"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 name of the security provider used for SSL
connections. Default value is the default security provider of th [...]
"sslTrustmanagerAlgorithm": { "kind": "property", "displayName": "Ssl
Trustmanager Algorithm", "group": "security", "label": "common,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"PKIX", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The algorithm used by trust manager factory
for SSL connectio [...]
"sslTruststoreLocation": { "kind": "property", "displayName": "Ssl
Truststore Location", "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 location of the trust store file." },
- "sslTruststorePassword": { "kind": "property", "displayName": "Ssl
Truststore Password", "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": "The password for the trust store file." },
+ "sslTruststorePassword": { "kind": "property", "displayName": "Ssl
Truststore Password", "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": "The password for the trust store file. If a
password is not set, trust store file configured [...]
"sslTruststoreType": { "kind": "property", "displayName": "Ssl Truststore
Type", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "JKS",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The file format of the
trust store file. Default value is JKS." },
"useGlobalSslContextParameters": { "kind": "property", "displayName": "Use
Global Ssl Context Parameters", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Enable usage of global SSL context parameters." }
},
@@ -233,20 +233,20 @@
"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 [...]
- "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 [...]
+ "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. TLSv1.2, TLSv1.1 and TLSv1 are enabled by d [...]
+ "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 [...]
"sslEndpointAlgorithm": { "kind": "parameter", "displayName": "Ssl
Endpoint 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.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The endpoint identification algorithm to
validate server hostname u [...]
"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.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The algorithm used by key manager factory for
SSL connections [...]
- "sslKeyPassword": { "kind": "parameter", "displayName": "Ssl Key
Password", "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": "The password of the private key in the key
store file. This is optional for client." },
+ "sslKeyPassword": { "kind": "parameter", "displayName": "Ssl Key
Password", "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": "The password of the private key in the key
store file or the PEM key specified in sslKeystoreKey. This is [...]
"sslKeystoreLocation": { "kind": "parameter", "displayName": "Ssl Keystore
Location", "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 location of the key store file. This is
optional for client and can be used for two-way au [...]
- "sslKeystorePassword": { "kind": "parameter", "displayName": "Ssl Keystore
Password", "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": "The store password for the key store file.This
is optional for client and only needed if ssl.ke [...]
+ "sslKeystorePassword": { "kind": "parameter", "displayName": "Ssl Keystore
Password", "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": "The store password for the key store file.
This is optional for client and only needed if sslKe [...]
"sslKeystoreType": { "kind": "parameter", "displayName": "Ssl Keystore
Type", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": 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 val [...]
- "sslProtocol": { "kind": "parameter", "displayName": "Ssl Protocol",
"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 SSL protocol used to generate the
SSLContext. Default setting is TLS, which is fine for most cases. Allowed [...]
+ "sslProtocol": { "kind": "parameter", "displayName": "Ssl Protocol",
"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 SSL protocol used to generate the
SSLContext. The default is TLSv1.3 when running with Java 11 or newer, TL [...]
"sslProvider": { "kind": "parameter", "displayName": "Ssl Provider",
"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 name of the security provider used for SSL
connections. Default value is the default security provider of t [...]
"sslTrustmanagerAlgorithm": { "kind": "parameter", "displayName": "Ssl
Trustmanager Algorithm", "group": "security", "label": "common,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "defaultValue":
"PKIX", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The algorithm used by trust manager factory
for SSL connecti [...]
"sslTruststoreLocation": { "kind": "parameter", "displayName": "Ssl
Truststore Location", "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 location of the trust store file." },
- "sslTruststorePassword": { "kind": "parameter", "displayName": "Ssl
Truststore Password", "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": "The password for the trust store file." },
+ "sslTruststorePassword": { "kind": "parameter", "displayName": "Ssl
Truststore Password", "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": "The password for the trust store file. If a
password is not set, trust store file configure [...]
"sslTruststoreType": { "kind": "parameter", "displayName": "Ssl Truststore
Type", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "JKS",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The file format of the
trust store file. Default value is JKS." }
}
}
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
index d1611b1e14a..3186c470270 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty-http.json
@@ -85,7 +85,7 @@
"encoders": { "kind": "property", "displayName": "Encoders", "group":
"codec", "label": "codec", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.netty.NettyConfiguration",
"configurationField": "configuration", "description": "A list of encoders to be
used. You can use a String which have values separated by comma, and have the
values be looked up in the Re [...]
"encoding": { "kind": "property", "displayName": "Encoding", "group":
"codec", "label": "codec", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.netty.NettyConfiguration",
"configurationField": "configuration", "description": "The encoding (a charset
name) to use for the textline codec. If not provided, Camel will use the JVM
default Charset." },
"textline": { "kind": "property", "displayName": "Textline", "group":
"codec", "label": "codec", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Only used for TCP. If no codec is specified,
you can use this flag to indicate a text line based codec; if not specif [...]
- "enabledProtocols": { "kind": "property", "displayName": "Enabled
Protocols", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "TLSv1,TLSv1.1,TLSv1.2",
"configurationClass": "org.apache.camel.component.netty.NettyConfiguration",
"configurationField": "configuration", "description": "Which protocols to
enable when using SSL" },
+ "enabledProtocols": { "kind": "property", "displayName": "Enabled
Protocols", "group": "security", "label": "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.netty.NettyConfiguration",
"configurationField": "configuration", "description": "Which protocols to
enable when using SSL" },
"keyStoreFile": { "kind": "property", "displayName": "Key Store File",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.io.File", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Client side certificate keystore to be used
for encryption" },
"keyStoreFormat": { "kind": "property", "displayName": "Key Store Format",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Keystore format to be used for payload
encryption. Defaults to JKS if not set" },
"keyStoreResource": { "kind": "property", "displayName": "Key Store
Resource", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Client side certificate keystore to be used
for encryption. Is loaded by default from classpath, but you can [...]
@@ -186,7 +186,7 @@
"workerGroup": { "kind": "parameter", "displayName": "Worker Group",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "io.netty.channel.EventLoopGroup", "deprecated": false,
"autowired": false, "secret": false, "configurationClass":
"org.apache.camel.component.netty.http.NettyHttpConfiguration",
"configurationField": "configuration", "description": "To use a explicit
EventLoopGroup as the boss thread pool. For example to share a thread pool w
[...]
"decoders": { "kind": "parameter", "displayName": "Decoders", "group":
"codec", "label": "codec", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.netty.http.NettyHttpConfiguration",
"configurationField": "configuration", "description": "A list of decoders to be
used. You can use a String which have values separated by comma, and have the
values be looked up [...]
"encoders": { "kind": "parameter", "displayName": "Encoders", "group":
"codec", "label": "codec", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass":
"org.apache.camel.component.netty.http.NettyHttpConfiguration",
"configurationField": "configuration", "description": "A list of encoders to be
used. You can use a String which have values separated by comma, and have the
values be looked up [...]
- "enabledProtocols": { "kind": "parameter", "displayName": "Enabled
Protocols", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "TLSv1,TLSv1.1,TLSv1.2",
"configurationClass":
"org.apache.camel.component.netty.http.NettyHttpConfiguration",
"configurationField": "configuration", "description": "Which protocols to
enable when using SSL" },
+ "enabledProtocols": { "kind": "parameter", "displayName": "Enabled
Protocols", "group": "security", "label": "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.netty.http.NettyHttpConfiguration",
"configurationField": "configuration", "description": "Which protocols to
enable when using SSL" },
"keyStoreFile": { "kind": "parameter", "displayName": "Key Store File",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.io.File", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.netty.http.NettyHttpConfiguration",
"configurationField": "configuration", "description": "Client side certificate
keystore to be used for encryption" },
"keyStoreFormat": { "kind": "parameter", "displayName": "Key Store
Format", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.netty.http.NettyHttpConfiguration",
"configurationField": "configuration", "description": "Keystore format to be
used for payload encryption. Defaults to JKS if not set" },
"keyStoreResource": { "kind": "parameter", "displayName": "Key Store
Resource", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.netty.http.NettyHttpConfiguration",
"configurationField": "configuration", "description": "Client side certificate
keystore to be used for encryption. Is loaded by default from classpath, b [...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
index 052ebc13ae0..2fe2c087e95 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/netty.json
@@ -81,7 +81,7 @@
"encoders": { "kind": "property", "displayName": "Encoders", "group":
"codec", "label": "codec", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.netty.NettyConfiguration",
"configurationField": "configuration", "description": "A list of encoders to be
used. You can use a String which have values separated by comma, and have the
values be looked up in the Re [...]
"encoding": { "kind": "property", "displayName": "Encoding", "group":
"codec", "label": "codec", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.netty.NettyConfiguration",
"configurationField": "configuration", "description": "The encoding (a charset
name) to use for the textline codec. If not provided, Camel will use the JVM
default Charset." },
"textline": { "kind": "property", "displayName": "Textline", "group":
"codec", "label": "codec", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Only used for TCP. If no codec is specified,
you can use this flag to indicate a text line based codec; if not specif [...]
- "enabledProtocols": { "kind": "property", "displayName": "Enabled
Protocols", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "TLSv1,TLSv1.1,TLSv1.2",
"configurationClass": "org.apache.camel.component.netty.NettyConfiguration",
"configurationField": "configuration", "description": "Which protocols to
enable when using SSL" },
+ "enabledProtocols": { "kind": "property", "displayName": "Enabled
Protocols", "group": "security", "label": "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.netty.NettyConfiguration",
"configurationField": "configuration", "description": "Which protocols to
enable when using SSL" },
"keyStoreFile": { "kind": "property", "displayName": "Key Store File",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.io.File", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Client side certificate keystore to be used
for encryption" },
"keyStoreFormat": { "kind": "property", "displayName": "Key Store Format",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Keystore format to be used for payload
encryption. Defaults to JKS if not set" },
"keyStoreResource": { "kind": "property", "displayName": "Key Store
Resource", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Client side certificate keystore to be used
for encryption. Is loaded by default from classpath, but you can [...]
@@ -171,7 +171,7 @@
"encoders": { "kind": "parameter", "displayName": "Encoders", "group":
"codec", "label": "codec", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.netty.NettyConfiguration",
"configurationField": "configuration", "description": "A list of encoders to be
used. You can use a String which have values separated by comma, and have the
values be looked up in the R [...]
"encoding": { "kind": "parameter", "displayName": "Encoding", "group":
"codec", "label": "codec", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.netty.NettyConfiguration",
"configurationField": "configuration", "description": "The encoding (a charset
name) to use for the textline codec. If not provided, Camel will use the JVM
default Charset." },
"textline": { "kind": "parameter", "displayName": "Textline", "group":
"codec", "label": "codec", "required": false, "type": "boolean", "javaType":
"boolean", "deprecated": false, "autowired": false, "secret": false,
"defaultValue": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Only used for TCP. If no codec is specified,
you can use this flag to indicate a text line based codec; if not speci [...]
- "enabledProtocols": { "kind": "parameter", "displayName": "Enabled
Protocols", "group": "security", "label": "security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "TLSv1,TLSv1.1,TLSv1.2",
"configurationClass": "org.apache.camel.component.netty.NettyConfiguration",
"configurationField": "configuration", "description": "Which protocols to
enable when using SSL" },
+ "enabledProtocols": { "kind": "parameter", "displayName": "Enabled
Protocols", "group": "security", "label": "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.netty.NettyConfiguration",
"configurationField": "configuration", "description": "Which protocols to
enable when using SSL" },
"keyStoreFile": { "kind": "parameter", "displayName": "Key Store File",
"group": "security", "label": "security", "required": false, "type": "string",
"javaType": "java.io.File", "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Client side certificate keystore to be used
for encryption" },
"keyStoreFormat": { "kind": "parameter", "displayName": "Key Store
Format", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Keystore format to be used for payload
encryption. Defaults to JKS if not set" },
"keyStoreResource": { "kind": "parameter", "displayName": "Key Store
Resource", "group": "security", "label": "security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.netty.NettyConfiguration", "configurationField":
"configuration", "description": "Client side certificate keystore to be used
for encryption. Is loaded by default from classpath, but you ca [...]
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 25ce01c0f69..3590b359587 100644
--- a/components-starter/camel-kafka-starter/src/main/docs/kafka.json
+++ b/components-starter/camel-kafka-starter/src/main/docs/kafka.json
@@ -575,7 +575,7 @@
{
"name": "camel.component.kafka.ssl-cipher-suites",
"type": "java.lang.String",
- "description": "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.",
+ "description": "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.",
"sourceType":
"org.apache.camel.component.kafka.springboot.KafkaComponentConfiguration"
},
{
@@ -587,7 +587,7 @@
{
"name": "camel.component.kafka.ssl-enabled-protocols",
"type": "java.lang.String",
- "description": "The list of protocols enabled for SSL connections.
TLSv1.2, TLSv1.1 and TLSv1 are enabled by default.",
+ "description": "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 SslProtocol.",
"sourceType":
"org.apache.camel.component.kafka.springboot.KafkaComponentConfiguration"
},
{
@@ -600,7 +600,7 @@
{
"name": "camel.component.kafka.ssl-key-password",
"type": "java.lang.String",
- "description": "The password of the private key in the key store file.
This is optional for client.",
+ "description": "The password of the private key in the key store file or
the PEM key specified in sslKeystoreKey. This is required for clients only if
two-way authentication is configured.",
"sourceType":
"org.apache.camel.component.kafka.springboot.KafkaComponentConfiguration"
},
{
@@ -619,7 +619,7 @@
{
"name": "camel.component.kafka.ssl-keystore-password",
"type": "java.lang.String",
- "description": "The store password for the key store file.This is
optional for client and only needed if ssl.keystore.location is configured.",
+ "description": "The store password for the key store file. This is
optional for client and only needed if sslKeystoreLocation' is configured. Key
store password is not supported for PEM format.",
"sourceType":
"org.apache.camel.component.kafka.springboot.KafkaComponentConfiguration"
},
{
@@ -632,7 +632,7 @@
{
"name": "camel.component.kafka.ssl-protocol",
"type": "java.lang.String",
- "description": "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.",
+ "description": "The SSL protocol used to generate the SSLContext. The
default is TLSv1.3 when running with Java 11 or newer, TLSv1.2 otherwise. This
value should be fine for most use cases. Allowed values in recent JVMs are
TLSv1.2 and TLSv1.3. TLS, TLSv1.1, SSL, SSLv2 and SSLv3 may be supported in
older JVMs, but their usage is discouraged due to known security
vulnerabilities. With the default value for this config and
sslEnabledProtocols, clients will downgrade to TLSv1.2 if the [...]
"sourceType":
"org.apache.camel.component.kafka.springboot.KafkaComponentConfiguration"
},
{
@@ -657,7 +657,7 @@
{
"name": "camel.component.kafka.ssl-truststore-password",
"type": "java.lang.String",
- "description": "The password for the trust store file.",
+ "description": "The password for the trust store file. If a password is
not set, trust store file configured will still be used, but integrity checking
is disabled. Trust store password is not supported for PEM format.",
"sourceType":
"org.apache.camel.component.kafka.springboot.KafkaComponentConfiguration"
},
{
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 6fd41f90644..317685e39c6 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
@@ -715,7 +715,7 @@ public class KafkaComponentConfiguration
/**
* 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
+ * settings for a network connection using TLS or SSL network protocol. By
* default all the available cipher suites are supported.
*/
private String sslCipherSuites;
@@ -728,8 +728,12 @@ public class KafkaComponentConfiguration
*/
private SSLContextParameters sslContextParameters;
/**
- * The list of protocols enabled for SSL connections. TLSv1.2, TLSv1.1 and
- * TLSv1 are enabled by default.
+ * 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 SslProtocol.
*/
private String sslEnabledProtocols;
/**
@@ -745,8 +749,9 @@ public class KafkaComponentConfiguration
*/
private String sslKeymanagerAlgorithm = "SunX509";
/**
- * The password of the private key in the key store file. This is optional
- * for client.
+ * The password of the private key in the key store file or the PEM key
+ * specified in sslKeystoreKey. This is required for clients only if
two-way
+ * authentication is configured.
*/
private String sslKeyPassword;
/**
@@ -755,8 +760,9 @@ public class KafkaComponentConfiguration
*/
private String sslKeystoreLocation;
/**
- * The store password for the key store file.This is optional for client
and
- * only needed if ssl.keystore.location is configured.
+ * The store password for the key store file. This is optional for client
+ * and only needed if sslKeystoreLocation' is configured. Key store
password
+ * is not supported for PEM format.
*/
private String sslKeystorePassword;
/**
@@ -765,10 +771,16 @@ public class KafkaComponentConfiguration
*/
private String sslKeystoreType = "JKS";
/**
- * 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.
+ * The SSL protocol used to generate the SSLContext. The default is TLSv1.3
+ * when running with Java 11 or newer, TLSv1.2 otherwise. This value should
+ * be fine for most use cases. Allowed values in recent JVMs are TLSv1.2
and
+ * TLSv1.3. TLS, TLSv1.1, SSL, SSLv2 and SSLv3 may be supported in older
+ * JVMs, but their usage is discouraged due to known security
+ * vulnerabilities. With the default value for this config and
+ * sslEnabledProtocols, clients will downgrade to TLSv1.2 if the server
does
+ * not support TLSv1.3. If this config is set to TLSv1.2, clients will not
+ * use TLSv1.3 even if it is one of the values in sslEnabledProtocols and
+ * the server only supports TLSv1.3.
*/
private String sslProtocol;
/**
@@ -787,7 +799,9 @@ public class KafkaComponentConfiguration
*/
private String sslTruststoreLocation;
/**
- * The password for the trust store file.
+ * The password for the trust store file. If a password is not set, trust
+ * store file configured will still be used, but integrity checking is
+ * disabled. Trust store password is not supported for PEM format.
*/
private String sslTruststorePassword;
/**
diff --git
a/components-starter/camel-netty-http-starter/src/main/docs/netty-http.json
b/components-starter/camel-netty-http-starter/src/main/docs/netty-http.json
index 1f1d58b48a7..004fb9907e3 100644
--- a/components-starter/camel-netty-http-starter/src/main/docs/netty-http.json
+++ b/components-starter/camel-netty-http-starter/src/main/docs/netty-http.json
@@ -120,7 +120,7 @@
"type": "java.lang.String",
"description": "Which protocols to enable when using SSL",
"sourceType":
"org.apache.camel.component.netty.http.springboot.NettyHttpComponentConfiguration",
- "defaultValue": "TLSv1,TLSv1.1,TLSv1.2"
+ "defaultValue": "TLSv1.2,TLSv1.3"
},
{
"name": "camel.component.netty-http.encoders",
diff --git
a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
index 097416178d2..74e17a0397d 100644
---
a/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
+++
b/components-starter/camel-netty-http-starter/src/main/java/org/apache/camel/component/netty/http/springboot/NettyHttpComponentConfiguration.java
@@ -364,7 +364,7 @@ public class NettyHttpComponentConfiguration
/**
* Which protocols to enable when using SSL
*/
- private String enabledProtocols = "TLSv1,TLSv1.1,TLSv1.2";
+ private String enabledProtocols = "TLSv1.2,TLSv1.3";
/**
* Client side certificate keystore to be used for encryption
*/
diff --git a/components-starter/camel-netty-starter/src/main/docs/netty.json
b/components-starter/camel-netty-starter/src/main/docs/netty.json
index fbc134377dd..5f4950cc5ec 100644
--- a/components-starter/camel-netty-starter/src/main/docs/netty.json
+++ b/components-starter/camel-netty-starter/src/main/docs/netty.json
@@ -161,7 +161,7 @@
"type": "java.lang.String",
"description": "Which protocols to enable when using SSL",
"sourceType":
"org.apache.camel.component.netty.springboot.NettyComponentConfiguration",
- "defaultValue": "TLSv1,TLSv1.1,TLSv1.2"
+ "defaultValue": "TLSv1.2,TLSv1.3"
},
{
"name": "camel.component.netty.encoders",
diff --git
a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
index b9e99d025de..daf4fb28a47 100644
---
a/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
+++
b/components-starter/camel-netty-starter/src/main/java/org/apache/camel/component/netty/springboot/NettyComponentConfiguration.java
@@ -419,7 +419,7 @@ public class NettyComponentConfiguration
/**
* Which protocols to enable when using SSL
*/
- private String enabledProtocols = "TLSv1,TLSv1.1,TLSv1.2";
+ private String enabledProtocols = "TLSv1.2,TLSv1.3";
/**
* Client side certificate keystore to be used for encryption
*/
