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.git
The following commit(s) were added to refs/heads/main by this push: new 93852adc6c9 Regen 93852adc6c9 is described below commit 93852adc6c98a56a91c3561f7c10faf3316e1abc Author: Claus Ibsen <claus.ib...@gmail.com> AuthorDate: Fri Sep 9 18:55:36 2022 +0200 Regen --- .../dsl/KafkaComponentBuilderFactory.java | 41 ++++--- .../dsl/NettyComponentBuilderFactory.java | 2 +- .../dsl/NettyHttpComponentBuilderFactory.java | 2 +- .../endpoint/dsl/FtpsEndpointBuilderFactory.java | 6 +- .../endpoint/dsl/KafkaEndpointBuilderFactory.java | 123 ++++++++++++++------- .../endpoint/dsl/NettyEndpointBuilderFactory.java | 6 +- .../dsl/NettyHttpEndpointBuilderFactory.java | 6 +- 7 files changed, 123 insertions(+), 63 deletions(-) diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java index 8d55e07640c..2a70431fd1e 100644 --- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java +++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/KafkaComponentBuilderFactory.java @@ -1795,7 +1795,7 @@ public interface KafkaComponentBuilderFactory { * 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 + * SSL network protocol. By default all the available cipher suites are * supported. * * The option is a: <code>java.lang.String</code> type. @@ -1831,8 +1831,13 @@ public interface KafkaComponentBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -1883,8 +1888,9 @@ public interface KafkaComponentBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -1915,8 +1921,9 @@ public interface KafkaComponentBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -1948,11 +1955,16 @@ public interface KafkaComponentBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -2014,7 +2026,10 @@ public interface KafkaComponentBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java index 243971b4609..4a3a6247402 100644 --- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java +++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyComponentBuilderFactory.java @@ -1096,7 +1096,7 @@ public interface NettyComponentBuilderFactory { * * The option is a: <code>java.lang.String</code> type. * - * Default: TLSv1,TLSv1.1,TLSv1.2 + * Default: TLSv1.2,TLSv1.3 * Group: security * * @param enabledProtocols the value to set diff --git a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyHttpComponentBuilderFactory.java b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyHttpComponentBuilderFactory.java index 0e5917a4949..f79836a2ec6 100644 --- a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyHttpComponentBuilderFactory.java +++ b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/NettyHttpComponentBuilderFactory.java @@ -1155,7 +1155,7 @@ public interface NettyHttpComponentBuilderFactory { * * The option is a: <code>java.lang.String</code> type. * - * Default: TLSv1,TLSv1.1,TLSv1.2 + * Default: TLSv1.2,TLSv1.3 * Group: security * * @param enabledProtocols the value to set diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java index 6d6d67bd793..eebb6e0858b 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/FtpsEndpointBuilderFactory.java @@ -2318,7 +2318,7 @@ public interface FtpsEndpointBuilderFactory { * * The option is a: <code>java.lang.String</code> type. * - * Default: TLSv1.2 + * Default: TLSv1.3 * Group: security * * @param securityProtocol the value to set @@ -4238,7 +4238,7 @@ public interface FtpsEndpointBuilderFactory { * * The option is a: <code>java.lang.String</code> type. * - * Default: TLSv1.2 + * Default: TLSv1.3 * Group: security * * @param securityProtocol the value to set @@ -5742,7 +5742,7 @@ public interface FtpsEndpointBuilderFactory { * * The option is a: <code>java.lang.String</code> type. * - * Default: TLSv1.2 + * Default: TLSv1.3 * Group: security * * @param securityProtocol the value to set diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java index 644a37d8324..3fdf63681f0 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/KafkaEndpointBuilderFactory.java @@ -1488,7 +1488,7 @@ public interface KafkaEndpointBuilderFactory { * 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 + * SSL network protocol. By default all the available cipher suites are * supported. * * The option is a: <code>java.lang.String</code> type. @@ -1544,8 +1544,13 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -1596,8 +1601,9 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -1628,8 +1634,9 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -1661,11 +1668,16 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -1727,7 +1739,10 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -3616,7 +3631,7 @@ public interface KafkaEndpointBuilderFactory { * 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 + * SSL network protocol. By default all the available cipher suites are * supported. * * The option is a: <code>java.lang.String</code> type. @@ -3672,8 +3687,13 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -3724,8 +3744,9 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -3756,8 +3777,9 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -3789,11 +3811,16 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -3855,7 +3882,10 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -4470,7 +4500,7 @@ public interface KafkaEndpointBuilderFactory { * 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 + * SSL network protocol. By default all the available cipher suites are * supported. * * The option is a: <code>java.lang.String</code> type. @@ -4525,8 +4555,13 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -4577,8 +4612,9 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -4608,8 +4644,9 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -4640,11 +4677,16 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * @@ -4706,7 +4748,10 @@ public interface KafkaEndpointBuilderFactory { return this; } /** - * 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. * * The option is a: <code>java.lang.String</code> type. * diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java index 1977d614a53..4f223ff2985 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyEndpointBuilderFactory.java @@ -644,7 +644,7 @@ public interface NettyEndpointBuilderFactory { * * The option is a: <code>java.lang.String</code> type. * - * Default: TLSv1,TLSv1.1,TLSv1.2 + * Default: TLSv1.2,TLSv1.3 * Group: security * * @param enabledProtocols the value to set @@ -2447,7 +2447,7 @@ public interface NettyEndpointBuilderFactory { * * The option is a: <code>java.lang.String</code> type. * - * Default: TLSv1,TLSv1.1,TLSv1.2 + * Default: TLSv1.2,TLSv1.3 * Group: security * * @param enabledProtocols the value to set @@ -4097,7 +4097,7 @@ public interface NettyEndpointBuilderFactory { * * The option is a: <code>java.lang.String</code> type. * - * Default: TLSv1,TLSv1.1,TLSv1.2 + * Default: TLSv1.2,TLSv1.3 * Group: security * * @param enabledProtocols the value to set diff --git a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java index 3f22e5bd8e3..33616075983 100644 --- a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java +++ b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/NettyHttpEndpointBuilderFactory.java @@ -476,7 +476,7 @@ public interface NettyHttpEndpointBuilderFactory { * * The option is a: <code>java.lang.String</code> type. * - * Default: TLSv1,TLSv1.1,TLSv1.2 + * Default: TLSv1.2,TLSv1.3 * Group: security * * @param enabledProtocols the value to set @@ -2769,7 +2769,7 @@ public interface NettyHttpEndpointBuilderFactory { * * The option is a: <code>java.lang.String</code> type. * - * Default: TLSv1,TLSv1.1,TLSv1.2 + * Default: TLSv1.2,TLSv1.3 * Group: security * * @param enabledProtocols the value to set @@ -4380,7 +4380,7 @@ public interface NettyHttpEndpointBuilderFactory { * * The option is a: <code>java.lang.String</code> type. * - * Default: TLSv1,TLSv1.1,TLSv1.2 + * Default: TLSv1.2,TLSv1.3 * Group: security * * @param enabledProtocols the value to set