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/02 07:48:31 UTC

[camel] branch master updated (c0f65b9 -> 16e21de)

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 c0f65b9  Sync deps
     new 9469ad3  Upgrade Owasp Maven Plugin to version 6.1.0
     new 16e21de  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 +-
 .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd       | 4 ++--
 parent/pom.xml                                                        | 2 +-
 3 files changed, 4 insertions(+), 4 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 16e21de5d8bb854949629d337d8dc642ceabba45
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Feb 2 08:44:44 2021 +0100

    Sync deps
---
 camel-dependencies/pom.xml                                            | 2 +-
 .../resources/org/apache/camel/catalog/schemas/camel-spring.xsd       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index d89f0e7..29319e4 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -402,7 +402,7 @@
     <maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
     <maven-jboss-as-maven-plugin-version>7.9.Final</maven-jboss-as-maven-plugin-version>
     <maven-model-version>3.2.5</maven-model-version>
-    <maven-owasp-plugin-version>6.0.5</maven-owasp-plugin-version>
+    <maven-owasp-plugin-version>6.1.0</maven-owasp-plugin-version>
     <maven-plugin-annotations-version>3.6.0</maven-plugin-annotations-version>
     <maven-plugin-plugin-version>3.6.0</maven-plugin-plugin-version>
     <maven-plugin-testing-harness-version>3.3.0</maven-plugin-testing-harness-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..070e9a6 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,7 +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:attribute name="jsonView" 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
@@ -6974,7 +6974,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:attribute name="jsonView" 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


[camel] 01/02: Upgrade Owasp Maven Plugin to version 6.1.0

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 9469ad3b51bc47dd3813aa1b0794cb08798c09e3
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Feb 2 08:44:03 2021 +0100

    Upgrade Owasp Maven Plugin to version 6.1.0
---
 parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index e1df4d5..a2840ce 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -383,7 +383,7 @@
         <maven-assembly-plugin-version>3.0.0</maven-assembly-plugin-version>
         <maven-checkstyle-plugin-version>3.1.1</maven-checkstyle-plugin-version>
         <maven-checkstyle-version>8.35</maven-checkstyle-version>
-        <maven-owasp-plugin-version>6.0.5</maven-owasp-plugin-version>
+        <maven-owasp-plugin-version>6.1.0</maven-owasp-plugin-version>
         <maven-jar-plugin-version>3.2.0</maven-jar-plugin-version>
         <maven-javadoc-plugin-version>3.2.0</maven-javadoc-plugin-version>
         <maven-jboss-as-maven-plugin-version>7.9.Final</maven-jboss-as-maven-plugin-version>