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/02/08 05:52:21 UTC
[camel] branch master updated (5c33d8d -> 5f74ed2)
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 5c33d8d Regen for commit 1d7e656b5892987d9c41891aff4b776c36052c93
new 99b467f Upgrade FOP to version 2.6
new 5f74ed2 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 | 20 ++------------------
parent/pom.xml | 2 +-
3 files changed, 4 insertions(+), 20 deletions(-)
[camel] 01/02: Upgrade FOP to version 2.6
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 99b467f47776140e94da0bf2cebdb7d83022d5a4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 8 06:39:14 2021 +0100
Upgrade FOP to version 2.6
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 9bb6b7b..bdd7e85 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -186,7 +186,7 @@
<google-maps-services-version>0.10.1</google-maps-services-version>
<flatpack-version>4.0.4</flatpack-version>
<flink-version>1.12.1</flink-version>
- <fop-version>2.5</fop-version>
+ <fop-version>2.6</fop-version>
<ftpserver-version>1.1.1</ftpserver-version>
<freemarker-version>2.3.30</freemarker-version>
<geronimo-annotation-1.0-spec-version>1.1.1</geronimo-annotation-1.0-spec-version>
[camel] 02/02: 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 5f74ed2ce976376ad60daf88a78744a742da7ddd
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 8 06:42:52 2021 +0100
Sync deps
---
camel-dependencies/pom.xml | 2 +-
.../apache/camel/catalog/schemas/camel-spring.xsd | 20 ++------------------
2 files changed, 3 insertions(+), 19 deletions(-)
diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 248089c..772d939 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -202,7 +202,7 @@
<findbugs-maven-plugin-version>2.5.2</findbugs-maven-plugin-version>
<flatpack-version>4.0.4</flatpack-version>
<flink-version>1.12.1</flink-version>
- <fop-version>2.5</fop-version>
+ <fop-version>2.6</fop-version>
<freemarker-version>2.3.30</freemarker-version>
<ftpserver-version>1.1.1</ftpserver-version>
<geronimo-annotation-1.0-spec-version>1.1.1</geronimo-annotation-1.0-spec-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 d7cdfbd..c4815a3 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
@@ -6651,15 +6651,7 @@ Class name of the java type to use when unmarshalling.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="jsonViewTypeName" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-When marshalling a POJO to JSON you might want to exclude certain fields from
-the JSON output. With Jackson you can use JSON views to accomplish this. This
-option is to refer to the class which has JsonView annotations.
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
+ <xs:attribute name="jsonView" type="xs:string"/>
<xs:attribute name="include" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[
@@ -6974,15 +6966,7 @@ Class name of the java type to use when unmarshalling.
]]></xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="jsonViewTypeName" type="xs:string">
- <xs:annotation>
- <xs:documentation xml:lang="en"><![CDATA[
-When marshalling a POJO to JSON you might want to exclude certain fields from
-the JSON output. With Jackson you can use JSON views to accomplish this. This
-option is to refer to the class which has JsonView annotations.
- ]]></xs:documentation>
- </xs:annotation>
- </xs:attribute>
+ <xs:attribute name="jsonView" type="xs:string"/>
<xs:attribute name="include" type="xs:string">
<xs:annotation>
<xs:documentation xml:lang="en"><![CDATA[