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 577c8a4 Regen
577c8a4 is described below
commit 577c8a459610bcac038e1c538115797995ecad00
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Sat Feb 29 20:47:59 2020 +0100
Regen
---
.../camel/springboot/catalog/components/kafka.json | 2 +-
components-starter/camel-corda-starter/pom.xml | 12 +++++++++++
.../springboot/KafkaComponentConfiguration.java | 24 +++++++++++-----------
3 files changed, 25 insertions(+), 13 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/kafka.json
index 450d57f..a6424ea 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
@@ -110,9 +110,9 @@
"sslProtocol": { "kind": "property", "displayName": "Ssl Protocol",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"defaultValue": "TLS", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The SSL protocol used to generate the
SSLContext. Default setting is TLS, which is fine for most cases. Allow [...]
"sslProvider": { "kind": "property", "displayName": "Ssl Provider",
"group": "security", "label": "common,security", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The name of the security
provider used for SSL connections. Default value is the default security
provider of the JVM." },
"sslTrustmanagerAlgorithm": { "kind": "property", "displayName": "Ssl
Trustmanager Algorithm", "group": "security", "label": "common,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "defaultValue": "PKIX",
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "The algorithm used by
trust manager factory for SSL connections. Default value is [...]
+ "sslTruststoreLocation": { "kind": "property", "displayName": "Ssl
Truststore Location", "group": "security", "label": "producer,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The location of the trust store file." },
"sslTruststoreType": { "kind": "property", "displayName": "Ssl Truststore
Type", "group": "security", "label": "common,security", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "defaultValue": "JKS", "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The file format of the trust store file.
Default value is JKS." },
"schemaRegistryURL": { "kind": "property", "displayName": "Schema Registry
URL", "group": "confluent", "label": "confluent", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.kafka.KafkaConfiguration",
"configurationField": "configuration", "description": "URL of the Confluent
Platform schema registry servers to use. The format is host1:port1,host2:port2.
This is known as schema [...]
- "sslTruststoreLocation": { "kind": "property", "displayName": "Ssl
Truststore Location", "group": "security", "label": "producer,security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.kafka.KafkaConfiguration", "configurationField":
"configuration", "description": "The location of the trust store file." },
"sslTruststorePassword": { "kind": "property", "displayName": "Ssl
Truststore 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 for the trust store file." },
"useGlobalSslContextParameters": { "kind": "property", "displayName": "Use
Global Ssl Context Parameters", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "secret": false, "defaultValue": "false", "description": "Enable usage
of global SSL context parameters." }
},
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 61d6d32..cba8670 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-corda</artifactId>
<version>${camel-version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/components-starter/camel-kafka-starter/src/main/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 fc6cd79..b8107fc 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
@@ -656,6 +656,10 @@ public class KafkaComponentConfiguration
*/
private String sslTrustmanagerAlgorithm = "PKIX";
/**
+ * The location of the trust store file.
+ */
+ private String sslTruststoreLocation;
+ /**
* The file format of the trust store file. Default value is JKS.
*/
private String sslTruststoreType = "JKS";
@@ -667,10 +671,6 @@ public class KafkaComponentConfiguration
*/
private String schemaRegistryURL;
/**
- * The location of the trust store file.
- */
- private String sslTruststoreLocation;
- /**
* The password for the trust store file.
*/
private String sslTruststorePassword;
@@ -1410,6 +1410,14 @@ public class KafkaComponentConfiguration
this.sslTrustmanagerAlgorithm = sslTrustmanagerAlgorithm;
}
+ public String getSslTruststoreLocation() {
+ return sslTruststoreLocation;
+ }
+
+ public void setSslTruststoreLocation(String sslTruststoreLocation) {
+ this.sslTruststoreLocation = sslTruststoreLocation;
+ }
+
public String getSslTruststoreType() {
return sslTruststoreType;
}
@@ -1426,14 +1434,6 @@ public class KafkaComponentConfiguration
this.schemaRegistryURL = schemaRegistryURL;
}
- public String getSslTruststoreLocation() {
- return sslTruststoreLocation;
- }
-
- public void setSslTruststoreLocation(String sslTruststoreLocation) {
- this.sslTruststoreLocation = sslTruststoreLocation;
- }
-
public String getSslTruststorePassword() {
return sslTruststorePassword;
}
