activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject [activemq] branch master updated: [AMQ-8032] Add JAXB in lib by default to avoid issue with JDK11
Date Sat, 09 Jan 2021 06:19:34 GMT
This is an automated email from the ASF dual-hosted git repository.

jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git


The following commit(s) were added to refs/heads/master by this push:
     new 9b6a48a  [AMQ-8032] Add JAXB in lib by default to avoid issue with JDK11
     new 6e0e654  Merge pull request #601 from jbonofre/AMQ-8032
9b6a48a is described below

commit 9b6a48ad31b2fb4b3a5a129d4ed6119024c6850a
Author: jbonofre <jbonofre@apache.org>
AuthorDate: Wed Jan 6 09:22:43 2021 +0100

    [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 e4f23d9..849351b 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>


Mime
View raw message