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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new c482fb8 [create-pull-request] automated change
c482fb8 is described below
commit c482fb8709ceae20d53f3021890b56708a0429da
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Wed May 26 01:45:02 2021 +0000
[create-pull-request] automated change
---
.../camel/springboot/catalog/components/aws2-mq.json | 2 ++
.../src/main/docs/aws2-mq-starter.adoc | 3 ++-
.../aws2/mq/springboot/MQ2ComponentConfiguration.java | 15 +++++++++++++++
docs/modules/ROOT/pages/aws2-mq-starter.adoc | 3 ++-
tooling/camel-spring-boot-dependencies/pom.xml | 5 -----
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-mq.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-mq.json
index 2ef53c6..03fef86 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-mq.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/aws2-mq.json
@@ -34,6 +34,7 @@
"region": { "kind": "property", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.mq.MQ2Configuration",
"configurationField": "configuration", "description": "The region in which MQ
client needs to work. When using this parameter, the configuration will expect
the lowercase name of the region (fo [...]
"trustAllCertificates": { "kind": "property", "displayName": "Trust All
Certificates", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField":
"configuration", "description": "If we want to trust all certificates in case
of overriding the endpoint" },
"uriEndpointOverride": { "kind": "property", "displayName": "Uri Endpoint
Override", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoint option" },
+ "useDefaultCredentialsProvider": { "kind": "property", "displayName": "Use
Default Credentials Provider", "group": "producer", "label": "", "required":
false, "type": "boolean", "javaType": "boolean", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.mq.MQ2Configuration",
"configurationField": "configuration", "description": "Set whether the MQ
client should expect to load credentials through a defa [...]
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
"accessKey": { "kind": "property", "displayName": "Access Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"secretKey": { "kind": "property", "displayName": "Secret Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" }
@@ -51,6 +52,7 @@
"region": { "kind": "parameter", "displayName": "Region", "group":
"producer", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"configurationClass": "org.apache.camel.component.aws2.mq.MQ2Configuration",
"configurationField": "configuration", "description": "The region in which MQ
client needs to work. When using this parameter, the configuration will expect
the lowercase name of the region (f [...]
"trustAllCertificates": { "kind": "parameter", "displayName": "Trust All
Certificates", "group": "producer", "label": "", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField":
"configuration", "description": "If we want to trust all certificates in case
of overriding the endpoint" },
"uriEndpointOverride": { "kind": "parameter", "displayName": "Uri Endpoint
Override", "group": "producer", "label": "", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField":
"configuration", "description": "Set the overriding uri endpoint. This option
needs to be used in combination with overrideEndpoint option" },
+ "useDefaultCredentialsProvider": { "kind": "parameter", "displayName":
"Use Default Credentials Provider", "group": "producer", "label": "",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"configurationClass": "org.apache.camel.component.aws2.mq.MQ2Configuration",
"configurationField": "configuration", "description": "Set whether the MQ
client should expect to load credentials through a def [...]
"accessKey": { "kind": "parameter", "displayName": "Access Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Access Key" },
"secretKey": { "kind": "parameter", "displayName": "Secret Key", "group":
"security", "label": "security", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "autowired": false,
"secret": true, "configurationClass":
"org.apache.camel.component.aws2.mq.MQ2Configuration", "configurationField":
"configuration", "description": "Amazon AWS Secret Key" }
}
diff --git
a/components-starter/camel-aws2-mq-starter/src/main/docs/aws2-mq-starter.adoc
b/components-starter/camel-aws2-mq-starter/src/main/docs/aws2-mq-starter.adoc
index ec53a1e..96bd804 100644
---
a/components-starter/camel-aws2-mq-starter/src/main/docs/aws2-mq-starter.adoc
+++
b/components-starter/camel-aws2-mq-starter/src/main/docs/aws2-mq-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-mq with Spring Boot make sure to use the
following Maven depende
----
-The component supports 16 options, which are listed below.
+The component supports 17 options, which are listed below.
@@ -40,5 +40,6 @@ The component supports 16 options, which are listed below.
| *camel.component.aws2-mq.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-mq.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
| *camel.component.aws2-mq.uri-endpoint-override* | Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option | | String
+| *camel.component.aws2-mq.use-default-credentials-provider* | Set whether the
MQ client should expect to load credentials through a default credentials
provider or to expect static credentials to be passed in. | false | Boolean
|===
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentConfiguration.java
b/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentConfiguration.java
index 83b17ab..52ae764 100644
---
a/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentConfiguration.java
+++
b/components-starter/camel-aws2-mq-starter/src/main/java/org/apache/camel/component/aws2/mq/springboot/MQ2ComponentConfiguration.java
@@ -103,6 +103,12 @@ public class MQ2ComponentConfiguration
*/
private String uriEndpointOverride;
/**
+ * Set whether the MQ client should expect to load credentials through a
+ * default credentials provider or to expect static credentials to be
passed
+ * in.
+ */
+ private Boolean useDefaultCredentialsProvider = false;
+ /**
* Whether autowiring is enabled. This is used for automatic autowiring
* options (the option must be marked as autowired) by looking up in the
* registry to find if there is a single instance of matching type, which
@@ -216,6 +222,15 @@ public class MQ2ComponentConfiguration
this.uriEndpointOverride = uriEndpointOverride;
}
+ public Boolean getUseDefaultCredentialsProvider() {
+ return useDefaultCredentialsProvider;
+ }
+
+ public void setUseDefaultCredentialsProvider(
+ Boolean useDefaultCredentialsProvider) {
+ this.useDefaultCredentialsProvider = useDefaultCredentialsProvider;
+ }
+
public Boolean getAutowiredEnabled() {
return autowiredEnabled;
}
diff --git a/docs/modules/ROOT/pages/aws2-mq-starter.adoc
b/docs/modules/ROOT/pages/aws2-mq-starter.adoc
index ec53a1e..96bd804 100644
--- a/docs/modules/ROOT/pages/aws2-mq-starter.adoc
+++ b/docs/modules/ROOT/pages/aws2-mq-starter.adoc
@@ -17,7 +17,7 @@ When using aws2-mq with Spring Boot make sure to use the
following Maven depende
----
-The component supports 16 options, which are listed below.
+The component supports 17 options, which are listed below.
@@ -40,5 +40,6 @@ The component supports 16 options, which are listed below.
| *camel.component.aws2-mq.secret-key* | Amazon AWS Secret Key | | String
| *camel.component.aws2-mq.trust-all-certificates* | If we want to trust all
certificates in case of overriding the endpoint | false | Boolean
| *camel.component.aws2-mq.uri-endpoint-override* | Set the overriding uri
endpoint. This option needs to be used in combination with overrideEndpoint
option | | String
+| *camel.component.aws2-mq.use-default-credentials-provider* | Set whether the
MQ client should expect to load credentials through a default credentials
provider or to expect static credentials to be passed in. | false | Boolean
|===
// spring-boot-auto-configure options: END
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index bbf0d9a..decc125 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -3384,11 +3384,6 @@
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-manual</artifactId>
- <version>3.11.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
<artifactId>camel-master</artifactId>
<version>3.11.0-SNAPSHOT</version>
</dependency>
