This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
The following commit(s) were added to refs/heads/master by this push:
new af1b12d Fix JAXB dependency alignment issues
af1b12d is described below
commit af1b12df064aa0dc9432553d7b9e4fe6fb7635b1
Author: James Netherton <[email protected]>
AuthorDate: Wed Aug 26 09:23:55 2020 +0100
Fix JAXB dependency alignment issues
Fixes #1601
---
extensions-core/xml-jaxb/runtime/pom.xml | 6 ++++++
extensions-jvm/bonita/runtime/pom.xml | 10 ++++++++++
extensions-support/jackson-dataformat-xml/deployment/pom.xml | 4 ++++
extensions-support/jackson-dataformat-xml/runtime/pom.xml | 10 ++++++++++
extensions/openapi-java/deployment/pom.xml | 4 ++++
extensions/openapi-java/runtime/pom.xml | 4 ++++
extensions/servicenow/runtime/pom.xml | 10 ++++++++++
7 files changed, 48 insertions(+)
diff --git a/extensions-core/xml-jaxb/runtime/pom.xml
b/extensions-core/xml-jaxb/runtime/pom.xml
index 2edb5ff..d8b9794 100644
--- a/extensions-core/xml-jaxb/runtime/pom.xml
+++ b/extensions-core/xml-jaxb/runtime/pom.xml
@@ -50,6 +50,12 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-xml-jaxb</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
diff --git a/extensions-jvm/bonita/runtime/pom.xml
b/extensions-jvm/bonita/runtime/pom.xml
index 569fca4..cb1a0b2 100644
--- a/extensions-jvm/bonita/runtime/pom.xml
+++ b/extensions-jvm/bonita/runtime/pom.xml
@@ -56,6 +56,16 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-bonita</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.3_spec</artifactId>
</dependency>
</dependencies>
diff --git a/extensions-support/jackson-dataformat-xml/deployment/pom.xml
b/extensions-support/jackson-dataformat-xml/deployment/pom.xml
index 0a1d02e..5599795 100644
--- a/extensions-support/jackson-dataformat-xml/deployment/pom.xml
+++ b/extensions-support/jackson-dataformat-xml/deployment/pom.xml
@@ -34,6 +34,10 @@
<artifactId>quarkus-jackson-deployment</artifactId>
</dependency>
<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-jaxb-deployment</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-support-jackson-dataformat-xml</artifactId>
</dependency>
diff --git a/extensions-support/jackson-dataformat-xml/runtime/pom.xml
b/extensions-support/jackson-dataformat-xml/runtime/pom.xml
index d4e9def..c068bf1 100644
--- a/extensions-support/jackson-dataformat-xml/runtime/pom.xml
+++ b/extensions-support/jackson-dataformat-xml/runtime/pom.xml
@@ -46,8 +46,18 @@
<artifactId>quarkus-jackson</artifactId>
</dependency>
<dependency>
+ <groupId>io.quarkus</groupId>
+ <artifactId>quarkus-jaxb</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-xml</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/extensions/openapi-java/deployment/pom.xml
b/extensions/openapi-java/deployment/pom.xml
index ad5d8a1..6c13989 100644
--- a/extensions/openapi-java/deployment/pom.xml
+++ b/extensions/openapi-java/deployment/pom.xml
@@ -44,6 +44,10 @@
</dependency>
<dependency>
<groupId>org.apache.camel.quarkus</groupId>
+
<artifactId>camel-quarkus-support-jackson-dataformat-xml-deployment</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
<artifactId>camel-quarkus-openapi-java</artifactId>
</dependency>
</dependencies>
diff --git a/extensions/openapi-java/runtime/pom.xml
b/extensions/openapi-java/runtime/pom.xml
index e2a60fc..f66b65b 100644
--- a/extensions/openapi-java/runtime/pom.xml
+++ b/extensions/openapi-java/runtime/pom.xml
@@ -60,6 +60,10 @@
<artifactId>camel-quarkus-support-xalan</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.camel.quarkus</groupId>
+
<artifactId>camel-quarkus-support-jackson-dataformat-xml</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-openapi-java</artifactId>
</dependency>
diff --git a/extensions/servicenow/runtime/pom.xml
b/extensions/servicenow/runtime/pom.xml
index ea7a2aa..ab25b32 100644
--- a/extensions/servicenow/runtime/pom.xml
+++ b/extensions/servicenow/runtime/pom.xml
@@ -58,6 +58,16 @@
<dependency>
<groupId>org.apache.camel</groupId>
<artifactId>camel-servicenow</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.spec.javax.xml.bind</groupId>
+ <artifactId>jboss-jaxb-api_2.3_spec</artifactId>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
