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 4f66ad7 Regen 4f66ad7 is described below commit 4f66ad75fba474258e6d72c3d78f3e80d72eb3cc Author: Andrea Cosentino <anco...@gmail.com> AuthorDate: Fri Apr 10 09:42:54 2020 +0200 Regen --- .../camel/springboot/catalog/components/aws2-ec2.json | 6 ++++-- .../camel/springboot/catalog/components/aws2-ecs.json | 2 ++ .../src/main/docs/aws2-ec2-starter.adoc | 5 +++-- .../ec2/springboot/AWS2EC2ComponentConfiguration.java | 16 ++++++++++++++-- .../src/main/docs/aws2-ecs-starter.adoc | 3 ++- .../aws2/ecs/springboot/ECS2ComponentConfiguration.java | 12 ++++++++++++ docs/modules/ROOT/pages/aws2-ec2-starter.adoc | 5 +++-- docs/modules/ROOT/pages/aws2-ecs-starter.adoc | 3 ++- tooling/camel-spring-boot-dependencies/pom.xml | 2 +- 9 files changed, 43 insertions(+), 11 deletions(-) diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json index d0986d8..0adb393 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ec2.json @@ -26,10 +26,11 @@ "configuration": { "kind": "property", "displayName": "Configuration", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "deprecated": false, "secret": false, "description": "The 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": true, "type": "object", "javaType": "org.apache.camel.component.aws2.ec2.AWS2EC2Operations", "enum": [ "createAndRunInstances", "startInstances", "stopInstances", "terminateInstances", "describeInstances", "describeInstancesStatus", "rebootInstances", "monitorInstances", "unmonitorInstances", "createTags", "deleteTags" ], "deprecated": false, "deprecationNote": "", "se [...] + "pojoRequest": { "kind": "property", "displayName": "Pojo Request", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "If we want to use a POJO request as body or not" }, "proxyHost": { "kind": "property", "displayName": "Proxy Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the EC2 client" }, "proxyPort": { "kind": "property", "displayName": "Proxy Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the EC2 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.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the EC2 client" }, - "region": { "kind": "property", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "The region in which EC2 client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP [...] + "region": { "kind": "property", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "The region in which EC2 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-e [...] "secretKey": { "kind": "property", "displayName": "Secret Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }, "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" } }, @@ -39,10 +40,11 @@ "amazonEc2Client": { "kind": "parameter", "displayName": "Amazon Ec2 Client", "group": "producer", "label": "producer", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.ec2.Ec2Client", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "To use a existing configured AmazonEC2Client as client" }, "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": true, "type": "object", "javaType": "org.apache.camel.component.aws2.ec2.AWS2EC2Operations", "enum": [ "createAndRunInstances", "startInstances", "stopInstances", "terminateInstances", "describeInstances", "describeInstancesStatus", "rebootInstances", "monitorInstances", "unmonitorInstances", "createTags", "deleteTags" ], "deprecated": false, "deprecationNote": "", "s [...] + "pojoRequest": { "kind": "parameter", "displayName": "Pojo Request", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "If we want to use a POJO request as body or not" }, "proxyHost": { "kind": "parameter", "displayName": "Proxy Host", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the EC2 client" }, "proxyPort": { "kind": "parameter", "displayName": "Proxy Port", "group": "producer", "label": "producer", "required": false, "type": "integer", "javaType": "java.lang.Integer", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the EC2 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.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the EC2 client" }, - "region": { "kind": "parameter", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "The region in which EC2 client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example A [...] + "region": { "kind": "parameter", "displayName": "Region", "group": "producer", "label": "", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "The region in which EC2 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap- [...] "secretKey": { "kind": "parameter", "displayName": "Secret Key", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "secret": true, "configurationClass": "org.apache.camel.component.aws2.ec2.AWS2EC2Configuration", "configurationField": "configuration", "description": "Amazon AWS Secret Key" }, "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" }, "synchronous": { "kind": "parameter", "displayName": "Synchronous", "group": "advanced", "label": "advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "description": "Sets whether synchronous processing should be strictly used, or Camel is allowed to use asynchronous processing (if supported)." } diff --git a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ecs.json b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ecs.json index 5e6a9dd..5e6043e 100644 --- a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ecs.json +++ b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-ecs.json @@ -25,6 +25,7 @@ "ecsClient": { "kind": "property", "displayName": "Ecs Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.ecs.EcsClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ecs.ECS2Configuration", "configurationField": "configuration", "description": "To use a existing configured AWS ECS as client" }, "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": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.aws2.ecs.ECS2Operations", "enum": [ "listClusters", "describeCluster", "createCluster", "deleteCluster" ], "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.aws2.ecs.ECS2Configuration", "configurationField": "configuration", "description": "The operation [...] + "pojoRequest": { "kind": "property", "displayName": "Pojo Request", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.ecs.ECS2Configuration", "configurationField": "configuration", "description": "If we want to use a POJO request as body or not" }, "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.ecs.ECS2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the ECS 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.ecs.ECS2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the ECS 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.ecs.ECS2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the ECS client" }, @@ -38,6 +39,7 @@ "ecsClient": { "kind": "parameter", "displayName": "Ecs Client", "group": "producer", "label": "", "required": false, "type": "object", "javaType": "software.amazon.awssdk.services.ecs.EcsClient", "deprecated": false, "secret": false, "configurationClass": "org.apache.camel.component.aws2.ecs.ECS2Configuration", "configurationField": "configuration", "description": "To use a existing configured AWS ECS as client" }, "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": "", "required": true, "type": "object", "javaType": "org.apache.camel.component.aws2.ecs.ECS2Operations", "enum": [ "listClusters", "describeCluster", "createCluster", "deleteCluster" ], "deprecated": false, "deprecationNote": "", "secret": false, "configurationClass": "org.apache.camel.component.aws2.ecs.ECS2Configuration", "configurationField": "configuration", "description": "The operatio [...] + "pojoRequest": { "kind": "parameter", "displayName": "Pojo Request", "group": "producer", "label": "", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false, "defaultValue": "false", "configurationClass": "org.apache.camel.component.aws2.ecs.ECS2Configuration", "configurationField": "configuration", "description": "If we want to use a POJO request as body or not" }, "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.ecs.ECS2Configuration", "configurationField": "configuration", "description": "To define a proxy host when instantiating the ECS 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.ecs.ECS2Configuration", "configurationField": "configuration", "description": "To define a proxy port when instantiating the ECS 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.ecs.ECS2Configuration", "configurationField": "configuration", "description": "To define a proxy protocol when instantiating the ECS client" }, diff --git a/components-starter/camel-aws2-ec2-starter/src/main/docs/aws2-ec2-starter.adoc b/components-starter/camel-aws2-ec2-starter/src/main/docs/aws2-ec2-starter.adoc index 31f87c0..3ecbaf4 100644 --- a/components-starter/camel-aws2-ec2-starter/src/main/docs/aws2-ec2-starter.adoc +++ b/components-starter/camel-aws2-ec2-starter/src/main/docs/aws2-ec2-starter.adoc @@ -17,7 +17,7 @@ When using aws2-ec2 with Spring Boot make sure to use the following Maven depend ---- -The component supports 12 options, which are listed below. +The component supports 13 options, which are listed below. @@ -31,10 +31,11 @@ The component supports 12 options, which are listed below. | *camel.component.aws2-ec2.enabled* | Whether to enable auto configuration of the aws2-ec2 component. This is enabled by default. | | Boolean | *camel.component.aws2-ec2.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 is processed t [...] | *camel.component.aws2-ec2.operation* | The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags | | AWS2EC2Operations +| *camel.component.aws2-ec2.pojo-request* | If we want to use a POJO request as body or not | false | Boolean | *camel.component.aws2-ec2.proxy-host* | To define a proxy host when instantiating the EC2 client | | String | *camel.component.aws2-ec2.proxy-port* | To define a proxy port when instantiating the EC2 client | | Integer | *camel.component.aws2-ec2.proxy-protocol* | To define a proxy protocol when instantiating the EC2 client | | Protocol -| *camel.component.aws2-ec2.region* | The region in which EC2 client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | | String +| *camel.component.aws2-ec2.region* | The region in which EC2 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *camel.component.aws2-ec2.secret-key* | Amazon AWS Secret Key | | String |=== // spring-boot-auto-configure options: END diff --git a/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentConfiguration.java b/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentConfiguration.java index fe3bd27..4f3a51c 100644 --- a/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentConfiguration.java +++ b/components-starter/camel-aws2-ec2-starter/src/main/java/org/apache/camel/component/aws2/ec2/springboot/AWS2EC2ComponentConfiguration.java @@ -72,6 +72,10 @@ public class AWS2EC2ComponentConfiguration */ private AWS2EC2Operations operation; /** + * If we want to use a POJO request as body or not + */ + private Boolean pojoRequest = false; + /** * To define a proxy host when instantiating the EC2 client */ private String proxyHost; @@ -85,8 +89,8 @@ public class AWS2EC2ComponentConfiguration private Protocol proxyProtocol = Protocol.HTTPS; /** * The region in which EC2 client needs to work. When using this parameter, - * the configuration will expect the capitalized name of the region (for - * example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() + * the configuration will expect the lowercase name of the region (for + * example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() */ private String region; /** @@ -139,6 +143,14 @@ public class AWS2EC2ComponentConfiguration this.operation = operation; } + public Boolean getPojoRequest() { + return pojoRequest; + } + + public void setPojoRequest(Boolean pojoRequest) { + this.pojoRequest = pojoRequest; + } + public String getProxyHost() { return proxyHost; } diff --git a/components-starter/camel-aws2-ecs-starter/src/main/docs/aws2-ecs-starter.adoc b/components-starter/camel-aws2-ecs-starter/src/main/docs/aws2-ecs-starter.adoc index d4f4b68..803074d 100644 --- a/components-starter/camel-aws2-ecs-starter/src/main/docs/aws2-ecs-starter.adoc +++ b/components-starter/camel-aws2-ecs-starter/src/main/docs/aws2-ecs-starter.adoc @@ -17,7 +17,7 @@ When using aws2-ecs with Spring Boot make sure to use the following Maven depend ---- -The component supports 12 options, which are listed below. +The component supports 13 options, which are listed below. @@ -31,6 +31,7 @@ The component supports 12 options, which are listed below. | *camel.component.aws2-ecs.enabled* | Whether to enable auto configuration of the aws2-ecs component. This is enabled by default. | | Boolean | *camel.component.aws2-ecs.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 is processed t [...] | *camel.component.aws2-ecs.operation* | The operation to perform | | ECS2Operations +| *camel.component.aws2-ecs.pojo-request* | If we want to use a POJO request as body or not | false | Boolean | *camel.component.aws2-ecs.proxy-host* | To define a proxy host when instantiating the ECS client | | String | *camel.component.aws2-ecs.proxy-port* | To define a proxy port when instantiating the ECS client | | Integer | *camel.component.aws2-ecs.proxy-protocol* | To define a proxy protocol when instantiating the ECS client | | Protocol diff --git a/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentConfiguration.java b/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentConfiguration.java index 7a9ab3d..59deb02 100644 --- a/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentConfiguration.java +++ b/components-starter/camel-aws2-ecs-starter/src/main/java/org/apache/camel/component/aws2/ecs/springboot/ECS2ComponentConfiguration.java @@ -65,6 +65,10 @@ public class ECS2ComponentConfiguration */ private ECS2Operations operation; /** + * If we want to use a POJO request as body or not + */ + private Boolean pojoRequest = false; + /** * To define a proxy host when instantiating the ECS client */ private String proxyHost; @@ -128,6 +132,14 @@ public class ECS2ComponentConfiguration this.operation = operation; } + public Boolean getPojoRequest() { + return pojoRequest; + } + + public void setPojoRequest(Boolean pojoRequest) { + this.pojoRequest = pojoRequest; + } + public String getProxyHost() { return proxyHost; } diff --git a/docs/modules/ROOT/pages/aws2-ec2-starter.adoc b/docs/modules/ROOT/pages/aws2-ec2-starter.adoc index 31f87c0..3ecbaf4 100644 --- a/docs/modules/ROOT/pages/aws2-ec2-starter.adoc +++ b/docs/modules/ROOT/pages/aws2-ec2-starter.adoc @@ -17,7 +17,7 @@ When using aws2-ec2 with Spring Boot make sure to use the following Maven depend ---- -The component supports 12 options, which are listed below. +The component supports 13 options, which are listed below. @@ -31,10 +31,11 @@ The component supports 12 options, which are listed below. | *camel.component.aws2-ec2.enabled* | Whether to enable auto configuration of the aws2-ec2 component. This is enabled by default. | | Boolean | *camel.component.aws2-ec2.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 is processed t [...] | *camel.component.aws2-ec2.operation* | The operation to perform. It can be createAndRunInstances, startInstances, stopInstances, terminateInstances, describeInstances, describeInstancesStatus, rebootInstances, monitorInstances, unmonitorInstances, createTags or deleteTags | | AWS2EC2Operations +| *camel.component.aws2-ec2.pojo-request* | If we want to use a POJO request as body or not | false | Boolean | *camel.component.aws2-ec2.proxy-host* | To define a proxy host when instantiating the EC2 client | | String | *camel.component.aws2-ec2.proxy-port* | To define a proxy port when instantiating the EC2 client | | Integer | *camel.component.aws2-ec2.proxy-protocol* | To define a proxy protocol when instantiating the EC2 client | | Protocol -| *camel.component.aws2-ec2.region* | The region in which EC2 client needs to work. When using this parameter, the configuration will expect the capitalized name of the region (for example AP_EAST_1) You'll need to use the name Regions.EU_WEST_1.name() | | String +| *camel.component.aws2-ec2.region* | The region in which EC2 client needs to work. When using this parameter, the configuration will expect the lowercase name of the region (for example ap-east-1) You'll need to use the name Region.EU_WEST_1.id() | | String | *camel.component.aws2-ec2.secret-key* | Amazon AWS Secret Key | | String |=== // spring-boot-auto-configure options: END diff --git a/docs/modules/ROOT/pages/aws2-ecs-starter.adoc b/docs/modules/ROOT/pages/aws2-ecs-starter.adoc index d4f4b68..803074d 100644 --- a/docs/modules/ROOT/pages/aws2-ecs-starter.adoc +++ b/docs/modules/ROOT/pages/aws2-ecs-starter.adoc @@ -17,7 +17,7 @@ When using aws2-ecs with Spring Boot make sure to use the following Maven depend ---- -The component supports 12 options, which are listed below. +The component supports 13 options, which are listed below. @@ -31,6 +31,7 @@ The component supports 12 options, which are listed below. | *camel.component.aws2-ecs.enabled* | Whether to enable auto configuration of the aws2-ecs component. This is enabled by default. | | Boolean | *camel.component.aws2-ecs.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 is processed t [...] | *camel.component.aws2-ecs.operation* | The operation to perform | | ECS2Operations +| *camel.component.aws2-ecs.pojo-request* | If we want to use a POJO request as body or not | false | Boolean | *camel.component.aws2-ecs.proxy-host* | To define a proxy host when instantiating the ECS client | | String | *camel.component.aws2-ecs.proxy-port* | To define a proxy port when instantiating the ECS client | | Integer | *camel.component.aws2-ecs.proxy-protocol* | To define a proxy protocol when instantiating the ECS client | | Protocol diff --git a/tooling/camel-spring-boot-dependencies/pom.xml b/tooling/camel-spring-boot-dependencies/pom.xml index 5b35cfa..282f0b1f 100644 --- a/tooling/camel-spring-boot-dependencies/pom.xml +++ b/tooling/camel-spring-boot-dependencies/pom.xml @@ -184,7 +184,7 @@ <dependency> <groupId>net.corda</groupId> <artifactId>corda-rpc</artifactId> - <version>4.3</version> + <version>4.4</version> <exclusions> <exclusion> <groupId>co.paralleluniverse</groupId>