You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2022/10/28 08:28:02 UTC
[camel] branch main updated (e44e2f9879e -> 9836d058cce)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
from e44e2f9879e CAMEL-18614: camel-core - Updating route configuration via routes loader
new eab0922607c Upgrade Pulsar to version 2.10.2
new 8a32a46b296 Sync deps and regen
new 9836d058cce Regen
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
camel-dependencies/pom.xml | 2 +-
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
.../camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java | 10 ++++++----
parent/pom.xml | 2 +-
4 files changed, 9 insertions(+), 7 deletions(-)
[camel] 02/03: Sync deps and regen
Posted by ac...@apache.org.
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
commit 8a32a46b296f948e8cb82971a0098a91a3ff734e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Oct 28 10:11:26 2022 +0200
Sync deps and regen
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
camel-dependencies/pom.xml | 2 +-
.../generated/resources/org/apache/camel/catalog/components/git.json | 1 -
.../resources/org/apache/camel/catalog/schemas/camel-spring.xsd | 2 +-
3 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index aeba083f70c..efb892f1bdd 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -459,7 +459,7 @@
<protostream-version>4.5.0.Final</protostream-version>
<prowide-version>SRU2022-9.3.2</prowide-version>
<pubnub-version>4.25.0</pubnub-version>
- <pulsar-version>2.10.1</pulsar-version>
+ <pulsar-version>2.10.2</pulsar-version>
<qpid-broker-version>8.0.6</qpid-broker-version>
<qpid-jms-client-version>1.7.0</qpid-jms-client-version>
<qpid-proton-j-version>0.34.0</qpid-proton-j-version>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/git.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/git.json
index 7dcb8c41c80..f7fdd7ffc00 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/git.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/git.json
@@ -53,7 +53,6 @@
"remoteName": { "kind": "parameter", "displayName": "Remote Name", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The remote repository name to use in particular operation like pull" },
"remotePath": { "kind": "parameter", "displayName": "Remote Path", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The remote repository path" },
"tagName": { "kind": "parameter", "displayName": "Tag Name", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The tag name to work on" },
- "targetBranchName": { "kind": "parameter", "displayName": "Target Branch Name", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "master", "description": "Name of target branch in merge operation. If not supplied will try to use init.defaultBranch git configs. If not configured will use default value" },
"username": { "kind": "parameter", "displayName": "Username", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Remote repository username" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 other [...]
}
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
index 9a333cd58c8..25db02dca09 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/schemas/camel-spring.xsd
@@ -12321,7 +12321,7 @@ Default value: true
<xs:annotation>
<xs:documentation xml:lang="en">
<![CDATA[
-Whether or not the trailing white spaces must be ignored. The default value is
+Whether or not the trailing white spaces must ignored. The default value is
true. Default value: true
]]>
</xs:documentation>
[camel] 03/03: Regen
Posted by ac...@apache.org.
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
commit 9836d058cce9872c9cdf4adbff3a36e89e4e8d36
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Oct 28 10:27:19 2022 +0200
Regen
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../src/generated/resources/org/apache/camel/catalog/components/git.json | 1 +
1 file changed, 1 insertion(+)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/git.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/git.json
index f7fdd7ffc00..7dcb8c41c80 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/git.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/components/git.json
@@ -53,6 +53,7 @@
"remoteName": { "kind": "parameter", "displayName": "Remote Name", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The remote repository name to use in particular operation like pull" },
"remotePath": { "kind": "parameter", "displayName": "Remote Path", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The remote repository path" },
"tagName": { "kind": "parameter", "displayName": "Tag Name", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The tag name to work on" },
+ "targetBranchName": { "kind": "parameter", "displayName": "Target Branch Name", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "defaultValue": "master", "description": "Name of target branch in merge operation. If not supplied will try to use init.defaultBranch git configs. If not configured will use default value" },
"username": { "kind": "parameter", "displayName": "Username", "group": "producer", "label": "producer", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Remote repository username" },
"lazyStartProducer": { "kind": "parameter", "displayName": "Lazy Start Producer", "group": "producer (advanced)", "label": "producer,advanced", "required": false, "type": "boolean", "javaType": "boolean", "deprecated": false, "autowired": 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 other [...]
}
[camel] 01/03: Upgrade Pulsar to version 2.10.2
Posted by ac...@apache.org.
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
commit eab0922607ccc1621920164d6c860e079f281a0e
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Oct 28 09:21:49 2022 +0200
Upgrade Pulsar to version 2.10.2
Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
.../camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java | 10 ++++++----
parent/pom.xml | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java
index dbbc50cc7db..29b6650076c 100644
--- a/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java
+++ b/components/camel-aws/camel-aws2-sqs/src/main/java/org/apache/camel/component/aws2/sqs/Sqs2ConsumerHealthCheck.java
@@ -50,10 +50,12 @@ public class Sqs2ConsumerHealthCheck extends AbstractHealthCheck {
try {
Sqs2Configuration configuration = sqs2Consumer.getConfiguration();
- if (!SqsClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion()))) {
- builder.message("The service is not supported in this region");
- builder.down();
- return;
+ if (ObjectHelper.isNotEmpty(configuration.getRegion())) {
+ if (!SqsClient.serviceMetadata().regions().contains(Region.of(configuration.getRegion()))) {
+ builder.message("The service is not supported in this region");
+ builder.down();
+ return;
+ }
}
SqsClient client;
if (!configuration.isUseDefaultCredentialsProvider()) {
diff --git a/parent/pom.xml b/parent/pom.xml
index fad0d52db30..b5e4dcd90d4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -445,7 +445,7 @@
<protostream-version>4.5.0.Final</protostream-version>
<prowide-version>SRU2022-9.3.2</prowide-version>
<pubnub-version>4.25.0</pubnub-version>
- <pulsar-version>2.10.1</pulsar-version>
+ <pulsar-version>2.10.2</pulsar-version>
<qpid-broker-version>8.0.6</qpid-broker-version>
<qpid-proton-j-version>0.34.0</qpid-proton-j-version>
<qpid-jms-client-version>1.7.0</qpid-jms-client-version>