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 2021/05/12 12:28:47 UTC
[camel] branch main updated (f1049d7 -> cd29c73)
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 f1049d7 Sync deps
new 8087bec Upgrade Pulsar to version 2.7.2
new 831df2e Use Latest Pulsar image 2.7.2
new 830789e Sync deps and regen
new cd29c73 Regen
The 4 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 | 16 +++-------------
parent/pom.xml | 2 +-
.../pulsar/services/PulsarLocalContainerService.java | 2 +-
4 files changed, 6 insertions(+), 16 deletions(-)
[camel] 04/04: 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 cd29c736bcd5262d7eb379d4a60dc59d919efa57
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed May 12 14:28:08 2021 +0200
Regen
---
.../resources/org/apache/camel/catalog/models/routeTemplate.json | 4 ++--
.../org/apache/camel/catalog/models/templateParameter.json | 7 ++++---
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplate.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplate.json
index 954b665..9d681a0 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplate.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplate.json
@@ -11,8 +11,8 @@
"output": true
},
"properties": {
- "templateParameter": { "kind": "element", "displayName": "Template Parameter", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.RouteTemplateParameterDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Adds a parameter the route template uses." },
- "templateBean": { "kind": "element", "displayName": "Template Bean", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.RouteTemplateBeanDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Adds a local bean the route template uses." },
+ "templateParameter": { "kind": "element", "displayName": "Template Parameter", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.RouteTemplateParameterDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Adds a template parameter the route template uses" },
+ "templateBean": { "kind": "element", "displayName": "Template Bean", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.RouteTemplateBeanDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Adds a local bean the route template uses" },
"route": { "kind": "element", "displayName": "Route", "required": true, "type": "object", "javaType": "org.apache.camel.model.RouteDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "To define the route in the template" },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" },
"description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateParameter.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateParameter.json
index 61aa987..bf2a558 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateParameter.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateParameter.json
@@ -11,8 +11,9 @@
"output": false
},
"properties": {
- "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Parameter name" },
- "defaultValue": { "kind": "attribute", "displayName": "Default Value", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Parameter default value" },
- "description": { "kind": "attribute", "displayName": "Description", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Parameter description" }
+ "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The name of the parameter" },
+ "required": { "kind": "attribute", "displayName": "Required", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the parameter is required or not. A parameter is required unless this option is set to false or a default value has been configured." },
+ "defaultValue": { "kind": "attribute", "displayName": "Default Value", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Default value of the parameter. If a default value is provided then the parameter is implied not to be required." },
+ "description": { "kind": "attribute", "displayName": "Description", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Description of the parameter" }
}
}
[camel] 02/04: Use Latest Pulsar image 2.7.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 831df2ea95a00e1d1cc8965ac9c73917b8dfa67d
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed May 12 13:25:56 2021 +0200
Use Latest Pulsar image 2.7.2
---
.../camel/test/infra/pulsar/services/PulsarLocalContainerService.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerService.java b/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerService.java
index db630b7..af06f1c 100644
--- a/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerService.java
+++ b/test-infra/camel-test-infra-pulsar/src/test/java/org/apache/camel/test/infra/pulsar/services/PulsarLocalContainerService.java
@@ -24,7 +24,7 @@ import org.testcontainers.containers.PulsarContainer;
import org.testcontainers.utility.DockerImageName;
public class PulsarLocalContainerService implements PulsarService, ContainerService<PulsarContainer> {
- public static final String CONTAINER_IMAGE = "apachepulsar/pulsar:2.7.1";
+ public static final String CONTAINER_IMAGE = "apachepulsar/pulsar:2.7.2";
private static final Logger LOG = LoggerFactory.getLogger(PulsarLocalContainerService.class);
[camel] 03/04: 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 830789ee862a0c1a544ba94c49d3a433d24d9159
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed May 12 14:02:55 2021 +0200
Sync deps and regen
---
camel-dependencies/pom.xml | 2 +-
.../org/apache/camel/catalog/models/routeTemplate.json | 4 ++--
.../apache/camel/catalog/models/templateParameter.json | 7 +++----
.../org/apache/camel/catalog/schemas/camel-spring.xsd | 16 +++-------------
4 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 03ada5a..eb7788e 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -467,7 +467,7 @@
<protobuf-version>3.11.1</protobuf-version>
<protonpack-version>1.8</protonpack-version>
<pubnub-version>4.25.0</pubnub-version>
- <pulsar-version>2.7.1</pulsar-version>
+ <pulsar-version>2.7.2</pulsar-version>
<qpid-broker-version>8.0.4</qpid-broker-version>
<qpid-jms-client-version>0.58.0</qpid-jms-client-version>
<qpid-proton-j-version>0.33.8</qpid-proton-j-version>
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplate.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplate.json
index 9d681a0..954b665 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplate.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/routeTemplate.json
@@ -11,8 +11,8 @@
"output": true
},
"properties": {
- "templateParameter": { "kind": "element", "displayName": "Template Parameter", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.RouteTemplateParameterDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Adds a template parameter the route template uses" },
- "templateBean": { "kind": "element", "displayName": "Template Bean", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.RouteTemplateBeanDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Adds a local bean the route template uses" },
+ "templateParameter": { "kind": "element", "displayName": "Template Parameter", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.RouteTemplateParameterDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Adds a parameter the route template uses." },
+ "templateBean": { "kind": "element", "displayName": "Template Bean", "required": false, "type": "array", "javaType": "java.util.List<org.apache.camel.model.RouteTemplateBeanDefinition>", "deprecated": false, "autowired": false, "secret": false, "description": "Adds a local bean the route template uses." },
"route": { "kind": "element", "displayName": "Route", "required": true, "type": "object", "javaType": "org.apache.camel.model.RouteDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "To define the route in the template" },
"id": { "kind": "attribute", "displayName": "Id", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the id of this node" },
"description": { "kind": "element", "displayName": "Description", "required": false, "type": "object", "javaType": "org.apache.camel.model.DescriptionDefinition", "deprecated": false, "autowired": false, "secret": false, "description": "Sets the description of this node" }
diff --git a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateParameter.json b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateParameter.json
index bf2a558..61aa987 100644
--- a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateParameter.json
+++ b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/templateParameter.json
@@ -11,9 +11,8 @@
"output": false
},
"properties": {
- "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "The name of the parameter" },
- "required": { "kind": "attribute", "displayName": "Required", "required": false, "type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false, "autowired": false, "secret": false, "defaultValue": false, "description": "Whether the parameter is required or not. A parameter is required unless this option is set to false or a default value has been configured." },
- "defaultValue": { "kind": "attribute", "displayName": "Default Value", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Default value of the parameter. If a default value is provided then the parameter is implied not to be required." },
- "description": { "kind": "attribute", "displayName": "Description", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Description of the parameter" }
+ "name": { "kind": "attribute", "displayName": "Name", "required": true, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Parameter name" },
+ "defaultValue": { "kind": "attribute", "displayName": "Default Value", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Parameter default value" },
+ "description": { "kind": "attribute", "displayName": "Description", "required": false, "type": "string", "javaType": "java.lang.String", "deprecated": false, "autowired": false, "secret": false, "description": "Parameter description" }
}
}
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 1147f5d..57c504d 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
@@ -10337,31 +10337,21 @@ Reference to the route templates in the xml dsl.
<xs:attribute name="name" type="xs:string" use="required">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-The name of the parameter.
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
- <xs:attribute name="required" type="xs:boolean">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the parameter is required or not. A parameter is required unless this
-option is set to false or a default value has been configured. Default value:
-false
+Parameter name.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="defaultValue" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-Default value of the parameter. If a default value is provided then the
-parameter is implied not to be required.
+Parameter default value.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
<xs:attribute name="description" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
-Description of the parameter.
+Parameter description.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
[camel] 01/04: Upgrade Pulsar to version 2.7.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 8087bec6ab50ee8a9d25b3a5915524482ee6b899
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed May 12 13:25:18 2021 +0200
Upgrade Pulsar to version 2.7.2
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index c0ab5c9..a539f58 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -454,7 +454,7 @@
<protobuf-maven-plugin-version>0.6.1</protobuf-maven-plugin-version>
<protonpack-version>1.8</protonpack-version>
<pubnub-version>4.25.0</pubnub-version>
- <pulsar-version>2.7.1</pulsar-version>
+ <pulsar-version>2.7.2</pulsar-version>
<qpid-broker-version>8.0.4</qpid-broker-version>
<qpid-proton-j-version>0.33.8</qpid-proton-j-version>
<qpid-jms-client-version>0.58.0</qpid-jms-client-version>