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 19700b2 Regen
19700b2 is described below
commit 19700b2bea2cf79ea6664c287637215b36c1ea3b
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu Jul 30 14:39:45 2020 +0200
Regen
---
.../apache/camel/springboot/catalog/components/aws2-s3.json | 4 ++--
.../apache/camel/springboot/catalog/components/aws2-sqs.json | 4 ++--
.../camel-aws2-s3-starter/src/main/docs/aws2-s3-starter.adoc | 2 +-
.../aws2/s3/springboot/AWS2S3ComponentConfiguration.java | 4 +++-
components-starter/camel-corda-starter/pom.xml | 12 ++++++++++++
components-starter/camel-iota-starter/pom.xml | 12 ++++++++++++
docs/modules/ROOT/pages/aws2-s3-starter.adoc | 2 +-
7 files changed, 33 insertions(+), 7 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
index 05b5cb6..161da14 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-s3.json
@@ -22,7 +22,7 @@
},
"componentProperties": {
"amazonS3Client": { "kind": "property", "displayName": "Amazon S3 Client",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.services.s3.S3Client", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Reference to a
com.amazonaws.services.s3.AmazonS3 in the registry." },
- "autoCreateBucket": { "kind": "property", "displayName": "Auto Create
Bucket", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Setting the autocreation of the bucket" },
+ "autoCreateBucket": { "kind": "property", "displayName": "Auto Create
Bucket", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Setting the autocreation of the S3 bucket
bucketName. This will apply also in case of moveAfterRead option enable [...]
"autoDiscoverClient": { "kind": "property", "displayName": "Auto Discover
Client", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Setting the autoDiscoverClient mechanism, if
true, the component will look for a client instance in the regis [...]
"configuration": { "kind": "property", "displayName": "Configuration",
"group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.aws2.s3.AWS2S3Configuration",
"deprecated": false, "secret": false, "description": "The component
configuration" },
"overrideEndpoint": { "kind": "property", "displayName": "Override
Endpoint", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "false", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Set the need for overidding the endpoint. This
option needs to be used in combination with uriEndpointOverride option" },
@@ -65,7 +65,7 @@
"properties": {
"bucketNameOrArn": { "kind": "path", "displayName": "Bucket Name Or Arn",
"group": "common", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "Bucket name or ARN" },
"amazonS3Client": { "kind": "parameter", "displayName": "Amazon S3
Client", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "software.amazon.awssdk.services.s3.S3Client", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Reference to a
com.amazonaws.services.s3.AmazonS3 in the registry." },
- "autoCreateBucket": { "kind": "parameter", "displayName": "Auto Create
Bucket", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Setting the autocreation of the bucket" },
+ "autoCreateBucket": { "kind": "parameter", "displayName": "Auto Create
Bucket", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Setting the autocreation of the S3 bucket
bucketName. This will apply also in case of moveAfterRead option enabl [...]
"autoDiscoverClient": { "kind": "parameter", "displayName": "Auto Discover
Client", "group": "common", "label": "common", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Setting the autoDiscoverClient mechanism, if
true, the component will look for a client instance in the regi [...]
"overrideEndpoint": { "kind": "parameter", "displayName": "Override
Endpoint", "group": "common", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "false", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "Set the need for overidding the endpoint. This
option needs to be used in combination with uriEndpointOverride option" },
"pojoRequest": { "kind": "parameter", "displayName": "Pojo Request",
"group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
"false", "configurationClass":
"org.apache.camel.component.aws2.s3.AWS2S3Configuration", "configurationField":
"configuration", "description": "If we want to use a POJO request as body or
not" },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
index 78c72a3..8bc2b6a 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-sqs.json
@@ -48,7 +48,7 @@
"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 [...]
"messageDeduplicationIdStrategy": { "kind": "property", "displayName":
"Message Deduplication Id Strategy", "group": "producer", "label": "producer",
"required": false, "type": "string", "javaType": "java.lang.String", "enum": [
"useExchangeId", "useContentBasedDeduplication" ], "deprecated": false,
"secret": false, "defaultValue": "useExchangeId", "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Onl [...]
"messageGroupIdStrategy": { "kind": "property", "displayName": "Message
Group Id Strategy", "group": "producer", "label": "producer", "required":
false, "type": "string", "javaType": "java.lang.String", "enum": [
"useConstant", "useExchangeId", "usePropertyValue" ], "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Only for FIFO queues. Strategy for setting the
me [...]
- "operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.aws2.sqs.Sqs2Operations", "enum": [
"sendBatchMessage", "deleteMessage", "listQueues" ], "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "The operation to do in case the user don't wa
[...]
+ "operation": { "kind": "property", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.aws2.sqs.Sqs2Operations", "enum": [
"sendBatchMessage", "deleteMessage", "listQueues", "purgeQueue" ],
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "The operation to do in case the [...]
"basicPropertyBinding": { "kind": "property", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
"delayQueue": { "kind": "property", "displayName": "Delay Queue", "group":
"advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Define if you want to apply delaySeconds
option to the queue or on single messages" },
"queueUrl": { "kind": "property", "displayName": "Queue Url", "group":
"advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration",
"configurationField": "configuration", "description": "To define the queueUrl
explicitly. All other parameters, which would influence the queueUrl, are
ignored. This parameter is intended to be used [...]
@@ -96,7 +96,7 @@
"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 [...]
"messageDeduplicationIdStrategy": { "kind": "parameter", "displayName":
"Message Deduplication Id Strategy", "group": "producer", "label": "producer",
"required": false, "type": "string", "javaType": "java.lang.String", "enum": [
"useExchangeId", "useContentBasedDeduplication" ], "deprecated": false,
"secret": false, "defaultValue": "useExchangeId", "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "On [...]
"messageGroupIdStrategy": { "kind": "parameter", "displayName": "Message
Group Id Strategy", "group": "producer", "label": "producer", "required":
false, "type": "string", "javaType": "java.lang.String", "enum": [
"useConstant", "useExchangeId", "usePropertyValue" ], "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Only for FIFO queues. Strategy for setting the
m [...]
- "operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.aws2.sqs.Sqs2Operations", "enum": [
"sendBatchMessage", "deleteMessage", "listQueues" ], "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "The operation to do in case the user don't w
[...]
+ "operation": { "kind": "parameter", "displayName": "Operation", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.aws2.sqs.Sqs2Operations", "enum": [
"sendBatchMessage", "deleteMessage", "listQueues", "purgeQueue" ],
"deprecated": false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "The operation to do in case th [...]
"basicPropertyBinding": { "kind": "parameter", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the endpoint should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
"delayQueue": { "kind": "parameter", "displayName": "Delay Queue",
"group": "advanced", "label": "advanced", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "configurationClass":
"org.apache.camel.component.aws2.sqs.Sqs2Configuration", "configurationField":
"configuration", "description": "Define if you want to apply delaySeconds
option to the queue or on single messages" },
"queueUrl": { "kind": "parameter", "displayName": "Queue Url", "group":
"advanced", "label": "advanced", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.sqs.Sqs2Configuration",
"configurationField": "configuration", "description": "To define the queueUrl
explicitly. All other parameters, which would influence the queueUrl, are
ignored. This parameter is intended to be use [...]
diff --git
a/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3-starter.adoc
b/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3-starter.adoc
index 5f4a6b9..56f4e65 100644
---
a/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3-starter.adoc
+++
b/components-starter/camel-aws2-s3-starter/src/main/docs/aws2-s3-starter.adoc
@@ -26,7 +26,7 @@ The component supports 41 options, which are listed below.
| Name | Description | Default | Type
| *camel.component.aws2-s3.access-key* | Amazon AWS Access Key | | String
| *camel.component.aws2-s3.amazon-s3-client* | Reference to a
com.amazonaws.services.s3.AmazonS3 in the registry. The option is a
software.amazon.awssdk.services.s3.S3Client type. | | String
-| *camel.component.aws2-s3.auto-create-bucket* | Setting the autocreation of
the bucket | true | Boolean
+| *camel.component.aws2-s3.auto-create-bucket* | Setting the autocreation of
the S3 bucket bucketName. This will apply also in case of moveAfterRead option
enabled and it will create the destinationBucket if it doesn't exist already. |
true | Boolean
| *camel.component.aws2-s3.auto-discover-client* | Setting the
autoDiscoverClient mechanism, if true, the component will look for a client
instance in the registry automatically otherwise it will skip that checking. |
true | Boolean
| *camel.component.aws2-s3.autoclose-body* | If this option is true and
includeBody is true, then the S3Object.close() method will be called on
exchange completion. This option is strongly related to includeBody option. In
case of setting includeBody to true and autocloseBody to false, it will be up
to the caller to close the S3Object stream. Setting autocloseBody to true, will
close the S3Object stream automatically. | true | Boolean
| *camel.component.aws2-s3.aws-k-m-s-key-id* | Define the id of KMS key to use
in case KMS is enabled | | String
diff --git
a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
index b227126..86685fa 100644
---
a/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
+++
b/components-starter/camel-aws2-s3-starter/src/main/java/org/apache/camel/component/aws2/s3/springboot/AWS2S3ComponentConfiguration.java
@@ -46,7 +46,9 @@ public class AWS2S3ComponentConfiguration
*/
private String amazonS3Client;
/**
- * Setting the autocreation of the bucket
+ * Setting the autocreation of the S3 bucket bucketName. This will apply
+ * also in case of moveAfterRead option enabled and it will create the
+ * destinationBucket if it doesn't exist already.
*/
private Boolean autoCreateBucket = true;
/**
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-s3-starter.adoc
b/docs/modules/ROOT/pages/aws2-s3-starter.adoc
index 5f4a6b9..56f4e65 100644
--- a/docs/modules/ROOT/pages/aws2-s3-starter.adoc
+++ b/docs/modules/ROOT/pages/aws2-s3-starter.adoc
@@ -26,7 +26,7 @@ The component supports 41 options, which are listed below.
| Name | Description | Default | Type
| *camel.component.aws2-s3.access-key* | Amazon AWS Access Key | | String
| *camel.component.aws2-s3.amazon-s3-client* | Reference to a
com.amazonaws.services.s3.AmazonS3 in the registry. The option is a
software.amazon.awssdk.services.s3.S3Client type. | | String
-| *camel.component.aws2-s3.auto-create-bucket* | Setting the autocreation of
the bucket | true | Boolean
+| *camel.component.aws2-s3.auto-create-bucket* | Setting the autocreation of
the S3 bucket bucketName. This will apply also in case of moveAfterRead option
enabled and it will create the destinationBucket if it doesn't exist already. |
true | Boolean
| *camel.component.aws2-s3.auto-discover-client* | Setting the
autoDiscoverClient mechanism, if true, the component will look for a client
instance in the registry automatically otherwise it will skip that checking. |
true | Boolean
| *camel.component.aws2-s3.autoclose-body* | If this option is true and
includeBody is true, then the S3Object.close() method will be called on
exchange completion. This option is strongly related to includeBody option. In
case of setting includeBody to true and autocloseBody to false, it will be up
to the caller to close the S3Object stream. Setting autocloseBody to true, will
close the S3Object stream automatically. | true | Boolean
| *camel.component.aws2-s3.aws-k-m-s-key-id* | Define the id of KMS key to use
in case KMS is enabled | | String