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 84cf654 Regen 84cf654 is described below commit 84cf654102ef240a0560aa99fa815b02022055f4 Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Tue Jun 30 14:36:15 2020 +0200 Regen --- .../catalog/components/aws2-kinesis-firehose.json | 4 +++- .../springboot/catalog/components/aws2-kinesis.json | 2 +- .../apache/camel/springboot/catalog/others.properties | 18 ++++++++++++++++++ components-starter/README.adoc | 6 +++--- .../src/main/docs/aws2-kinesis-starter.adoc | 3 ++- .../KinesisFirehose2ComponentConfiguration.java | 15 ++++++++++++++- .../springboot/Kinesis2ComponentConfiguration.java | 4 ++-- components-starter/camel-corda-starter/pom.xml | 12 ++++++++++++ components-starter/camel-iota-starter/pom.xml | 12 ++++++++++++ docs/modules/ROOT/pages/aws2-kinesis-starter.adoc | 3 ++- docs/modules/ROOT/pages/list.adoc | 6 +++--- 11 files changed, 72 insertions(+), 13 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 89c0db7..f734c54 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 @@ -3,7 +3,7 @@ "kind": "component", "name": "aws2-kinesis-firehose", "title": "AWS 2 Kinesis Firehose", - "description": "Consume data from AWS Kinesis Firehose streams using AWS SDK version 2.x.", + "description": "Produce data to AWS Kinesis Firehose streams using AWS SDK version 2.x.", "deprecated": false, "firstVersion": "3.2.0", "label": "cloud,messaging", @@ -24,6 +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" ], "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "configurationField": "configuration", "description": "The operation to do in case the user don't [...] "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 [...] @@ -36,6 +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" ], "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration", "configurationField": "configuration", "description": "The operation to do in case the user don't [...] "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/aws2-kinesis.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json index cff0481..e65ba2f 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-kinesis.json @@ -3,7 +3,7 @@ "kind": "component", "name": "aws2-kinesis", "title": "AWS 2 Kinesis", - "description": "Consume and produce records from AWS Kinesis Streams using AWS SDK version 2.x.", + "description": "Consume and produce records from and to AWS Kinesis Streams using AWS SDK version 2.x.", "deprecated": false, "firstVersion": "3.2.0", "label": "cloud,messaging", diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties new file mode 100644 index 0000000..ba7e95b --- /dev/null +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/others.properties @@ -0,0 +1,18 @@ +aws-xray +cxf-transport +hystrix +jasypt +leveldb +lra +openapi-java +opentracing +reactor +resilience4j +ribbon +rxjava +shiro +spring-javaconfig +spring-security +swagger-java +undertow-spring-security +zipkin \ No newline at end of file diff --git a/components-starter/README.adoc b/components-starter/README.adoc index b38d419..40f7a55 100644 --- a/components-starter/README.adoc +++ b/components-starter/README.adoc @@ -90,10 +90,10 @@ Number of Camel components: 331 in 264 JAR artifacts (1 deprecated) `aws2-kms:label` | 3.1 | Manage keys stored in AWS KMS instances using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-kinesis-component.html[AWS 2 Kinesis] (camel-aws2-kinesis-starter) + -`aws2-kinesis:streamName` | 3.2 | Consume and produce records from AWS Kinesis Streams using AWS SDK version 2.x. +`aws2-kinesis:streamName` | 3.2 | Consume and produce records from and to AWS Kinesis Streams using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-kinesis-firehose-component.html[AWS 2 Kinesis Firehose] (camel-aws2-kinesis-starter) + -`aws2-kinesis-firehose:streamName` | 3.2 | Consume data from AWS Kinesis Firehose streams using AWS SDK version 2.x. +`aws2-kinesis-firehose:streamName` | 3.2 | Produce data to AWS Kinesis Firehose streams using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-lambda-component.html[AWS 2 Lambda] (camel-aws2-lambda-starter) + `aws2-lambda:function` | 3.2 | Manage and invoke AWS Lambda functions using AWS SDK version 2.x. @@ -1219,7 +1219,7 @@ Number of Camel languages: 17 in 11 JAR artifacts (0 deprecated) == Miscellaneous Extensions // others: START -Number of miscellaneous extensions: 23 in 23 JAR artifacts (1 deprecated) +Number of miscellaneous extensions: 22 in 22 JAR artifacts (1 deprecated) [width="100%",cols="4,1,5",options="header"] |=== diff --git a/components-starter/camel-aws2-kinesis-starter/src/main/docs/aws2-kinesis-starter.adoc b/components-starter/camel-aws2-kinesis-starter/src/main/docs/aws2-kinesis-starter.adoc index 046f761..114cca2 100644 --- a/components-starter/camel-aws2-kinesis-starter/src/main/docs/aws2-kinesis-starter.adoc +++ b/components-starter/camel-aws2-kinesis-starter/src/main/docs/aws2-kinesis-starter.adoc @@ -17,7 +17,7 @@ When using aws2-kinesis with Spring Boot make sure to use the following Maven de ---- -The component supports 28 options, which are listed below. +The component supports 29 options, which are listed below. @@ -30,6 +30,7 @@ The component supports 28 options, which are listed below. | *camel.component.aws2-kinesis-firehose.configuration* | Component configuration. The option is a org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration type. | | String | *camel.component.aws2-kinesis-firehose.enabled* | Whether to enable auto configuration of the aws2-kinesis-firehose component. This is enabled by default. | | Boolean | *camel.component.aws2-kinesis-firehose.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 i [...] +| *camel.component.aws2-kinesis-firehose.operation* | The operation to do in case the user don't want to send only a record | | KinesisFirehose2Operations | *camel.component.aws2-kinesis-firehose.proxy-host* | To define a proxy host when instantiating the Kinesis Firehose client | | String | *camel.component.aws2-kinesis-firehose.proxy-port* | To define a proxy port when instantiating the Kinesis Firehose client | | Integer | *camel.component.aws2-kinesis-firehose.proxy-protocol* | To define a proxy protocol when instantiating the Kinesis Firehose client | | Protocol diff --git a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConfiguration.java b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConfiguration.java index ee0daff..cf98837 100644 --- a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConfiguration.java +++ b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/firehose/springboot/KinesisFirehose2ComponentConfiguration.java @@ -18,12 +18,13 @@ package org.apache.camel.component.aws2.firehose.springboot; import javax.annotation.Generated; import org.apache.camel.component.aws2.firehose.KinesisFirehose2Component; +import org.apache.camel.component.aws2.firehose.KinesisFirehose2Operations; import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon; import org.springframework.boot.context.properties.ConfigurationProperties; import software.amazon.awssdk.core.Protocol; /** - * Consume data from AWS Kinesis Firehose streams using AWS SDK version 2.x. + * Produce data to AWS Kinesis Firehose streams using AWS SDK version 2.x. * * Generated by camel-package-maven-plugin - do not edit this file! */ @@ -62,6 +63,10 @@ public class KinesisFirehose2ComponentConfiguration */ private Boolean lazyStartProducer = false; /** + * The operation to do in case the user don't want to send only a record + */ + private KinesisFirehose2Operations operation; + /** * To define a proxy host when instantiating the Kinesis Firehose client */ private String proxyHost; @@ -119,6 +124,14 @@ public class KinesisFirehose2ComponentConfiguration this.lazyStartProducer = lazyStartProducer; } + public KinesisFirehose2Operations getOperation() { + return operation; + } + + public void setOperation(KinesisFirehose2Operations operation) { + this.operation = operation; + } + public String getProxyHost() { return proxyHost; } diff --git a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentConfiguration.java b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentConfiguration.java index 320dac8..2c4d7de 100644 --- a/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentConfiguration.java +++ b/components-starter/camel-aws2-kinesis-starter/src/main/java/org/apache/camel/component/aws2/kinesis/springboot/Kinesis2ComponentConfiguration.java @@ -25,8 +25,8 @@ import software.amazon.awssdk.core.Protocol; import software.amazon.awssdk.services.kinesis.model.ShardIteratorType; /** - * Consume and produce records from AWS Kinesis Streams using AWS SDK version - * 2.x. + * Consume and produce records from and to AWS Kinesis Streams using AWS SDK + * version 2.x. * * Generated by camel-package-maven-plugin - do not edit this file! */ diff --git a/components-starter/camel-corda-starter/pom.xml b/components-starter/camel-corda-starter/pom.xml index 254cb1b..7f14a21 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-iota-starter/pom.xml b/components-starter/camel-iota-starter/pom.xml index 9427c49..1cb0cae 100644 --- a/components-starter/camel-iota-starter/pom.xml +++ b/components-starter/camel-iota-starter/pom.xml @@ -38,6 +38,18 @@ <groupId>org.apache.camel</groupId> <artifactId>camel-iota</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/docs/modules/ROOT/pages/aws2-kinesis-starter.adoc b/docs/modules/ROOT/pages/aws2-kinesis-starter.adoc index 046f761..114cca2 100644 --- a/docs/modules/ROOT/pages/aws2-kinesis-starter.adoc +++ b/docs/modules/ROOT/pages/aws2-kinesis-starter.adoc @@ -17,7 +17,7 @@ When using aws2-kinesis with Spring Boot make sure to use the following Maven de ---- -The component supports 28 options, which are listed below. +The component supports 29 options, which are listed below. @@ -30,6 +30,7 @@ The component supports 28 options, which are listed below. | *camel.component.aws2-kinesis-firehose.configuration* | Component configuration. The option is a org.apache.camel.component.aws2.firehose.KinesisFirehose2Configuration type. | | String | *camel.component.aws2-kinesis-firehose.enabled* | Whether to enable auto configuration of the aws2-kinesis-firehose component. This is enabled by default. | | Boolean | *camel.component.aws2-kinesis-firehose.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 i [...] +| *camel.component.aws2-kinesis-firehose.operation* | The operation to do in case the user don't want to send only a record | | KinesisFirehose2Operations | *camel.component.aws2-kinesis-firehose.proxy-host* | To define a proxy host when instantiating the Kinesis Firehose client | | String | *camel.component.aws2-kinesis-firehose.proxy-port* | To define a proxy port when instantiating the Kinesis Firehose client | | Integer | *camel.component.aws2-kinesis-firehose.proxy-protocol* | To define a proxy protocol when instantiating the Kinesis Firehose client | | Protocol diff --git a/docs/modules/ROOT/pages/list.adoc b/docs/modules/ROOT/pages/list.adoc index b38d419..40f7a55 100644 --- a/docs/modules/ROOT/pages/list.adoc +++ b/docs/modules/ROOT/pages/list.adoc @@ -90,10 +90,10 @@ Number of Camel components: 331 in 264 JAR artifacts (1 deprecated) `aws2-kms:label` | 3.1 | Manage keys stored in AWS KMS instances using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-kinesis-component.html[AWS 2 Kinesis] (camel-aws2-kinesis-starter) + -`aws2-kinesis:streamName` | 3.2 | Consume and produce records from AWS Kinesis Streams using AWS SDK version 2.x. +`aws2-kinesis:streamName` | 3.2 | Consume and produce records from and to AWS Kinesis Streams using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-kinesis-firehose-component.html[AWS 2 Kinesis Firehose] (camel-aws2-kinesis-starter) + -`aws2-kinesis-firehose:streamName` | 3.2 | Consume data from AWS Kinesis Firehose streams using AWS SDK version 2.x. +`aws2-kinesis-firehose:streamName` | 3.2 | Produce data to AWS Kinesis Firehose streams using AWS SDK version 2.x. | link:https://camel.apache.org/components/latest/aws2-lambda-component.html[AWS 2 Lambda] (camel-aws2-lambda-starter) + `aws2-lambda:function` | 3.2 | Manage and invoke AWS Lambda functions using AWS SDK version 2.x. @@ -1219,7 +1219,7 @@ Number of Camel languages: 17 in 11 JAR artifacts (0 deprecated) == Miscellaneous Extensions // others: START -Number of miscellaneous extensions: 23 in 23 JAR artifacts (1 deprecated) +Number of miscellaneous extensions: 22 in 22 JAR artifacts (1 deprecated) [width="100%",cols="4,1,5",options="header"] |===