You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by or...@apache.org on 2022/01/08 17:59:05 UTC
[camel] 11/12: CAMEL-17435: added the moved dependencies declarations to the modules that depend on them
This is an automated email from the ASF dual-hosted git repository.
orpiske pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8b06665856013a3b205c93f3b95dfa9acc86e85c
Author: Otavio Rodolfo Piske <op...@redhat.com>
AuthorDate: Thu Jan 6 16:39:53 2022 +0100
CAMEL-17435: added the moved dependencies declarations to the modules that depend on them
---
components/camel-dozer/pom.xml | 5 +++++
components/camel-grpc/pom.xml | 5 +++++
components/camel-jetty/pom.xml | 5 +++++
components/camel-jmx/pom.xml | 10 ++++++++++
components/camel-jta/pom.xml | 5 ++++-
.../camel-microprofile/camel-microprofile-metrics/pom.xml | 6 ++++++
components/camel-netty-http/pom.xml | 5 +++++
.../camel-salesforce/camel-salesforce-component/pom.xml | 4 ++++
components/camel-soap/pom.xml | 9 ++++++++-
components/camel-spring-redis/pom.xml | 5 +++++
components/camel-spring-ws/pom.xml | 14 ++++++++++++++
components/camel-spring-xml/pom.xml | 4 ++++
core/camel-api/pom.xml | 7 +++++++
core/camel-core/pom.xml | 7 +++++++
parent/pom.xml | 3 ++-
tooling/openapi-rest-dsl-generator/pom.xml | 5 +++++
tooling/swagger-rest-dsl-generator/pom.xml | 5 +++++
17 files changed, 101 insertions(+), 3 deletions(-)
diff --git a/components/camel-dozer/pom.xml b/components/camel-dozer/pom.xml
index ca87683..8781e93 100644
--- a/components/camel-dozer/pom.xml
+++ b/components/camel-dozer/pom.xml
@@ -79,6 +79,11 @@
<artifactId>camel-jackson</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/components/camel-grpc/pom.xml b/components/camel-grpc/pom.xml
index 8446d7d..c678152 100644
--- a/components/camel-grpc/pom.xml
+++ b/components/camel-grpc/pom.xml
@@ -132,6 +132,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- logging -->
<dependency>
diff --git a/components/camel-jetty/pom.xml b/components/camel-jetty/pom.xml
index 7ef48d3..6b1f33a 100644
--- a/components/camel-jetty/pom.xml
+++ b/components/camel-jetty/pom.xml
@@ -173,6 +173,11 @@
<artifactId>httpmime</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<dependency>
<groupId>org.awaitility</groupId>
diff --git a/components/camel-jmx/pom.xml b/components/camel-jmx/pom.xml
index c060581..5a4c0e2 100644
--- a/components/camel-jmx/pom.xml
+++ b/components/camel-jmx/pom.xml
@@ -48,6 +48,16 @@
<artifactId>camel-management</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+
<!-- test dependencies -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-jta/pom.xml b/components/camel-jta/pom.xml
index ba41f5a..f6514f0 100644
--- a/components/camel-jta/pom.xml
+++ b/components/camel-jta/pom.xml
@@ -48,6 +48,9 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-core-engine</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
</dependencies>
</project>
diff --git a/components/camel-microprofile/camel-microprofile-metrics/pom.xml b/components/camel-microprofile/camel-microprofile-metrics/pom.xml
index 67d3d46..2651045 100644
--- a/components/camel-microprofile/camel-microprofile-metrics/pom.xml
+++ b/components/camel-microprofile/camel-microprofile-metrics/pom.xml
@@ -47,6 +47,12 @@
<version>${microprofile-metrics-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <version>${javax-annotation-api-version}</version>
+ </dependency>
+
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
diff --git a/components/camel-netty-http/pom.xml b/components/camel-netty-http/pom.xml
index 755e4f7..6649d88 100644
--- a/components/camel-netty-http/pom.xml
+++ b/components/camel-netty-http/pom.xml
@@ -156,6 +156,11 @@
<artifactId>camel-jetty</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
<!-- logging -->
<dependency>
diff --git a/components/camel-salesforce/camel-salesforce-component/pom.xml b/components/camel-salesforce/camel-salesforce-component/pom.xml
index 555afba..69c2908 100644
--- a/components/camel-salesforce/camel-salesforce-component/pom.xml
+++ b/components/camel-salesforce/camel-salesforce-component/pom.xml
@@ -132,6 +132,10 @@
<artifactId>commons-lang3</artifactId>
<version>${commons-lang3-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
<!-- logging -->
<dependency>
diff --git a/components/camel-soap/pom.xml b/components/camel-soap/pom.xml
index e45b441..71868f0 100644
--- a/components/camel-soap/pom.xml
+++ b/components/camel-soap/pom.xml
@@ -54,7 +54,14 @@
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
diff --git a/components/camel-spring-redis/pom.xml b/components/camel-spring-redis/pom.xml
index 95dccb7..c860152 100644
--- a/components/camel-spring-redis/pom.xml
+++ b/components/camel-spring-redis/pom.xml
@@ -66,6 +66,11 @@
<artifactId>log4j-slf4j-impl</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
diff --git a/components/camel-spring-ws/pom.xml b/components/camel-spring-ws/pom.xml
index 2fbb256..6207998 100644
--- a/components/camel-spring-ws/pom.xml
+++ b/components/camel-spring-ws/pom.xml
@@ -87,6 +87,14 @@
<artifactId>spring-ws-support</artifactId>
<version>${spring-ws-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
<!-- test dependencies -->
<dependency>
@@ -186,6 +194,12 @@
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.messaging.saaj</groupId>
+ <artifactId>saaj-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- needed by jetty http server to load class: org.jvnet.staxex.util.XMLStreamReaderToXMLStreamWriter -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
diff --git a/components/camel-spring-xml/pom.xml b/components/camel-spring-xml/pom.xml
index dc89076..2771ad6 100644
--- a/components/camel-spring-xml/pom.xml
+++ b/components/camel-spring-xml/pom.xml
@@ -137,6 +137,10 @@
<artifactId>derby</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
<!-- logging for testing -->
<dependency>
diff --git a/core/camel-api/pom.xml b/core/camel-api/pom.xml
index 8f845ab..46af749 100644
--- a/core/camel-api/pom.xml
+++ b/core/camel-api/pom.xml
@@ -54,6 +54,13 @@
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ <version>${jakarta-jaxb-version}</version>
+ <scope>compile</scope>
+ </dependency>
+
</dependencies>
<build>
diff --git a/core/camel-core/pom.xml b/core/camel-core/pom.xml
index bedec0d..f2b0060 100644
--- a/core/camel-core/pom.xml
+++ b/core/camel-core/pom.xml
@@ -211,6 +211,13 @@
<scope>test</scope>
</dependency>
+ <!-- Used for the exception tests -->
+ <dependency>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>javax.xml.soap-api</artifactId>
+ <scope>test</scope>
+ </dependency>
+
<!-- validator testing -->
<dependency>
<groupId>xml-resolver</groupId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 153fc0b..08f0070 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -290,6 +290,7 @@
<jakarta.el-version>3.0.3</jakarta.el-version>
<jakarta-jaxb-version>2.3.3</jakarta-jaxb-version>
<javax-soap-api-version>1.4.0</javax-soap-api-version>
+ <jaxws-api-version>2.3.0</jaxws-api-version>
<glassfish-javax-json>1.0.4</glassfish-javax-json>
<glassfish-jaxb-runtime-version>2.3.3</glassfish-jaxb-runtime-version>
<jaxb2-maven-plugin-version>2.5.0</jaxb2-maven-plugin-version>
@@ -4042,7 +4043,7 @@
<dependency>
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
- <version>2.3.0</version>
+ <version>${jaxws-api-version}</version>
<exclusions>
<exclusion>
<groupId>javax.xml.bind</groupId>
diff --git a/tooling/openapi-rest-dsl-generator/pom.xml b/tooling/openapi-rest-dsl-generator/pom.xml
index 9200396..860e966 100644
--- a/tooling/openapi-rest-dsl-generator/pom.xml
+++ b/tooling/openapi-rest-dsl-generator/pom.xml
@@ -74,6 +74,11 @@
<version>${jackson2-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+
<!-- test -->
<dependency>
<groupId>org.junit.jupiter</groupId>
diff --git a/tooling/swagger-rest-dsl-generator/pom.xml b/tooling/swagger-rest-dsl-generator/pom.xml
index db61c91..dd706fb 100644
--- a/tooling/swagger-rest-dsl-generator/pom.xml
+++ b/tooling/swagger-rest-dsl-generator/pom.xml
@@ -54,6 +54,11 @@
<version>${swagger-java-parser-version}</version>
</dependency>
+ <dependency>
+ <groupId>javax.annotation</groupId>
+ <artifactId>javax.annotation-api</artifactId>
+ </dependency>
+
<!-- test -->
<dependency>
<groupId>org.junit.jupiter</groupId>