From 66d522873f9dd8ef4d9f3b5d30b0abb5dc5e603c Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Tue, 23 Apr 2019 20:28:00 +0000
Subject: [PATCH] Update JAXB to the latest version

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1858023 13f79535-47bb-0310-9956-ffa450edef68
---
 build.gradle       |  4 ++--
 build.xml          | 10 ++++++----
 sonar/main/pom.xml |  4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/build.gradle b/build.gradle
index 454b8a4bee..346d0774c8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -182,8 +182,8 @@ project('main') {
         compile 'commons-logging:commons-logging:1.2'
         compile 'org.apache.commons:commons-collections4:4.3'
         compile 'org.apache.commons:commons-math3:3.6.1'
-        compile 'javax.xml.bind:jaxb-api:2.3.0'
-        compile 'com.sun.xml.bind:jaxb-impl:2.3.0.1'
+        compile 'javax.xml.bind:jaxb-api:2.3.1'
+        compile 'com.sun.xml.bind:jaxb-impl:2.3.2'
         compile 'com.sun.xml.bind:jaxb-core:2.3.0.1'
         compile 'javax.activation:activation:1.1.1'
 
diff --git a/build.xml b/build.xml
index 8b0732c7a7..304660ee99 100644
--- a/build.xml
+++ b/build.xml
@@ -206,12 +206,12 @@ under the License.
     <property name="main.commons-math3.jar" location="${main.lib}/commons-math3-3.6.1.jar"/>
     <property name="main.commons-math3.url"
               value="${repository.m2}/maven2/org/apache/commons/commons-math3/3.6.1/commons-math3-3.6.1.jar"/>
-    <property name="main.xmlbind.jar" location="${main.lib}/jaxb-api-2.3.0.jar"/>
+    <property name="main.xmlbind.jar" location="${main.lib}/jaxb-api-2.3.1.jar"/>
     <property name="main.xmlbind.url"
-              value="${repository.m2}/maven2/javax/xml/bind/jaxb-api/2.3.0/jaxb-api-2.3.0.jar"/>
-    <property name="main.xmlbind-impl.jar" location="${main.lib}/jaxb-impl-2.3.0.1.jar"/>
+              value="${repository.m2}/maven2/javax/xml/bind/jaxb-api/2.3.1/jaxb-api-2.3.1.jar"/>
+    <property name="main.xmlbind-impl.jar" location="${main.lib}/jaxb-impl-2.3.2.jar"/>
     <property name="main.xmlbind-impl.url"
-              value="${repository.m2}/maven2/com/sun/xml/bind/jaxb-impl/2.3.0.1/jaxb-impl-2.3.0.1.jar"/>
+              value="${repository.m2}/maven2/com/sun/xml/bind/jaxb-impl/2.3.2/jaxb-impl-2.3.2.jar"/>
     <property name="main.xmlbind-core.jar" location="${main.lib}/jaxb-core-2.3.0.1.jar"/>
     <property name="main.xmlbind-core.url"
               value="${repository.m2}/maven2/com/sun/xml/bind/jaxb-core/2.3.0.1/jaxb-core-2.3.0.1.jar"/>
@@ -681,6 +681,8 @@ under the License.
                 <include name="mockito-core-2.21.0.jar"/>
                 <include name="byte-buddy-1.7.9.jar"/>
                 <include name="byte-buddy-agent-1.7.9.jar"/>
+                <include name="lib/jaxb-api-2.3.0.jar"/>
+                <include name="lib/jaxb-impl-2.3.0.1.jar"/>
             </fileset>
             <fileset dir="${ooxml.lib}">
                 <!-- remove jars from previous versions, but not the current version -->
diff --git a/sonar/main/pom.xml b/sonar/main/pom.xml
index 942088d18d..9fd676da09 100644
--- a/sonar/main/pom.xml
+++ b/sonar/main/pom.xml
@@ -133,12 +133,12 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.3.0</version>
+            <version>2.3.1</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.3.0.1</version>
+            <version>2.3.2</version>
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
-- 
2.39.5