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/01/04 08:36:16 UTC
[camel] branch master updated (6171475 -> c7924d3)
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 6171475 sync deps
new 9703ffb Upgrade Jgroups to version 4.2.10.Final
new c7924d3 Regen and sync deps
The 2 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 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 81 +---------------------
.../quickfixj/QuickfixjSpringTest-context.xml | 3 +-
.../camel/spring/patterns/FilterTest-context.xml | 4 +-
parent/pom.xml | 2 +-
5 files changed, 9 insertions(+), 83 deletions(-)
[camel] 01/02: Upgrade Jgroups to version 4.2.10.Final
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 9703ffb54fbbd4f20e261a7469a7835bdb1c037a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 4 09:29:37 2021 +0100
Upgrade Jgroups to version 4.2.10.Final
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 54a28ec..e815472 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -314,7 +314,7 @@
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
<jettison-version>1.4.1</jettison-version>
<jgit-version>5.10.0.202012080955-r</jgit-version>
- <jgroups-version>4.2.6.Final</jgroups-version>
+ <jgroups-version>4.2.10.Final</jgroups-version>
<jgroups-raft-version>0.5.2.Final</jgroups-raft-version>
<jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
[camel] 02/02: Regen and 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 c7924d39cb1986fe8e26460b5a12a08aea400da4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Jan 4 09:35:19 2021 +0100
Regen and sync deps
---
camel-dependencies/pom.xml | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 81 +---------------------
.../quickfixj/QuickfixjSpringTest-context.xml | 3 +-
.../camel/spring/patterns/FilterTest-context.xml | 4 +-
4 files changed, 8 insertions(+), 82 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 6d721c5..92dcc38 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -333,7 +333,7 @@
<jgroups-raft-leveldbjni-version>1.8</jgroups-raft-leveldbjni-version>
<jgroups-raft-mapdb-version>1.0.8</jgroups-raft-mapdb-version>
<jgroups-raft-version>0.5.2.Final</jgroups-raft-version>
- <jgroups-version>4.2.6.Final</jgroups-version>
+ <jgroups-version>4.2.10.Final</jgroups-version>
<jing-version>20030619</jing-version>
<jira-guava-version>26.0-jre</jira-guava-version>
<jira-rest-client-api-version>5.2.1</jira-rest-client-api-version>
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>
diff --git a/docs/components/modules/ROOT/examples/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml b/docs/components/modules/ROOT/examples/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml
index cbbed8e..577c4a3 100644
--- a/docs/components/modules/ROOT/examples/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml
+++ b/docs/components/modules/ROOT/examples/components/camel-quickfix/src/test/resources/org/apache/camel/component/quickfixj/QuickfixjSpringTest-context.xml
@@ -20,6 +20,7 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:camel="http://camel.apache.org/schema/spring"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd
@@ -125,4 +126,4 @@
</property>
</bean>
-</beans>
+</beans>
\ No newline at end of file
diff --git a/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml b/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml
index a5a6e29..0541bd1 100644
--- a/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml
+++ b/docs/user-manual/modules/ROOT/examples/components/camel-spring/src/test/resources/org/apache/camel/spring/patterns/FilterTest-context.xml
@@ -21,9 +21,11 @@
<!-- tag::example[] -->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:context="http://www.springframework.org/schema/context"
xsi:schemaLocation="
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd">
+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd
+ ">
<camelContext xmlns="http://camel.apache.org/schema/spring">
<route>