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/07 15:26:46 UTC
[camel] branch master updated (aa1992e -> 1d7e656)
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 aa1992e CAMEL-16146: Automate list of secret options in SensitiveHelper.java
new 69a1b5c Upgrade AWS SDK v2 to version 2.15.77
new 1d7e656 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] 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 1d7e656b5892987d9c41891aff4b776c36052c93
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sun Feb 7 16:24:46 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 982acfb..248089c 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -71,7 +71,7 @@
<awaitility-version>4.0.3</awaitility-version>
<aws-java-sdk-swf-libs>1.11.22</aws-java-sdk-swf-libs>
<aws-java-sdk-version>1.11.714</aws-java-sdk-version>
- <aws-java-sdk2-version>2.15.76</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.15.77</aws-java-sdk2-version>
<aws-xray-version>2.6.1</aws-xray-version>
<axiom-version>1.2.14</axiom-version>
<azure-eventhubs-checkpointstore-blob-version>1.3.1</azure-eventhubs-checkpointstore-blob-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[
[camel] 01/02: Upgrade AWS SDK v2 to version 2.15.77
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 69a1b5cd9cccfb91a8c310524c9dd54cacdd542f
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sun Feb 7 16:17:19 2021 +0100
Upgrade AWS SDK v2 to version 2.15.77
---
parent/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 7092228..9bb6b7b 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -78,7 +78,7 @@
<avro-ipc-netty-version>1.10.1</avro-ipc-netty-version>
<awaitility-version>4.0.3</awaitility-version>
<aws-java-sdk-version>1.11.714</aws-java-sdk-version>
- <aws-java-sdk2-version>2.15.76</aws-java-sdk2-version>
+ <aws-java-sdk2-version>2.15.77</aws-java-sdk2-version>
<aws-java-sdk-swf-libs>1.11.22</aws-java-sdk-swf-libs>
<aws-xray-version>2.6.1</aws-xray-version>
<axiom-version>1.2.14</axiom-version>