From 854762b603a2e66eb6bf556181726bbc10842ef8 Mon Sep 17 00:00:00 2001
From: evasques <eva.vasques@gmail.com>
Date: Thu, 12 Mar 2020 10:45:31 +0000
Subject: [PATCH] Exlude libraries that duplicate
 jakarta.xml.bind:jakarta.xml.bind-api (#881)

---
 pom.xml | 33 ++++++++++++++++++++++++++++++---
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9d60b9fe9b..30ef57a713 100644
--- a/pom.xml
+++ b/pom.xml
@@ -179,6 +179,11 @@
                     <groupId>javax.transaction</groupId>
                     <artifactId>jta</artifactId>
                 </exclusion>
+                <!-- Duplicates classes from jakarta.xml.bind:jakarta.xml.bind-api -->
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -190,6 +195,13 @@
             <groupId>org.alfresco</groupId>
             <artifactId>alfresco-heartbeat-data-sender</artifactId>
             <version>${dependency.alfresco-hb-data-sender.version}</version>
+            <exclusions>
+                <!-- Duplicates classes from jakarta.xml.bind:jakarta.xml.bind-api -->
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
@@ -347,9 +359,9 @@
             <version>3.6.3</version>
         </dependency>
         <dependency>
-            <groupId>javax.xml.bind</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
+            <groupId>jakarta.xml.bind</groupId>
+            <artifactId>jakarta.xml.bind-api</artifactId>
+            <version>2.3.2</version>
         </dependency>
         <dependency>
             <groupId>de.schlichtherle.truezip</groupId>
@@ -662,6 +674,11 @@
                     <groupId>javax.jws</groupId>
                     <artifactId>javax.jws-api</artifactId>
                 </exclusion>
+                <!-- Duplicates classes from jakarta.xml.bind:jakarta.xml.bind-api -->
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -690,6 +707,11 @@
                     <groupId>javax.jws</groupId>
                     <artifactId>javax.jws-api</artifactId>
                 </exclusion>
+                <!-- Duplicates classes from jakarta.xml.bind:jakarta.xml.bind-api -->
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
 
@@ -1058,6 +1080,11 @@
                     <groupId>javax.transaction</groupId>
                     <artifactId>jta</artifactId>
                 </exclusion>
+                <!-- Duplicates classes from jakarta.xml.bind:jakarta.xml.bind-api -->
+                <exclusion>
+                    <groupId>javax.xml.bind</groupId>
+                    <artifactId>jaxb-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>