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/08 10:38:54 UTC

[camel] branch main updated (c3289efaa56 -> cffe17d4ba6)

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 c3289efaa56 CAMEL-19062 - Clean up Parent POM - Directory Watcher
     new 3e5a9a8b9bd CAMEL-19062 - Clean up Parent POM - Jakarta XML WS API
     new 6f1a31f9605 CAMEL-19062 - Clean up Parent POM - Jakarta XML WS API
     new 43ef4f7687b CAMEL-19062 - Clean up Parent POM - Jakarta Annotations API
     new d8df879a96f CAMEL-19062 - Clean up Parent POM - Jakarta Annotations API
     new cffe17d4ba6 CAMEL-19062 - Clean up Parent POM - Jakarta Annotations API

The 5 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:
 components/camel-jetty/pom.xml                        |  1 +
 components/camel-netty-http/pom.xml                   |  1 +
 .../camel-salesforce-component/pom.xml                |  1 +
 components/camel-soap/pom.xml                         |  7 +++++++
 components/camel-spring-redis/pom.xml                 |  1 +
 components/camel-spring-ws/pom.xml                    |  1 +
 components/camel-spring-xml/pom.xml                   |  1 +
 .../camel-yaml-dsl-maven-plugin/pom.xml               |  1 +
 parent/pom.xml                                        | 19 -------------------
 tooling/maven/camel-package-maven-plugin/pom.xml      |  1 +
 tooling/openapi-rest-dsl-generator/pom.xml            |  1 +
 11 files changed, 16 insertions(+), 19 deletions(-)


[camel] 05/05: CAMEL-19062 - Clean up Parent POM - Jakarta Annotations API

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 cffe17d4ba6eb92bda714fc8c5b4f82c1dbc4e2c
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 11:32:39 2023 +0100

    CAMEL-19062 - Clean up Parent POM - Jakarta Annotations API
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 components/camel-netty-http/pom.xml                            | 1 +
 components/camel-salesforce/camel-salesforce-component/pom.xml | 1 +
 components/camel-spring-redis/pom.xml                          | 1 +
 components/camel-spring-ws/pom.xml                             | 1 +
 dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml         | 1 +
 5 files changed, 5 insertions(+)

diff --git a/components/camel-netty-http/pom.xml b/components/camel-netty-http/pom.xml
index c6a88feeab6..e60cf6a3ee7 100644
--- a/components/camel-netty-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -161,6 +161,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-api-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 900ab8092db..e2e4ba5ef09 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -120,6 +120,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-api-version}</version>
         </dependency>
 
         <dependency>
diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml
index 70c6328a9a8..62e5d502000 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -65,6 +65,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-api-version}</version>
             <scope>test</scope>
         </dependency>
 
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 24dcbc0bdaa..e0928a763ee 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -80,6 +80,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-api-version}</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.messaging.saaj</groupId>
diff --git a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
index 9545f20768e..e43ca0fc034 100644
--- a/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
+++ b/dsl/camel-yaml-dsl/camel-yaml-dsl-maven-plugin/pom.xml
@@ -131,6 +131,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-api-version}</version>
         </dependency>
     </dependencies>
 


[camel] 04/05: CAMEL-19062 - Clean up Parent POM - Jakarta Annotations API

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 d8df879a96f1cc47095f9058a9da41e2f9199588
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 11:31:24 2023 +0100

    CAMEL-19062 - Clean up Parent POM - Jakarta Annotations API
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 components/camel-jetty/pom.xml                   | 1 +
 components/camel-spring-xml/pom.xml              | 1 +
 tooling/maven/camel-package-maven-plugin/pom.xml | 1 +
 tooling/openapi-rest-dsl-generator/pom.xml       | 1 +
 4 files changed, 4 insertions(+)

diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 9f2fd2205a2..5c15c205334 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -169,6 +169,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-api-version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
diff --git a/components/camel-spring-xml/pom.xml b/components/camel-spring-xml/pom.xml
index 7a2d20e5a69..8b27adf5e79 100644
--- a/components/camel-spring-xml/pom.xml
+++ b/components/camel-spring-xml/pom.xml
@@ -148,6 +148,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-api-version}</version>
         </dependency>
 
         <!-- assertj and woostox are used for a few tests -->
diff --git a/tooling/maven/camel-package-maven-plugin/pom.xml b/tooling/maven/camel-package-maven-plugin/pom.xml
index 91ea8eb020a..d4123499f86 100644
--- a/tooling/maven/camel-package-maven-plugin/pom.xml
+++ b/tooling/maven/camel-package-maven-plugin/pom.xml
@@ -191,6 +191,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-api-version}</version>
         </dependency>
     </dependencies>
 
diff --git a/tooling/openapi-rest-dsl-generator/pom.xml b/tooling/openapi-rest-dsl-generator/pom.xml
index cbe46feec95..bb7a5c41a7c 100644
--- a/tooling/openapi-rest-dsl-generator/pom.xml
+++ b/tooling/openapi-rest-dsl-generator/pom.xml
@@ -74,6 +74,7 @@
         <dependency>
             <groupId>jakarta.annotation</groupId>
             <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-api-version}</version>
         </dependency>
 
         <!-- test -->


[camel] 02/05: CAMEL-19062 - Clean up Parent POM - Jakarta XML WS API

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 6f1a31f9605f6538307ebef7389c6c98b5434858
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 11:00:06 2023 +0100

    CAMEL-19062 - Clean up Parent POM - Jakarta XML WS API
    
    Signed-off-by: Andrea Cosentino <an...@gmail.com>
---
 components/camel-soap/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index a76519b5919..327a3a1ec36 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -53,6 +53,13 @@
         <dependency>
             <groupId>jakarta.xml.ws</groupId>
             <artifactId>jakarta.xml.ws-api</artifactId>
+            <version>${jakarta-xml-ws-api-version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>jakarta.jws</groupId>


[camel] 01/05: CAMEL-19062 - Clean up Parent POM - Jakarta XML WS API

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 3e5a9a8b9bd5d20fb636a3db360c072fe45ea17a
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 10:58:08 2023 +0100

    CAMEL-19062 - Clean up Parent POM - Jakarta XML WS API
    
    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 9be6711a3c4..4e91dab4fc9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2782,19 +2782,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <!-- Former dependencies from the deprecated JDK9+ profile -->
-            <dependency>
-                <groupId>jakarta.xml.ws</groupId>
-                <artifactId>jakarta.xml.ws-api</artifactId>
-                <version>${jakarta-xml-ws-api-version}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>javax.xml.bind</groupId>
-                        <artifactId>jaxb-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
             <dependency>
                 <groupId>jakarta.annotation</groupId>
                 <artifactId>jakarta.annotation-api</artifactId>


[camel] 03/05: CAMEL-19062 - Clean up Parent POM - Jakarta Annotations API

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 43ef4f7687ba86dd41f262be29526ea6894f71f9
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Wed Mar 8 11:28:46 2023 +0100

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

diff --git a/parent/pom.xml b/parent/pom.xml
index 4e91dab4fc9..3aa522d1334 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -2782,12 +2782,6 @@
                 <scope>import</scope>
             </dependency>
 
-            <dependency>
-                <groupId>jakarta.annotation</groupId>
-                <artifactId>jakarta.annotation-api</artifactId>
-                <version>${jakarta-annotation-api-version}</version>
-            </dependency>
-
             <dependency>
                 <groupId>jakarta.xml.bind</groupId>
                 <artifactId>jakarta.xml.bind-api</artifactId>