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 cd177fd Regen cd177fd is described below commit cd177fd3555dc6ed45e84e1d61e2ec412cbcace0 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Tue Apr 14 14:11:17 2020 +0200 Regen --- .../springboot/catalog/components/aws2-kms.json | 2 ++ .../src/main/docs/aws2-kms-starter.adoc | 3 ++- .../kms/springboot/KMS2ComponentConfiguration.java | 12 ++++++++++++ components-starter/camel-corda-starter/pom.xml | 12 ++++++++++++ components-starter/camel-spring-boot-starter/pom.xml | 16 ++++++++++++++++ .../camel-spring-cloud-consul-starter/pom.xml | 20 ++++++++++++++++++++ .../camel-spring-cloud-netflix-starter/pom.xml | 20 ++++++++++++++++++++ .../camel-spring-cloud-starter/pom.xml | 20 ++++++++++++++++++++ .../camel-spring-cloud-zookeeper-starter/pom.xml | 20 ++++++++++++++++++++ docs/modules/ROOT/pages/aws2-kms-starter.adoc | 3 ++- 10 files changed, 126 insertions(+), 2 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kms.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kms.json index 92980ae..6164b75 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kms.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kms.json @@ -25,6 +25,7 @@ "kmsClient": { "kind": "property", "displayName": "Kms Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kms.KmsClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField": "configuration", "description": "To use a existing configured AWS KMS as client" }, "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": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.aws2.kms.KMS2Operations", "enum": [ "listKeys", "createKey", "disableKey", "scheduleKeyDeletion", "describeKey", "enableKey" ], "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField": "configuration", "descrip [...] + "pojoRequest": { "kind": "property", "displayName": "Pojo Request", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField": "configuration", "description": "If we want to use a POJO request as body or not" }, "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.kms.KMS2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the KMS 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.kms.KMS2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the KMS 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.kms.KMS2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the KMS client" }, @@ -38,6 +39,7 @@ "kmsClient": { "kind": "parameter", "displayName": "Kms Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.kms.KmsClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField": "configuration", "description": "To use a existing configured AWS KMS as client" }, "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": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.aws2.kms.KMS2Operations", "enum": [ "listKeys", "createKey", "disableKey", "scheduleKeyDeletion", "describeKey", "enableKey" ], "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField": "configuration", "descri [...] + "pojoRequest": { "kind": "parameter", "displayName": "Pojo Request", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.kms.KMS2Configuration", "configurationField": "configuration", "description": "If we want to use a POJO request as body or not" }, "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.kms.KMS2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the KMS 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.kms.KMS2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the KMS 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.kms.KMS2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the KMS client" }, diff --git a/components-starter/camel-aws2-kms-starter/src/main/docs/aws2-kms-starter.adoc b/components-starter/camel-aws2-kms-starter/src/main/docs/aws2-kms-starter.adoc index 42d2388..887613b 100644 --- a/components-starter/camel-aws2-kms-starter/src/main/docs/aws2-kms-starter.adoc +++ b/components-starter/camel-aws2-kms-starter/src/main/docs/aws2-kms-starter.adoc @@ -17,7 +17,7 @@ When using aws2-kms with Spring Boot make sure to use the following Maven depend ---- -The component supports 12 options, which are listed below. +The component supports 13 options, which are listed below. @@ -31,6 +31,7 @@ The component supports 12 options, which are listed below. | *camel.component.aws2-kms.kms-client* | To use a existing configured AWS KMS as client. The option is a software.amazon.awssdk.services.kms.KmsClient type. | | String | *camel.component.aws2-kms.lazy-start-producer* | 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 route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...] | *camel.component.aws2-kms.operation* | The operation to perform | | KMS2Operations +| *camel.component.aws2-kms.pojo-request* | If we want to use a POJO request as body or not | false | Boolean | *camel.component.aws2-kms.proxy-host* | To define a proxy host when instantiating the KMS client | | String | *camel.component.aws2-kms.proxy-port* | To define a proxy port when instantiating the KMS client | | Integer | *camel.component.aws2-kms.proxy-protocol* | To define a proxy protocol when instantiating the KMS client | | Protocol diff --git a/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentConfiguration.java b/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentConfiguration.java index ffd8098..7db3df8 100644 --- a/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentConfiguration.java +++ b/components-starter/camel-aws2-kms-starter/src/main/java/org/apache/camel/component/aws2/kms/springboot/KMS2ComponentConfiguration.java @@ -65,6 +65,10 @@ public class KMS2ComponentConfiguration */ private KMS2Operations operation; /** + * If we want to use a POJO request as body or not + */ + private Boolean pojoRequest = false; + /** * To define a proxy host when instantiating the KMS client */ private String proxyHost; @@ -128,6 +132,14 @@ public class KMS2ComponentConfiguration this.operation = operation; } + public Boolean getPojoRequest() { + return pojoRequest; + } + + public void setPojoRequest(Boolean pojoRequest) { + this.pojoRequest = pojoRequest; + } + public String getProxyHost() { return proxyHost; } diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml index 0391c60..f29dca1 100644 --- a/components-starter/camel-corda-starter/pom.xml +++ b/components-starter/camel-corda-starter/pom.xml @@ -38,6 +38,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-corda</artifactId> <version>${camel-version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-classic</artifactId> + </exclusion> + <exclusion> + <groupId>ch.qos.logback</groupId> + <artifactId>logback-core</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/components-starter/camel-spring-boot-starter/pom.xml b/components-starter/camel-spring-boot-starter/pom.xml index ef4dde9..a044dd9 100644 --- a/components-starter/camel-spring-boot-starter/pom.xml +++ b/components-starter/camel-spring-boot-starter/pom.xml @@ -48,6 +48,22 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> </exclusion> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </exclusion> </exclusions> <!--END OF GENERATED CODE--> </dependency> diff --git a/components-starter/camel-spring-cloud-consul-starter/pom.xml b/components-starter/camel-spring-cloud-consul-starter/pom.xml index 5df3ca4..6e257e9 100644 --- a/components-starter/camel-spring-cloud-consul-starter/pom.xml +++ b/components-starter/camel-spring-cloud-consul-starter/pom.xml @@ -38,6 +38,26 @@ <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-spring-cloud-consul</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/components-starter/camel-spring-cloud-netflix-starter/pom.xml b/components-starter/camel-spring-cloud-netflix-starter/pom.xml index fbba09a..beacbb0 100644 --- a/components-starter/camel-spring-cloud-netflix-starter/pom.xml +++ b/components-starter/camel-spring-cloud-netflix-starter/pom.xml @@ -38,6 +38,26 @@ <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-spring-cloud-netflix</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/components-starter/camel-spring-cloud-starter/pom.xml b/components-starter/camel-spring-cloud-starter/pom.xml index 0f4ff7d..35eb6a5 100644 --- a/components-starter/camel-spring-cloud-starter/pom.xml +++ b/components-starter/camel-spring-cloud-starter/pom.xml @@ -38,6 +38,26 @@ <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-spring-cloud</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml index 168d968..b29563b 100644 --- a/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml +++ b/components-starter/camel-spring-cloud-zookeeper-starter/pom.xml @@ -38,6 +38,26 @@ <groupId>org.apache.camel.springboot</groupId> <artifactId>camel-spring-cloud-zookeeper</artifactId> <version>${project.version}</version> + <!--START OF GENERATED CODE--> + <exclusions> + <exclusion> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-core</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.logging.log4j</groupId> + <artifactId>log4j-slf4j-impl</artifactId> + </exclusion> + </exclusions> + <!--END OF GENERATED CODE--> </dependency> <!--START OF GENERATED CODE--> <dependency> diff --git a/docs/modules/ROOT/pages/aws2-kms-starter.adoc b/docs/modules/ROOT/pages/aws2-kms-starter.adoc index 42d2388..887613b 100644 --- a/docs/modules/ROOT/pages/aws2-kms-starter.adoc +++ b/docs/modules/ROOT/pages/aws2-kms-starter.adoc @@ -17,7 +17,7 @@ When using aws2-kms with Spring Boot make sure to use the following Maven depend ---- -The component supports 12 options, which are listed below. +The component supports 13 options, which are listed below. @@ -31,6 +31,7 @@ The component supports 12 options, which are listed below. | *camel.component.aws2-kms.kms-client* | To use a existing configured AWS KMS as client. The option is a software.amazon.awssdk.services.kms.KmsClient type. | | String | *camel.component.aws2-kms.lazy-start-producer* | 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 route to fail being started. By deferring this startup to be lazy then the startup failure can be handled during routing messages via Camel's routing error handlers. Beware that when the first message is processed t [...] | *camel.component.aws2-kms.operation* | The operation to perform | | KMS2Operations +| *camel.component.aws2-kms.pojo-request* | If we want to use a POJO request as body or not | false | Boolean | *camel.component.aws2-kms.proxy-host* | To define a proxy host when instantiating the KMS client | | String | *camel.component.aws2-kms.proxy-port* | To define a proxy port when instantiating the KMS client | | Integer | *camel.component.aws2-kms.proxy-protocol* | To define a proxy protocol when instantiating the KMS client | | Protocol