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 f3ffa6b Regen
f3ffa6b is described below
commit f3ffa6b52f43277e38b04f38440f50021dba00ed
Author: Andrea Cosentino <[email protected]>
AuthorDate: Wed Jul 1 14:29:33 2020 +0200
Regen
---
.../camel/springboot/catalog/components/aws2-kinesis-firehose.json | 4 ++--
.../org/apache/camel/springboot/catalog/components/kafka.json | 4 ++--
.../camel-kafka-starter/src/main/docs/kafka-starter.adoc | 2 +-
.../camel/component/kafka/springboot/KafkaComponentConfiguration.java | 2 +-
docs/modules/ROOT/pages/kafka-starter.adoc | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
index 40bbed2..a1d4751 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis-firehose.json
@@ -24,7 +24,7 @@
"amazonKinesisFirehoseClient": { "kind": "property", "displayName":
"Amazon Kinesis Firehose Client", "group": "producer", "label": "", "required":
false, "type": "object", "javaType":
"software.amazon.awssdk.services.firehose.FirehoseClient", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Amazon Kinesis Firehose
client to use for all requests [...]
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"deprecated": false, "secret": false, "description": "Component configuration"
},
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the r [...]
- "operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations", "enum":
[ "sendBatchRecord", "createDeliveryStream", "deleteDeliveryStream" ],
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "descriptio [...]
+ "operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations", "enum":
[ "sendBatchRecord", "createDeliveryStream", "deleteDeliveryStream",
"updateDestination" ], "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "config [...]
"proxyHost": { "kind": "property", "displayName": "Proxy Host", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the Kinesis Firehose client" },
"proxyPort": { "kind": "property", "displayName": "Proxy Port", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the Kinesis Firehose client" },
"proxyProtocol": { "kind": "property", "displayName": "Proxy Protocol",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS"
], "deprecated": false, "secret": false, "defaultValue": "HTTPS",
"configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy
protocol when instantiating the [...]
@@ -37,7 +37,7 @@
"streamName": { "kind": "path", "displayName": "Stream Name", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Name of the stream" },
"amazonKinesisFirehoseClient": { "kind": "parameter", "displayName":
"Amazon Kinesis Firehose Client", "group": "producer", "label": "", "required":
false, "type": "object", "javaType":
"software.amazon.awssdk.services.firehose.FirehoseClient", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "Amazon Kinesis Firehose
client to use for all requests [...]
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the [...]
- "operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations", "enum":
[ "sendBatchRecord", "createDeliveryStream", "deleteDeliveryStream" ],
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "descripti [...]
+ "operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations", "enum":
[ "sendBatchRecord", "createDeliveryStream", "deleteDeliveryStream",
"updateDestination" ], "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "confi [...]
"proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy host
when instantiating the Kinesis Firehose client" },
"proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group":
"producer", "label": "", "required": false, "type": "integer", "javaType":
"java.lang.Integer", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy port
when instantiating the Kinesis Firehose client" },
"proxyProtocol": { "kind": "parameter", "displayName": "Proxy Protocol",
"group": "producer", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.core.Protocol", "enum": [ "HTTP", "HTTPS"
], "deprecated": false, "secret": false, "defaultValue": "HTTPS",
"configurationClass":
"org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration",
"configurationField": "configuration", "description": "To define a proxy
protocol when instantiating the [...]
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 6443848..7b45b93 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
@@ -105,7 +105,7 @@
"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", "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." },
+ "sslEndpointAlgorithm": { "kind": "property", "displayName": "Ssl Endpoint
Algorithm", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "defaultValue": "https", "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 [...]
@@ -206,7 +206,7 @@
"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", "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." },
+ "sslEndpointAlgorithm": { "kind": "parameter", "displayName": "Ssl
Endpoint Algorithm", "group": "security", "label": "common,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "defaultValue": "https",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The endpoint
identification algorithm to validate server hostname using server certific [...]
"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 [...]
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 49d0513..9d56262 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
@@ -104,7 +104,7 @@ The component supports 98 options, which are listed below.
| *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. NOTE: Kafka only supports loading keystore from file
locations, so prefix the location with file: in the KeyStoreParameters.resource
option. 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 | String
-| *camel.component.kafka.ssl-endpoint-algorithm* | The endpoint identification
algorithm to validate server hostname using server certificate. | | String
+| *camel.component.kafka.ssl-endpoint-algorithm* | The endpoint identification
algorithm to validate server hostname using server certificate. | https | 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
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 732d3a0..be1ec9c 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
@@ -619,7 +619,7 @@ public class KafkaComponentConfiguration
* The endpoint identification algorithm to validate server hostname using
* server certificate.
*/
- private String sslEndpointAlgorithm;
+ private String sslEndpointAlgorithm = "https";
/**
* The algorithm used by key manager factory for SSL connections. Default
* value is the key manager factory algorithm configured for the Java
diff --git a/docs/modules/ROOT/pages/kafka-starter.adoc
b/docs/modules/ROOT/pages/kafka-starter.adoc
index 49d0513..9d56262 100644
--- a/docs/modules/ROOT/pages/kafka-starter.adoc
+++ b/docs/modules/ROOT/pages/kafka-starter.adoc
@@ -104,7 +104,7 @@ The component supports 98 options, which are listed below.
| *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. NOTE: Kafka only supports loading keystore from file
locations, so prefix the location with file: in the KeyStoreParameters.resource
option. 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 | String
-| *camel.component.kafka.ssl-endpoint-algorithm* | The endpoint identification
algorithm to validate server hostname using server certificate. | | String
+| *camel.component.kafka.ssl-endpoint-algorithm* | The endpoint identification
algorithm to validate server hostname using server certificate. | https | 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
