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

commit aedb4aaf65584db8649ad8a4c8865bb80094e835
Author: jbonofre <[email protected]>
AuthorDate: Fri Jan 15 16:17:58 2021 +0100

    [AMQ-8123] Add jaxb-core,istack,activation in lib for 
RuntimeConfigurationPlugin (with both JDK8 and 11+)
    
    (cherry picked from commit f64c9327d7097b2c4d53325d9731ceefa53ba480)
---
 assembly/pom.xml                             | 17 ++++++++++++++++-
 assembly/src/main/descriptors/common-bin.xml |  3 +++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index f0e1260..2ca5216 100644
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -468,7 +468,7 @@
       <artifactId>jackson-databind</artifactId>
     </dependency>
 
-    <!-- JAXB (for JDK11) -->
+    <!-- JAXB/Activation/iStack -->
     <dependency>
       <groupId>javax.xml.bind</groupId>
       <artifactId>jaxb-api</artifactId>
@@ -476,9 +476,24 @@
     </dependency>
     <dependency>
       <groupId>org.glassfish.jaxb</groupId>
+      <artifactId>jaxb-core</artifactId>
+      <version>2.2.11</version>
+    </dependency>
+    <dependency>
+      <groupId>org.glassfish.jaxb</groupId>
       <artifactId>jaxb-runtime</artifactId>
       <version>2.2.11</version>
     </dependency>
+    <dependency>
+      <groupId>com.sun.istack</groupId>
+      <artifactId>istack-commons-runtime</artifactId>
+      <version>3.0.11</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.activation</groupId>
+      <artifactId>javax.activation-api</artifactId>
+      <version>1.2.0</version>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/assembly/src/main/descriptors/common-bin.xml 
b/assembly/src/main/descriptors/common-bin.xml
index dca3780..d759634 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/assembly/src/main/descriptors/common-bin.xml
@@ -148,6 +148,9 @@
         <include>org.fusesource.hawtbuf:hawtbuf</include>
         <include>javax.xml.bind:jaxb-api</include>
         <include>org.glassfish.jaxb:jaxb-runtime</include>
+        <include>org.glassfish.jaxb:jaxb-core</include>
+        <include>com.sun.istack:istack-commons-runtime</include>
+        <include>javax.activation:javax.activation-api</include>
       </includes>
       <fileMode>0644</fileMode>
       <directoryMode>0755</directoryMode>

Reply via email to