From de5654d5d5994ae4e8cc55df4180f584eb36f830 Mon Sep 17 00:00:00 2001
From: Wouter Born <github@maindrain.net>
Date: Thu, 24 Sep 2020 14:50:49 +0200
Subject: [PATCH] Exclude transitive JAXB 2.3 dependencies (#1670)

The add-ons still depend on JAXB 2.2 so it for instance caused the avmfritz itest to fail.

Signed-off-by: Wouter Born <github@maindrain.net>
---
 bom/compile/pom.xml | 16 ++++++++++++++++
 bom/test/pom.xml    |  4 ++++
 2 files changed, 20 insertions(+)

diff --git a/bom/compile/pom.xml b/bom/compile/pom.xml
index 7a1a6caf4..f2f8abaf1 100644
--- a/bom/compile/pom.xml
+++ b/bom/compile/pom.xml
@@ -230,6 +230,18 @@
       <version>${swagger.version}</version>
       <scope>compile</scope>
     </dependency>
+    <dependency>
+      <groupId>io.swagger.core.v3</groupId>
+      <artifactId>swagger-core</artifactId>
+      <version>${swagger.version}</version>
+      <scope>compile</scope>
+      <exclusions>
+        <exclusion>
+          <groupId>javax.xml.bind</groupId>
+          <artifactId>jaxb-api</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
     <dependency>
       <groupId>io.swagger.core.v3</groupId>
       <artifactId>swagger-jaxrs2</artifactId>
@@ -240,6 +252,10 @@
           <groupId>jakarta.activation</groupId>
           <artifactId>jakarta.activation-api</artifactId>
         </exclusion>
+        <exclusion>
+          <groupId>jakarta.xml.bind</groupId>
+          <artifactId>jakarta.xml.bind-api</artifactId>
+        </exclusion>
       </exclusions>
     </dependency>
 
diff --git a/bom/test/pom.xml b/bom/test/pom.xml
index a728b5273..44bb05dd7 100644
--- a/bom/test/pom.xml
+++ b/bom/test/pom.xml
@@ -61,6 +61,10 @@
       <artifactId>org.apache.aries.jax.rs.whiteboard</artifactId>
       <version>1.0.9</version>
       <exclusions>
+        <exclusion>
+          <groupId>jakarta.xml.bind</groupId>
+          <artifactId>jakarta.xml.bind-api</artifactId>
+        </exclusion>
         <exclusion>
           <groupId>org.apache.geronimo.specs</groupId>
           <artifactId>geronimo-annotation_1.3_spec</artifactId>