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 2023/02/20 11:32:32 UTC

[camel] branch main updated (40d83609da1 -> 662bd1c1240)

This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


    from 40d83609da1 CAMEL-19062 - Clean up Parent POM - Stax-api
     new 09403b1b05b CAMEL-19062 - Clean up Parent POM - JAXB impl
     new 7d9f6674012 CAMEL-19062 - Clean up Parent POM - JAXB impl
     new 0f9f05d503c CAMEL-19062 - Clean up Parent POM - JAXB core
     new dac309e3756 CAMEL-19062 - Clean up Parent POM - JAXB JXC
     new f9ac27332bd CAMEL-19062 - Clean up Parent POM - JAXP-ri
     new 662bd1c1240 Sync deps

The 6 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                         |  1 +
 components/camel-cxf/camel-cxf-common/pom.xml      |  1 +
 components/camel-cxf/camel-cxf-rest/pom.xml        |  1 +
 components/camel-cxf/camel-cxf-soap/pom.xml        |  1 +
 .../camel-cxf/camel-cxf-spring-common/pom.xml      |  1 +
 components/camel-cxf/camel-cxf-spring-rest/pom.xml |  1 +
 components/camel-cxf/camel-cxf-spring-soap/pom.xml |  1 +
 components/camel-jaxb/pom.xml                      |  2 ++
 components/camel-jmx/pom.xml                       |  1 +
 .../camel-salesforce-component/pom.xml             |  1 +
 components/camel-soap/pom.xml                      |  1 +
 core/camel-xml-jaxb/pom.xml                        |  2 ++
 parent/pom.xml                                     | 29 +---------------------
 13 files changed, 15 insertions(+), 28 deletions(-)


[camel] 01/06: CAMEL-19062 - Clean up Parent POM - JAXB impl

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 09403b1b05bb09086a21deedaaf9fee6f91a7cca
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 20 11:30:33 2023 +0100

    CAMEL-19062 - Clean up Parent POM - JAXB impl
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 components/camel-jaxb/pom.xml                                  | 1 +
 components/camel-jmx/pom.xml                                   | 1 +
 components/camel-salesforce/camel-salesforce-component/pom.xml | 1 +
 components/camel-soap/pom.xml                                  | 1 +
 core/camel-xml-jaxb/pom.xml                                    | 1 +
 5 files changed, 5 insertions(+)

diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 57b9f57c28f..6ee2ba4f4f2 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -54,6 +54,7 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
+            <version>${jaxb-impl-version}</version>
             <optional>true</optional>
         </dependency>
 
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index 3b15cce2c18..95b03a5cf9b 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -52,6 +52,7 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
+            <version>${jaxb-impl-version}</version>
         </dependency>
 
         <!-- test dependencies -->
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 26a276ced1e..ff01224e348 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -124,6 +124,7 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
+            <version>${jaxb-impl-version}</version>
         </dependency>
         
         <!-- testing -->
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index 041bb6a7c4f..f9870aa9c97 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -48,6 +48,7 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
+            <version>${jaxb-impl-version}</version>
         </dependency>
         <dependency>
             <groupId>jakarta.xml.ws</groupId>
diff --git a/core/camel-xml-jaxb/pom.xml b/core/camel-xml-jaxb/pom.xml
index c9afa38e481..e5556de009a 100644
--- a/core/camel-xml-jaxb/pom.xml
+++ b/core/camel-xml-jaxb/pom.xml
@@ -53,6 +53,7 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
+            <version>${jaxb-impl-version}</version>
         </dependency>
 
         <dependency>


[camel] 06/06: 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 main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 662bd1c1240bfe8c83ff0d365c4513e4efe7f2ae
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 20 12:32:16 2023 +0100

    Sync deps
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 camel-dependencies/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 4e10cb5cf67..0457fa65a58 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -266,6 +266,7 @@
         <glassfish-javax-json>1.0.4</glassfish-javax-json>
         <glassfish-jaxb-runtime-version>4.0.1</glassfish-jaxb-runtime-version>
         <jaxb2-maven-plugin-version>3.1.0</jaxb2-maven-plugin-version>
+        <jaxp-ri-version>1.4.5</jaxp-ri-version>
         <jbpm-version>7.73.0.Final</jbpm-version>
         <jboss-el-api_3.0_spec-version>2.0.0.Final</jboss-el-api_3.0_spec-version>
         <jboss-logging-version>3.4.3.Final</jboss-logging-version>


[camel] 02/06: CAMEL-19062 - Clean up Parent POM - JAXB impl

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 7d9f6674012f34faf7da459a931a1d048e42e6b2
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 20 11:37:05 2023 +0100

    CAMEL-19062 - Clean up Parent POM - JAXB impl
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 parent/pom.xml | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index ba06db85661..73dbbc517e4 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2692,17 +2692,6 @@
             </dependency>
 	    
 	    <!-- optional dependencies -->
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-impl</artifactId>
-                <version>${jaxb-impl-version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.jws</groupId>
-                        <artifactId>jsr181-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-core</artifactId>


[camel] 04/06: CAMEL-19062 - Clean up Parent POM - JAXB JXC

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit dac309e3756a66ec0efa8c2a28558120ee838b45
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 20 11:57:06 2023 +0100

    CAMEL-19062 - Clean up Parent POM - JAXB JXC
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 parent/pom.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/parent/pom.xml b/parent/pom.xml
index 522272422ca..e675b12383e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2692,11 +2692,6 @@
             </dependency>
 	    
 	    <!-- optional dependencies -->
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-jxc</artifactId>
-                <version>${jaxb-xjc-version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.sun.xml.parsers</groupId>
                 <artifactId>jaxp-ri</artifactId>


[camel] 05/06: CAMEL-19062 - Clean up Parent POM - JAXP-ri

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit f9ac27332bd26b6cdea896c45e581986dbf4f558
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 20 12:20:58 2023 +0100

    CAMEL-19062 - Clean up Parent POM - JAXP-ri
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 components/camel-cxf/camel-cxf-common/pom.xml        | 1 +
 components/camel-cxf/camel-cxf-rest/pom.xml          | 1 +
 components/camel-cxf/camel-cxf-soap/pom.xml          | 1 +
 components/camel-cxf/camel-cxf-spring-common/pom.xml | 1 +
 components/camel-cxf/camel-cxf-spring-rest/pom.xml   | 1 +
 components/camel-cxf/camel-cxf-spring-soap/pom.xml   | 1 +
 parent/pom.xml                                       | 8 +-------
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/camel-cxf/camel-cxf-common/pom.xml b/components/camel-cxf/camel-cxf-common/pom.xml
index eb04795010e..607bd97080a 100644
--- a/components/camel-cxf/camel-cxf-common/pom.xml
+++ b/components/camel-cxf/camel-cxf-common/pom.xml
@@ -141,6 +141,7 @@
                 <dependency>
                     <groupId>com.sun.xml.parsers</groupId>
                     <artifactId>jaxp-ri</artifactId>
+                    <version>${jaxp-ri-version}</version>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/components/camel-cxf/camel-cxf-rest/pom.xml b/components/camel-cxf/camel-cxf-rest/pom.xml
index 5e30f918687..c48b622fd68 100644
--- a/components/camel-cxf/camel-cxf-rest/pom.xml
+++ b/components/camel-cxf/camel-cxf-rest/pom.xml
@@ -275,6 +275,7 @@
                 <dependency>
                     <groupId>com.sun.xml.parsers</groupId>
                     <artifactId>jaxp-ri</artifactId>
+                    <version>${jaxp-ri-version}</version>                    
                 </dependency>
             </dependencies>
         </profile>
diff --git a/components/camel-cxf/camel-cxf-soap/pom.xml b/components/camel-cxf/camel-cxf-soap/pom.xml
index 1fcd5beb068..7a626786d3c 100644
--- a/components/camel-cxf/camel-cxf-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-soap/pom.xml
@@ -351,6 +351,7 @@
                 <dependency>
                     <groupId>com.sun.xml.parsers</groupId>
                     <artifactId>jaxp-ri</artifactId>
+                    <version>${jaxp-ri-version}</version>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/components/camel-cxf/camel-cxf-spring-common/pom.xml b/components/camel-cxf/camel-cxf-spring-common/pom.xml
index 8592819cdaf..893c9ab328c 100644
--- a/components/camel-cxf/camel-cxf-spring-common/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-common/pom.xml
@@ -127,6 +127,7 @@
                 <dependency>
                     <groupId>com.sun.xml.parsers</groupId>
                     <artifactId>jaxp-ri</artifactId>
+                    <version>${jaxp-ri-version}</version>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/components/camel-cxf/camel-cxf-spring-rest/pom.xml b/components/camel-cxf/camel-cxf-spring-rest/pom.xml
index a8f5959a2b9..cdfb0495a7b 100644
--- a/components/camel-cxf/camel-cxf-spring-rest/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-rest/pom.xml
@@ -346,6 +346,7 @@
                 <dependency>
                     <groupId>com.sun.xml.parsers</groupId>
                     <artifactId>jaxp-ri</artifactId>
+                    <version>${jaxp-ri-version}</version>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/components/camel-cxf/camel-cxf-spring-soap/pom.xml b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
index 9ec11489946..cc4a8e585a9 100644
--- a/components/camel-cxf/camel-cxf-spring-soap/pom.xml
+++ b/components/camel-cxf/camel-cxf-spring-soap/pom.xml
@@ -416,6 +416,7 @@
                 <dependency>
                     <groupId>com.sun.xml.parsers</groupId>
                     <artifactId>jaxp-ri</artifactId>
+                    <version>${jaxp-ri-version}</version>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/parent/pom.xml b/parent/pom.xml
index e675b12383e..97c989ee13c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -261,6 +261,7 @@
         <glassfish-javax-json>1.0.4</glassfish-javax-json>
         <glassfish-jaxb-runtime-version>4.0.1</glassfish-jaxb-runtime-version>
         <jaxb2-maven-plugin-version>3.1.0</jaxb2-maven-plugin-version>
+        <jaxp-ri-version>1.4.5</jaxp-ri-version>
         <jbpm-version>7.73.0.Final</jbpm-version>
         <jboss-el-api_3.0_spec-version>2.0.0.Final</jboss-el-api_3.0_spec-version>
         <jboss-logging-version>3.4.3.Final</jboss-logging-version>
@@ -2691,13 +2692,6 @@
                 <version>${jackson2-version}</version>
             </dependency>
 	    
-	    <!-- optional dependencies -->
-            <dependency>
-                <groupId>com.sun.xml.parsers</groupId>
-                <artifactId>jaxp-ri</artifactId>
-                <version>1.4.5</version>
-            </dependency>
-
             <!-- logging -->
             <dependency>
                 <groupId>org.slf4j</groupId>


[camel] 03/06: CAMEL-19062 - Clean up Parent POM - JAXB core

Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

acosentino pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 0f9f05d503c5a007c100df4c31cb1be10f6a25a4
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Mon Feb 20 11:49:35 2023 +0100

    CAMEL-19062 - Clean up Parent POM - JAXB core
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 components/camel-jaxb/pom.xml | 1 +
 core/camel-xml-jaxb/pom.xml   | 1 +
 parent/pom.xml                | 5 -----
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/components/camel-jaxb/pom.xml b/components/camel-jaxb/pom.xml
index 6ee2ba4f4f2..6e6697c89eb 100644
--- a/components/camel-jaxb/pom.xml
+++ b/components/camel-jaxb/pom.xml
@@ -50,6 +50,7 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>
+            <version>${jaxb-core-version}</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
diff --git a/core/camel-xml-jaxb/pom.xml b/core/camel-xml-jaxb/pom.xml
index e5556de009a..5b689d90ead 100644
--- a/core/camel-xml-jaxb/pom.xml
+++ b/core/camel-xml-jaxb/pom.xml
@@ -49,6 +49,7 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-core</artifactId>
+            <version>${jaxb-core-version}</version>            
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 73dbbc517e4..522272422ca 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2692,11 +2692,6 @@
             </dependency>
 	    
 	    <!-- optional dependencies -->
-            <dependency>
-                <groupId>com.sun.xml.bind</groupId>
-                <artifactId>jaxb-core</artifactId>
-                <version>${jaxb-core-version}</version>
-            </dependency>
             <dependency>
                 <groupId>com.sun.xml.bind</groupId>
                 <artifactId>jaxb-jxc</artifactId>