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 644ecf03ead Upgrade AWS SDK v2 to version 2.20.153 (#11545)
644ecf03ead is described below
commit 644ecf03ead4d8f5cca26f22fa33621bda72b669
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Mon Sep 25 10:35:02 2023 +0200
Upgrade AWS SDK v2 to version 2.20.153 (#11545)
Signed-off-by: Andrea Cosentino <anco...@gmail.com>
---
.../resources/org/apache/camel/catalog/components/aws2-ec2.json | 2 +-
.../resources/org/apache/camel/component/aws2/ec2/aws2-ec2.json | 2 +-
.../org/apache/camel/builder/endpoint/StaticEndpointBuilders.java | 4 ++--
.../builder/endpoint/dsl/ServiceBusEndpointBuilderFactory.java | 8 ++++----
parent/pom.xml | 2 +-
.../apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java | 3 ++-
6 files changed, 11 insertions(+), 10 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 27418102271..2ef7c48bfda 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 27418102271..2ef7c48bfda 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-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
index 9bcb34a78d3..32a3b431495 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/StaticEndpointBuilders.java
@@ -1764,7 +1764,7 @@ public class StaticEndpointBuilders {
}
/**
* Azure ServiceBus (camel-azure-servicebus)
- * Send and receive messages to/from Azure Event Bus.
+ * Send and receive messages to/from Azure Service Bus.
*
* Category: cloud,messaging
* Since: 3.12
@@ -1787,7 +1787,7 @@ public class StaticEndpointBuilders {
}
/**
* Azure ServiceBus (camel-azure-servicebus)
- * Send and receive messages to/from Azure Event Bus.
+ * Send and receive messages to/from Azure Service Bus.
*
* Category: cloud,messaging
* Since: 3.12
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceBusEndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceBusEndpointBuilderFactory.java
index a3bfeddbd79..e1c5d70a1e4 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceBusEndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/ServiceBusEndpointBuilderFactory.java
@@ -26,7 +26,7 @@ import org.apache.camel.builder.EndpointProducerBuilder;
import org.apache.camel.builder.endpoint.AbstractEndpointBuilder;
/**
- * Send and receive messages to/from Azure Event Bus.
+ * Send and receive messages to/from Azure Service Bus.
*
* Generated by camel build tools - do NOT edit this file!
*/
@@ -1436,7 +1436,7 @@ public interface ServiceBusEndpointBuilderFactory {
public interface ServiceBusBuilders {
/**
* Azure ServiceBus (camel-azure-servicebus)
- * Send and receive messages to/from Azure Event Bus.
+ * Send and receive messages to/from Azure Service Bus.
*
* Category: cloud,messaging
* Since: 3.12
@@ -1449,7 +1449,7 @@ public interface ServiceBusEndpointBuilderFactory {
}
/**
* Azure ServiceBus (camel-azure-servicebus)
- * Send and receive messages to/from Azure Event Bus.
+ * Send and receive messages to/from Azure Service Bus.
*
* Category: cloud,messaging
* Since: 3.12
@@ -1471,7 +1471,7 @@ public interface ServiceBusEndpointBuilderFactory {
}
/**
* Azure ServiceBus (camel-azure-servicebus)
- * Send and receive messages to/from Azure Event Bus.
+ * Send and receive messages to/from Azure Service Bus.
*
* Category: cloud,messaging
* Since: 3.12
diff --git a/parent/pom.xml b/parent/pom.xml
index b5dd7da5998..97a0a1c62b8 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.152</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.20.153</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>
diff --git
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
index a0774d07d37..02c1535d408 100644
---
a/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
+++
b/tooling/maven/camel-package-maven-plugin/src/main/java/org/apache/camel/maven/packaging/ModelXmlParserGeneratorMojo.java
@@ -518,7 +518,8 @@ public class ModelXmlParserGeneratorMojo extends
AbstractGeneratorMojo {
} else {
sb.append(" else if
(\"").append(nn[1]).append("\".equals(parser.getNamespace())) {\n");
}
- sb.append(" Element el =
doParseDOMElement(\"").append(nn[0]).append("\", \"").append(nn[1]).append("\",
def.").append(gn).append("());\n");
+ sb.append(" Element el =
doParseDOMElement(\"").append(nn[0]).append("\", \"").append(nn[1])
+ .append("\", def.").append(gn).append("());\n");
sb.append(" if (el != null) {\n");
sb.append(" doAddElement(el,
def.").append(gn).append("(), def::").append(sn).append(");\n");
sb.append(" return true;\n");
