This is an automated email from the ASF dual-hosted git repository.
davsclaus 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 44c922f4df10 camel-aws2-ec2: the instance-tags header javaType leaves
Tag unqualified, and the same bare name means Micrometer's Tag elsewhere
(#30092)
44c922f4df10 is described below
commit 44c922f4df10216d88d1150e0fdb7e6920071226
Author: dhairya05 <[email protected]>
AuthorDate: Tue Nov 17 03:27:49 2026 +0530
camel-aws2-ec2: the instance-tags header javaType leaves Tag unqualified,
and the same bare name means Micrometer's Tag elsewhere (#30092)
---
.../resources/org/apache/camel/catalog/components/aws2-ec2.json | 2 +-
.../META-INF/org/apache/camel/component/aws2/ec2/aws2-ec2.json | 2 +-
.../java/org/apache/camel/component/aws2/ec2/AWS2EC2Constants.java | 3 ++-
.../camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java | 3 ++-
4 files changed, 6 insertions(+), 4 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 61e362e02c40..06e18cb7709e 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
@@ -61,7 +61,7 @@
"CamelAwsEC2InstancesKeyPair": { "index": 10, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "autowired": false, "secret": false,
"description": "The name of the key pair.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCES_KEY_PAIR" },
"CamelAwsEC2InstancesClientToken": { "index": 11, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "autowired": false, "secret": false,
"description": "Unique, case-sensitive identifier you provide to ensure the
idempotency of the request.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCES_CLIENT_TOKEN" },
"CamelAwsEC2InstancesPlacement": { "index": 12, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "software.amazon.awssdk.services.ec2.model.Placement",
"deprecated": false, "autowired": false, "secret": false, "description": "The
placement for the instance.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCES_PLACEMENT" },
- "CamelAwsEC2InstancesTags": { "index": 13, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Collection<Tag>", "deprecated": false, "autowired": false,
"secret": false, "description": "A collection of tags to add or remove from EC2
resources", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCES_TAGS" },
+ "CamelAwsEC2InstancesTags": { "index": 13, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Collection<software.amazon.awssdk.services.ec2.model.Tag>",
"deprecated": false, "autowired": false, "secret": false, "description": "A
collection of tags to add or remove from EC2 resources", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCES_TAGS" },
"CamelAwsEC2SubnetId": { "index": 14, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
ID of the subnet to launch the instance into.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#SUBNET_ID" },
"CamelAwsEC2NextToken": { "index": 15, "kind": "header", "displayName":
"", "group": "describeInstances describeInstancesStatus", "label":
"describeInstances describeInstancesStatus", "required": false, "javaType":
"String", "deprecated": false, "autowired": false, "secret": false,
"description": "The token for the next set of results.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#NEXT_TOKEN" },
"CamelAwsEC2MaxResults": { "index": 16, "kind": "header", "displayName":
"", "group": "describeInstances describeInstancesStatus", "label":
"describeInstances describeInstancesStatus", "required": false, "javaType":
"Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "The maximum number of results to return.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#MAX_RESULTS" },
diff --git
a/components/camel-aws/camel-aws2-ec2/src/generated/resources/META-INF/org/apache/camel/component/aws2/ec2/aws2-ec2.json
b/components/camel-aws/camel-aws2-ec2/src/generated/resources/META-INF/org/apache/camel/component/aws2/ec2/aws2-ec2.json
index 61e362e02c40..06e18cb7709e 100644
---
a/components/camel-aws/camel-aws2-ec2/src/generated/resources/META-INF/org/apache/camel/component/aws2/ec2/aws2-ec2.json
+++
b/components/camel-aws/camel-aws2-ec2/src/generated/resources/META-INF/org/apache/camel/component/aws2/ec2/aws2-ec2.json
@@ -61,7 +61,7 @@
"CamelAwsEC2InstancesKeyPair": { "index": 10, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "autowired": false, "secret": false,
"description": "The name of the key pair.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCES_KEY_PAIR" },
"CamelAwsEC2InstancesClientToken": { "index": 11, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "String", "deprecated": false, "autowired": false, "secret": false,
"description": "Unique, case-sensitive identifier you provide to ensure the
idempotency of the request.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCES_CLIENT_TOKEN" },
"CamelAwsEC2InstancesPlacement": { "index": 12, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "software.amazon.awssdk.services.ec2.model.Placement",
"deprecated": false, "autowired": false, "secret": false, "description": "The
placement for the instance.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCES_PLACEMENT" },
- "CamelAwsEC2InstancesTags": { "index": 13, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Collection<Tag>", "deprecated": false, "autowired": false,
"secret": false, "description": "A collection of tags to add or remove from EC2
resources", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCES_TAGS" },
+ "CamelAwsEC2InstancesTags": { "index": 13, "kind": "header",
"displayName": "", "group": "producer", "label": "", "required": false,
"javaType": "Collection<software.amazon.awssdk.services.ec2.model.Tag>",
"deprecated": false, "autowired": false, "secret": false, "description": "A
collection of tags to add or remove from EC2 resources", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#INSTANCES_TAGS" },
"CamelAwsEC2SubnetId": { "index": 14, "kind": "header", "displayName": "",
"group": "producer", "label": "", "required": false, "javaType": "String",
"deprecated": false, "autowired": false, "secret": false, "description": "The
ID of the subnet to launch the instance into.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#SUBNET_ID" },
"CamelAwsEC2NextToken": { "index": 15, "kind": "header", "displayName":
"", "group": "describeInstances describeInstancesStatus", "label":
"describeInstances describeInstancesStatus", "required": false, "javaType":
"String", "deprecated": false, "autowired": false, "secret": false,
"description": "The token for the next set of results.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#NEXT_TOKEN" },
"CamelAwsEC2MaxResults": { "index": 16, "kind": "header", "displayName":
"", "group": "describeInstances describeInstancesStatus", "label":
"describeInstances describeInstancesStatus", "required": false, "javaType":
"Integer", "deprecated": false, "autowired": false, "secret": false,
"description": "The maximum number of results to return.", "constantName":
"org.apache.camel.component.aws2.ec2.AWS2EC2Constants#MAX_RESULTS" },
diff --git
a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Constants.java
b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Constants.java
index 56075069aceb..8a3f19e91139 100644
---
a/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Constants.java
+++
b/components/camel-aws/camel-aws2-ec2/src/main/java/org/apache/camel/component/aws2/ec2/AWS2EC2Constants.java
@@ -54,7 +54,8 @@ public interface AWS2EC2Constants {
String INSTANCES_CLIENT_TOKEN = "CamelAwsEC2InstancesClientToken";
@Metadata(description = "The placement for the instance.", javaType =
"software.amazon.awssdk.services.ec2.model.Placement")
String INSTANCES_PLACEMENT = "CamelAwsEC2InstancesPlacement";
- @Metadata(description = "A collection of tags to add or remove from EC2
resources", javaType = "Collection<Tag>")
+ @Metadata(description = "A collection of tags to add or remove from EC2
resources",
+ javaType =
"Collection<software.amazon.awssdk.services.ec2.model.Tag>")
String INSTANCES_TAGS = "CamelAwsEC2InstancesTags";
@Metadata(description = "The ID of the subnet to launch the instance
into.", javaType = "String")
String SUBNET_ID = "CamelAwsEC2SubnetId";
diff --git
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
index 64dd2a95b936..bb989c5b6b92 100644
---
a/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
+++
b/dsl/camel-endpointdsl/src/generated/java/org/apache/camel/builder/endpoint/dsl/AWS2EC2EndpointBuilderFactory.java
@@ -765,7 +765,8 @@ public interface AWS2EC2EndpointBuilderFactory {
/**
* A collection of tags to add or remove from EC2 resources.
*
- * The option is a: {@code Collection<Tag>} type.
+ * The option is a: {@code
+ * Collection<software.amazon.awssdk.services.ec2.model.Tag>} type.
*
* Group: producer
*