From e704fbace697488062b6295b79bfaae0633f7e12 Mon Sep 17 00:00:00 2001
From: Sean Flanigan <sflaniga@redhat.com>
Date: Thu, 23 Aug 2018 10:19:18 +1000
Subject: [PATCH] fix(ZNTA-2633): include JAXB jars (#1030)

---
 client/zanata-cli/pom.xml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/client/zanata-cli/pom.xml b/client/zanata-cli/pom.xml
index d5d1637eab9..d22e6538274 100644
--- a/client/zanata-cli/pom.xml
+++ b/client/zanata-cli/pom.xml
@@ -56,6 +56,34 @@
   </build>
 
   <dependencies>
+    <!-- Java 8 comes with JAXB Version 2.2.8.
+    To work with Java 8,9,11+ we include JAXB ourselves.
+    See https://stackoverflow.com/a/43574427/14379 -->
+    <dependency>
+      <groupId>javax.xml.bind</groupId>
+      <artifactId>jaxb-api</artifactId>
+    </dependency>
+
+    <dependency>
+    <groupId>org.glassfish.jaxb</groupId>
+    <artifactId>jaxb-runtime</artifactId>
+    <version>2.2.11</version>
+    </dependency>
+
+    <!-- Replace the above JAXB dependencies when 2.4.0 is released: -->
+
+    <!-- https://stackoverflow.com/a/50251510/14379 -->
+    <!--<dependency>-->
+      <!--<groupId>javax.xml.bind</groupId>-->
+      <!--<artifactId>jaxb-api</artifactId>-->
+      <!--<version>2.4.0</version>-->
+    <!--</dependency>-->
+    <!--<dependency>-->
+      <!--<groupId>org.glassfish.jaxb</groupId>-->
+      <!--<artifactId>jaxb-runtime</artifactId>-->
+      <!--<version>2.4.0</version>-->
+    <!--</dependency>-->
+
     <dependency>
       <groupId>args4j</groupId>
       <artifactId>args4j</artifactId>
@@ -166,6 +194,8 @@
             </executions>
             <configuration>
               <licenseHeaderFile>${basedir}/COPYING-header.txt</licenseHeaderFile>
+              <!-- Remove this when jaxb 2.4.0 is out. See https://stackoverflow.com/a/50251510/14379 -->
+              <extraJvmArguments>-Dcom.sun.xml.bind.v2.bytecode.ClassTailor.noOptimize</extraJvmArguments>
               <programs>
                 <program>
                   <mainClass>org.zanata.client.ZanataClient</mainClass>