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/03/07 10:45:09 UTC

[camel] branch main updated (4c587528f51 -> 6d2c0704565)

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 4c587528f51 CAMEL-19062 - Clean up Parent POM - XML Apis
     new 8c44478ed4e CAMEL-19062 - Clean up Parent POM - Woodstox
     new 9a42c8a3d56 CAMEL-19062 - Clean up Parent POM - Woodstox
     new 6d2c0704565 CAMEL-19062 - Clean up Parent POM - Woodstox

The 3 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:
 core/camel-core-engine/pom.xml    |  7 +++++++
 core/camel-core/pom.xml           |  7 +++++++
 core/camel-management-api/pom.xml | 14 ++++++++++++++
 core/camel-xml-jaxp/pom.xml       |  7 +++++++
 parent/pom.xml                    | 13 -------------
 5 files changed, 35 insertions(+), 13 deletions(-)


[camel] 01/03: CAMEL-19062 - Clean up Parent POM - Woodstox

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 8c44478ed4e3f187907438de2641071728bb45f0
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 7 11:27:55 2023 +0100

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 3e589642952..7c382729a0e 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2773,19 +2773,6 @@
                 <scope>import</scope>
             </dependency>
 	    
-            <!-- optional misc -->
-            <dependency>
-                <groupId>org.codehaus.woodstox</groupId>
-                <artifactId>woodstox-core-asl</artifactId>
-                <version>${woodstox-version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.stream</groupId>
-                        <artifactId>stax-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <!-- optional avro -->
             <dependency>
                 <groupId>org.apache.avro</groupId>


[camel] 02/03: CAMEL-19062 - Clean up Parent POM - Woodstox

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 9a42c8a3d56ac671df590e524b4c2b5d631b6752
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 7 11:30:33 2023 +0100

    CAMEL-19062 - Clean up Parent POM - Woodstox
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 core/camel-core-engine/pom.xml    | 7 +++++++
 core/camel-core/pom.xml           | 7 +++++++
 core/camel-management-api/pom.xml | 7 +++++++
 core/camel-xml-jaxp/pom.xml       | 7 +++++++
 4 files changed, 28 insertions(+)

diff --git a/core/camel-core-engine/pom.xml b/core/camel-core-engine/pom.xml
index fb7b18ce7a9..65aa0beb81d 100644
--- a/core/camel-core-engine/pom.xml
+++ b/core/camel-core-engine/pom.xml
@@ -310,7 +310,14 @@
                 <dependency>
                     <groupId>org.codehaus.woodstox</groupId>
                     <artifactId>woodstox-core-asl</artifactId>
+                    <version>${woodstox-version}</version>
                     <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>javax.xml.stream</groupId>
+                            <artifactId>stax-api</artifactId>
+                        </exclusion>
+                    </exclusions>
                 </dependency>
             </dependencies>
         </profile>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index 952edb441db..7e484ada8f3 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -170,7 +170,14 @@
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>woodstox-core-asl</artifactId>
+            <version>${woodstox-version}</version>
             <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.stream</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                </exclusions>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
diff --git a/core/camel-management-api/pom.xml b/core/camel-management-api/pom.xml
index d8832c8da1c..9266c43009e 100644
--- a/core/camel-management-api/pom.xml
+++ b/core/camel-management-api/pom.xml
@@ -57,7 +57,14 @@
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>woodstox-core-asl</artifactId>
+            <version>${woodstox-version}</version>
             <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.stream</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                </exclusions>
         </dependency>
     </dependencies>
 
diff --git a/core/camel-xml-jaxp/pom.xml b/core/camel-xml-jaxp/pom.xml
index 17e1e181f04..013ba297494 100644
--- a/core/camel-xml-jaxp/pom.xml
+++ b/core/camel-xml-jaxp/pom.xml
@@ -57,7 +57,14 @@
         <dependency>
             <groupId>org.codehaus.woodstox</groupId>
             <artifactId>woodstox-core-asl</artifactId>
+            <version>${woodstox-version}</version>
             <scope>test</scope>
+                <exclusions>
+                    <exclusion>
+                        <groupId>javax.xml.stream</groupId>
+                        <artifactId>stax-api</artifactId>
+                    </exclusion>
+                </exclusions>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>


[camel] 03/03: CAMEL-19062 - Clean up Parent POM - Woodstox

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 6d2c07045657a1222338489eece1849dccaa3283
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Tue Mar 7 11:31:12 2023 +0100

    CAMEL-19062 - Clean up Parent POM - Woodstox
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 core/camel-management-api/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/core/camel-management-api/pom.xml b/core/camel-management-api/pom.xml
index 9266c43009e..ebd30ef4a22 100644
--- a/core/camel-management-api/pom.xml
+++ b/core/camel-management-api/pom.xml
@@ -250,7 +250,14 @@
                 <dependency>
                     <groupId>org.codehaus.woodstox</groupId>
                     <artifactId>woodstox-core-asl</artifactId>
+                    <version>${woodstox-version}</version>
                     <scope>test</scope>
+                    <exclusions>
+                        <exclusion>
+                            <groupId>javax.xml.stream</groupId>
+                            <artifactId>stax-api</artifactId>
+                        </exclusion>
+                    </exclusions>
                 </dependency>
             </dependencies>
         </profile>