From 9b6a48ad31b2fb4b3a5a129d4ed6119024c6850a Mon Sep 17 00:00:00 2001
From: jbonofre <jbonofre@apache.org>
Date: Wed, 6 Jan 2021 09:22:43 +0100
Subject: [PATCH] [AMQ-8032] Add JAXB in lib by default to avoid issue with
 JDK11

---
 assembly/pom.xml                             | 12 ++++++++++++
 assembly/src/main/descriptors/common-bin.xml |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index e4f23d9cc8..849351b9cf 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -467,6 +467,18 @@
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-databind</artifactId>
     </dependency>
+
+    <!-- JAXB (for JDK11) -->
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+      <version>2.2.11</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-runtime</artifactId>
+      <version>2.2.11</version>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 17ac1f923f..dca37805bb 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -146,6 +146,8 @@
         <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
         <include>${pom.groupId}:activemq-web</include>
         <include>org.fusesource.hawtbuf:hawtbuf</include>
+        <include>javax.xml.bind:jaxb-api</include>
+        <include>org.glassfish.jaxb:jaxb-runtime</include>
       </includes>
       <fileMode>0644</fileMode>
       <directoryMode>0755</directoryMode>