This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch activemq-5.16.x
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/activemq-5.16.x by this push:
new a64f399 [AMQ-8032] Add JAXB in lib by default to avoid issue with
JDK11
a64f399 is described below
commit a64f399d5416ca221ecd8d81f8e15461b471082c
Author: jbonofre <[email protected]>
AuthorDate: Wed Jan 6 09:22:43 2021 +0100
[AMQ-8032] Add JAXB in lib by default to avoid issue with JDK11
(cherry picked from commit 9b6a48ad31b2fb4b3a5a129d4ed6119024c6850a)
---
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 f3c681d..b6ca761 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 17ac1f9..dca3780 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>
