This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 19f5117f898 Upgrade AWS SDK v2 to version 2.20.151 (#11480)
19f5117f898 is described below
commit 19f5117f898f803318070423532acdd5ef85ee43
Author: Andrea Cosentino <[email protected]>
AuthorDate: Wed Sep 20 10:22:45 2023 +0200
Upgrade AWS SDK v2 to version 2.20.151 (#11480)
Signed-off-by: Andrea Cosentino <[email protected]>
---
.../apache/camel/catalog/components/aws2-ec2.json | 2 +-
.../apache/camel/component/aws2/ec2/aws2-ec2.json | 2 +-
.../dsl/GoogleSheetsComponentBuilderFactory.java | 5 +++-
.../GoogleSheetsStreamComponentBuilderFactory.java | 10 ++++----
.../dsl/GoogleSheetsEndpointBuilderFactory.java | 30 +++++++++++++++++-----
.../GoogleSheetsStreamEndpointBuilderFactory.java | 10 ++++----
parent/pom.xml | 2 +-
7 files changed, 41 insertions(+), 20 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json
index b24d341ac70..27418102271 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/aws2-ec2.json
@@ -45,7 +45,7 @@
},
"headers": {
"CamelAwsEC2ImageId": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "An image ID of the AWS marketplace", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#IMAGE_ID" },
- "CamelAwsEC2InstanceType": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType":
"software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [
"a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal",
"c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge",
"c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge",
"c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", [...]
+ "CamelAwsEC2InstanceType": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType":
"software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [
"a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal",
"c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge",
"c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge",
"c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", [...]
"CamelAwsEC2Operation": { "index": 2, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The operation we want to perform", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#OPERATION" },
"CamelAwsEC2InstanceMinCount": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The minimum number of instances we want
to run.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MIN_COUNT" },
"CamelAwsEC2InstanceMaxCount": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The maximum number of instances we want
to run.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MAX_COUNT" },
diff --git
a/components/camel-aws/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json
b/components/camel-aws/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json
index b24d341ac70..27418102271 100644
---
a/components/camel-aws/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json
+++
b/components/camel-aws/camel-aws2-ec2/src/generated/resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json
@@ -45,7 +45,7 @@
},
"headers": {
"CamelAwsEC2ImageId": { "index": 0, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "An image ID of the AWS marketplace", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#IMAGE_ID" },
- "CamelAwsEC2InstanceType": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType":
"software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [
"a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal",
"c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge",
"c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge",
"c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", [...]
+ "CamelAwsEC2InstanceType": { "index": 1, "kind": "header", "displayName":
"", "group": "producer", "label": "", "required": false, "javaType":
"software.amazon.awssdk.services.ec2.model.InstanceType", "enum": [
"a1.medium", "a1.large", "a1.xlarge", "a1.2xlarge", "a1.4xlarge", "a1.metal",
"c1.medium", "c1.xlarge", "c3.large", "c3.xlarge", "c3.2xlarge", "c3.4xlarge",
"c3.8xlarge", "c4.large", "c4.xlarge", "c4.2xlarge", "c4.4xlarge",
"c4.8xlarge", "c5.large", "c5.xlarge", "c5.2xlarge", [...]
"CamelAwsEC2Operation": { "index": 2, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "deprecationNote": "", "autowired": false, "secret":
false, "description": "The operation we want to perform", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#OPERATION" },
"CamelAwsEC2InstanceMinCount": { "index": 3, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The minimum number of instances we want
to run.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MIN_COUNT" },
"CamelAwsEC2InstanceMaxCount": { "index": 4, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Integer", "deprecated": false, "deprecationNote": "", "autowired":
false, "secret": false, "description": "The maximum number of instances we want
to run.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCE_MAX_COUNT" },
diff --git
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java
index 3343af3ffe4..93c9a272142 100644
---
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java
+++
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsComponentBuilderFactory.java
@@ -111,7 +111,10 @@ public interface GoogleSheetsComponentBuilderFactory {
return this;
}
/**
- * Sheets scopes.
+ * Specifies the level of permissions you want a sheets application to
+ * have to a user account. See
+ * https://developers.google.com/identity/protocols/googlescopes for
+ * more info.
*
* The option is a:
*
<code>java.util.Collection&lt;java.lang.String&gt;</code>
type.
diff --git
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
index 0c8acb3e0aa..e27c5b8b48d 100644
---
a/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
+++
b/dsl/camel-componentdsl/src/generated/java/org/apache/camel/builder/component/dsl/GoogleSheetsStreamComponentBuilderFactory.java
@@ -51,7 +51,7 @@ public interface GoogleSheetsStreamComponentBuilderFactory {
extends
ComponentBuilder<GoogleSheetsStreamComponent> {
/**
- * Google sheets application name. Example would be
+ * Google Sheets application name. Example would be
* camel-google-sheets/1.0.
*
* The option is a: <code>java.lang.String</code> type.
@@ -203,7 +203,7 @@ public interface GoogleSheetsStreamComponentBuilderFactory {
* more info.
*
* The option is a:
- *
<code>java.util.List&lt;java.lang.String&gt;</code> type.
+ *
<code>java.util.Collection&lt;java.lang.String&gt;</code>
type.
*
* Group: consumer
*
@@ -211,7 +211,7 @@ public interface GoogleSheetsStreamComponentBuilderFactory {
* @return the dsl builder
*/
default GoogleSheetsStreamComponentBuilder scopes(
- java.util.List<java.lang.String> scopes) {
+ java.util.Collection<java.lang.String> scopes) {
doSetProperty("scopes", scopes);
return this;
}
@@ -356,7 +356,7 @@ public interface GoogleSheetsStreamComponentBuilderFactory {
return this;
}
/**
- * OAuth 2 refresh token. Using this, the Google Calendar component can
+ * OAuth 2 refresh token. Using this, the Google Sheets component can
* obtain a new accessToken whenever the current one expires - a
* necessity if the application is long-lived.
*
@@ -420,7 +420,7 @@ public interface GoogleSheetsStreamComponentBuilderFactory {
case "majorDimension":
getOrCreateConfiguration((GoogleSheetsStreamComponent)
component).setMajorDimension((java.lang.String) value); return true;
case "maxResults":
getOrCreateConfiguration((GoogleSheetsStreamComponent)
component).setMaxResults((int) value); return true;
case "range":
getOrCreateConfiguration((GoogleSheetsStreamComponent)
component).setRange((java.lang.String) value); return true;
- case "scopes":
getOrCreateConfiguration((GoogleSheetsStreamComponent)
component).setScopes((java.util.List) value); return true;
+ case "scopes":
getOrCreateConfiguration((GoogleSheetsStreamComponent)
component).setScopes((java.util.Collection) value); return true;
case "splitResults":
getOrCreateConfiguration((GoogleSheetsStreamComponent)
component).setSplitResults((boolean) value); return true;
case "valueRenderOption":
getOrCreateConfiguration((GoogleSheetsStreamComponent)
component).setValueRenderOption((java.lang.String) value); return true;
case "autowiredEnabled": ((GoogleSheetsStreamComponent)
component).setAutowiredEnabled((boolean) value); return true;
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
index e077529ee85..9b20ff63da2 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsEndpointBuilderFactory.java
@@ -103,7 +103,10 @@ public interface GoogleSheetsEndpointBuilderFactory {
return this;
}
/**
- * Sheets scopes.
+ * Specifies the level of permissions you want a sheets application to
+ * have to a user account. See
+ * https://developers.google.com/identity/protocols/googlescopes for
+ * more info.
*
* The option is a:
*
<code>java.util.Collection&lt;java.lang.String&gt;</code>
type.
@@ -119,7 +122,10 @@ public interface GoogleSheetsEndpointBuilderFactory {
return this;
}
/**
- * Sheets scopes.
+ * Specifies the level of permissions you want a sheets application to
+ * have to a user account. See
+ * https://developers.google.com/identity/protocols/googlescopes for
+ * more info.
*
* The option will be converted to a
*
<code>java.util.Collection&lt;java.lang.String&gt;</code>
type.
@@ -985,7 +991,10 @@ public interface GoogleSheetsEndpointBuilderFactory {
return this;
}
/**
- * Sheets scopes.
+ * Specifies the level of permissions you want a sheets application to
+ * have to a user account. See
+ * https://developers.google.com/identity/protocols/googlescopes for
+ * more info.
*
* The option is a:
*
<code>java.util.Collection&lt;java.lang.String&gt;</code>
type.
@@ -1001,7 +1010,10 @@ public interface GoogleSheetsEndpointBuilderFactory {
return this;
}
/**
- * Sheets scopes.
+ * Specifies the level of permissions you want a sheets application to
+ * have to a user account. See
+ * https://developers.google.com/identity/protocols/googlescopes for
+ * more info.
*
* The option will be converted to a
*
<code>java.util.Collection&lt;java.lang.String&gt;</code>
type.
@@ -1209,7 +1221,10 @@ public interface GoogleSheetsEndpointBuilderFactory {
return this;
}
/**
- * Sheets scopes.
+ * Specifies the level of permissions you want a sheets application to
+ * have to a user account. See
+ * https://developers.google.com/identity/protocols/googlescopes for
+ * more info.
*
* The option is a:
*
<code>java.util.Collection&lt;java.lang.String&gt;</code>
type.
@@ -1225,7 +1240,10 @@ public interface GoogleSheetsEndpointBuilderFactory {
return this;
}
/**
- * Sheets scopes.
+ * Specifies the level of permissions you want a sheets application to
+ * have to a user account. See
+ * https://developers.google.com/identity/protocols/googlescopes for
+ * more info.
*
* The option will be converted to a
*
<code>java.util.Collection&lt;java.lang.String&gt;</code>
type.
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
index 87813903a7c..cff35ed8da3 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/GoogleSheetsStreamEndpointBuilderFactory.java
@@ -45,7 +45,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
return (AdvancedGoogleSheetsStreamEndpointBuilder) this;
}
/**
- * Google sheets application name. Example would be
+ * Google Sheets application name. Example would be
* camel-google-sheets/1.0.
*
* The option is a: <code>java.lang.String</code> type.
@@ -190,7 +190,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
* more info.
*
* The option is a:
- *
<code>java.util.List&lt;java.lang.String&gt;</code> type.
+ *
<code>java.util.Collection&lt;java.lang.String&gt;</code>
type.
*
* Group: consumer
*
@@ -198,7 +198,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
* @return the dsl builder
*/
default GoogleSheetsStreamEndpointBuilder scopes(
- List<java.lang.String> scopes) {
+ Collection<java.lang.String> scopes) {
doSetProperty("scopes", scopes);
return this;
}
@@ -209,7 +209,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
* more info.
*
* The option will be converted to a
- *
<code>java.util.List&lt;java.lang.String&gt;</code> type.
+ *
<code>java.util.Collection&lt;java.lang.String&gt;</code>
type.
*
* Group: consumer
*
@@ -819,7 +819,7 @@ public interface GoogleSheetsStreamEndpointBuilderFactory {
return this;
}
/**
- * OAuth 2 refresh token. Using this, the Google Calendar component can
+ * OAuth 2 refresh token. Using this, the Google Sheets component can
* obtain a new accessToken whenever the current one expires - a
* necessity if the application is long-lived.
*
diff --git a/parent/pom.xml b/parent/pom.xml
index d53e5fd538e..83f55d1e7fa 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -68,7 +68,7 @@
<avro-ipc-jetty-version>1.11.2</avro-ipc-jetty-version>
<avro-ipc-netty-version>1.11.2</avro-ipc-netty-version>
<awaitility-version>4.2.0</awaitility-version>
- <aws-java-sdk2-version>2.20.150</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.20.151</aws-java-sdk2-version>
<aws-xray-version>2.14.0</aws-xray-version>
<azure-sdk-bom-version>1.2.16</azure-sdk-bom-version>
<azure-storage-blob-changefeed-version>12.0.0-beta.18</azure-storage-blob-changefeed-version>
