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 2020/12/26 13:51:58 UTC
[camel] branch master updated (4b819fe -> 2ba2d63)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 4b819fe Regen for commit f6a6cf42536dd276918d26df9e4f6695ed2faadf (#4816)
new 77fd0ee Upgrade Zipkin to version 2.23.2
new 806bec0 Upgrade Brave Zipkin to version 5.13.3
new 384927d Upgrade Zipkin Reporter to version 2.16.3
new 2ba2d63 Sync deps
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 | 6 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 81 +---------------------
parent/pom.xml | 6 +-
3 files changed, 8 insertions(+), 85 deletions(-)
[camel] 01/04: Upgrade Zipkin to version 2.23.2
Posted by ac...@apache.org.
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.git
commit 77fd0eeec5c4df9ded4b8ebdc7c9275b40d8f899
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sat Dec 26 14:41:51 2020 +0100
Upgrade Zipkin to version 2.23.2
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 3a9006e..9470bcc 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -564,7 +564,7 @@
<yetus-audience-annotations-version>0.11.0</yetus-audience-annotations-version>
<zendesk-client-version>0.14.0</zendesk-client-version>
<zipkin-reporter-version>2.16.2</zipkin-reporter-version>
- <zipkin-version>2.23.1</zipkin-version>
+ <zipkin-version>2.23.2</zipkin-version>
<zookeeper-version>3.5.7</zookeeper-version>
<zxing-version>3.4.0</zxing-version>
[camel] 04/04: Sync deps
Posted by ac...@apache.org.
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.git
commit 2ba2d6362203936fa459dca1f2cb25a0d0a6e0b6
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sat Dec 26 14:50:58 2020 +0100
Sync deps
---
camel-dependencies/pom.xml | 6 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 81 +---------------------
2 files changed, 5 insertions(+), 82 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index c412ced..acdbbb7 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -84,7 +84,7 @@
<bouncycastle-version>1.66</bouncycastle-version>
<box-java-sdk-version>2.52.0</box-java-sdk-version>
<braintree-gateway-version>3.5.0</braintree-gateway-version>
- <brave-zipkin-version>5.13.2</brave-zipkin-version>
+ <brave-zipkin-version>5.13.3</brave-zipkin-version>
<build-helper-maven-plugin-version>3.1.0</build-helper-maven-plugin-version>
<c3p0-version>0.9.5.5</c3p0-version>
<caffeine-version>2.8.8</caffeine-version>
@@ -575,8 +575,8 @@
<xstream-version>1.4.14</xstream-version>
<yetus-audience-annotations-version>0.11.0</yetus-audience-annotations-version>
<zendesk-client-version>0.14.0</zendesk-client-version>
- <zipkin-reporter-version>2.16.2</zipkin-reporter-version>
- <zipkin-version>2.23.1</zipkin-version>
+ <zipkin-reporter-version>2.16.3</zipkin-reporter-version>
+ <zipkin-version>2.23.2</zipkin-version>
<zookeeper-version>3.5.7</zookeeper-version>
<zxing-version>3.4.0</zxing-version>
</properties>
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 0530ef7..a4e492f 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
@@ -4374,6 +4374,7 @@ To use a specific charset when converting.
<xs:complexContent>
<xs:extension base="tns:identifiedType">
<xs:sequence/>
+ <xs:attribute name="contentTypeHeader" type="xs:string"/>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -5586,14 +5587,6 @@ null. Default value: false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="breakOnShutdown" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-If the breakOnShutdown attribute is true, then the loop will not iterate until
-it reaches the end when Camel is shut down. Default value: false
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -6449,16 +6442,6 @@ true (which is the default).
<xs:list itemType="xs:string"/>
</xs:simpleType>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -6742,16 +6725,6 @@ enabled when desired to be used. Default value: false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -6911,16 +6884,6 @@ JAXB provider properties to be used with the JAXB marshaller.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -7100,16 +7063,6 @@ Default value: false
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -7224,16 +7177,6 @@ value is native. Default value: native
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -7505,16 +7448,6 @@ representation. The default value is binary. Default value: binary
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -7826,16 +7759,6 @@ SINGLE_NODE_XPATH_RELATIVE_REFERENCES SINGLE_NODE_XPATH_ABSOLUTE_REFERENCES.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="contentTypeHeader" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-Whether the data format should set the Content-Type header with the type from
-the data format. For example application/xml for data formats marshalling to
-XML, or application/json for data formats marshalling to JSON. Default value:
-true
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
</xs:extension>
</xs:complexContent>
</xs:complexType>
@@ -12184,7 +12107,7 @@ ServiceCallConstants.SERVICE_PORT. Default value: CamelServiceCallServicePort
<xs:element ref="tns:ribbonLoadBalancer"/>
<xs:element ref="tns:defaultLoadBalancer"/>
</xs:choice>
- <xs:element minOccurs="0" name="expression" type="tns:serviceCallExpressionConfiguration"/>
+ <xs:element minOccurs="0" name="expressionConfiguration" type="tns:serviceCallExpressionConfiguration"/>
</xs:sequence>
<xs:attribute name="name" type="xs:string">
<xs:annotation>
[camel] 03/04: Upgrade Zipkin Reporter to version 2.16.3
Posted by ac...@apache.org.
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.git
commit 384927dd7787c36971789ed22f04c35f19f04bbc
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sat Dec 26 14:43:39 2020 +0100
Upgrade Zipkin Reporter to version 2.16.3
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 54fa0ac..ee51ae9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -563,7 +563,7 @@
<xstream-version>1.4.14</xstream-version>
<yetus-audience-annotations-version>0.11.0</yetus-audience-annotations-version>
<zendesk-client-version>0.14.0</zendesk-client-version>
- <zipkin-reporter-version>2.16.2</zipkin-reporter-version>
+ <zipkin-reporter-version>2.16.3</zipkin-reporter-version>
<zipkin-version>2.23.2</zipkin-version>
<zookeeper-version>3.5.7</zookeeper-version>
<zxing-version>3.4.0</zxing-version>
[camel] 02/04: Upgrade Brave Zipkin to version 5.13.3
Posted by ac...@apache.org.
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.git
commit 806bec03ef4ca3454db46b2e22825e9b1e8a6002
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sat Dec 26 14:42:29 2020 +0100
Upgrade Brave Zipkin to version 5.13.3
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9470bcc..54fa0ac 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -92,7 +92,7 @@
<bouncycastle-version>1.66</bouncycastle-version>
<box-java-sdk-version>2.52.0</box-java-sdk-version>
<braintree-gateway-version>3.5.0</braintree-gateway-version>
- <brave-zipkin-version>5.13.2</brave-zipkin-version>
+ <brave-zipkin-version>5.13.3</brave-zipkin-version>
<build-helper-maven-plugin-version>3.1.0</build-helper-maven-plugin-version>
<c3p0-version>0.9.5.5</c3p0-version>
<caffeine-version>2.8.8</caffeine-version>