From: PJ Fanning <fanningpj@apache.org>
Date: Fri, 22 Mar 2019 23:24:35 +0000 (+0000)
Subject: xmlbeans 3.1.0
X-Git-Tag: REL_4_1_0~20
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e2111d9d269adf5e0b8605b2438d06524a89cc35;p=poi.git

xmlbeans 3.1.0

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1856093 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/.classpath b/.classpath
index 77baa579b1..b5dae4cbff 100644
--- a/.classpath
+++ b/.classpath
@@ -18,7 +18,7 @@
 	<classpathentry kind="lib" path="lib/ant-1.10.1.jar"/>
 	<classpathentry kind="lib" path="lib/ant-launcher-1.10.1.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
-	<classpathentry exported="true" kind="lib" path="ooxml-lib/xmlbeans-3.0.3.jar" sourcepath="ooxml-lib/xmlbeans-3.0.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="ooxml-lib/xmlbeans-3.1.0.jar" sourcepath="ooxml-lib/xmlbeans-3.1.0.jar"/>
 	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.12.jar"/>
 	<classpathentry kind="lib" path="ooxml-lib/curvesapi-1.06.jar"/>
diff --git a/build.gradle b/build.gradle
index 774073f2b3..ba088366d5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -230,7 +230,7 @@ project('ooxml') {
     compileJava.dependsOn 'ant-compile-ooxml-xsds'
 
     dependencies {
-        compile 'org.apache.xmlbeans:xmlbeans:3.0.3'
+        compile 'org.apache.xmlbeans:xmlbeans:3.1.0'
         compile 'org.apache.commons:commons-collections4:4.3'
         compile 'org.apache.commons:commons-math3:3.6.1'
         compile 'org.apache.commons:commons-compress:1.18'
diff --git a/build.xml b/build.xml
index 1a8a529b7e..80bb6567ef 100644
--- a/build.xml
+++ b/build.xml
@@ -241,9 +241,9 @@ under the License.
     <property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.06.jar"/>
     <property name="ooxml.curvesapi.url"
               value="${repository.m2}/maven2/com/github/virtuald/curvesapi/1.06/curvesapi-1.06.jar"/>
-    <property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-3.0.3.jar"/>
+    <property name="ooxml.xmlbeans.jar" location="${ooxml.lib}/xmlbeans-3.1.0.jar"/>
     <property name="ooxml.xmlbeans.url"
-              value="https://repository.apache.org/content/repositories/staging/org/apache/xmlbeans/xmlbeans/3.0.3/xmlbeans-3.0.3.jar"/>
+              value="https://repository.apache.org/content/repositories/staging/org/apache/xmlbeans/xmlbeans/3.1.0/xmlbeans-3.1.0.jar"/>
     <property name="ooxml.commons-compress.jar" location="${main.lib}/commons-compress-1.18.jar"/>
     <property name="ooxml.commons-compress.url"
               value="${repository.m2}/maven2/org/apache/commons/commons-compress/1.18/commons-compress-1.18.jar"/>
@@ -707,9 +707,7 @@ under the License.
                 <include name="curvesapi-1.04.jar"/>
                 <include name="curvesapi-1.05.jar"/>
                 <include name="xmlbeans-2.*.jar"/>
-                <include name="xmlbeans-3.0.0.jar"/>
-                <include name="xmlbeans-3.0.1.jar"/>
-                <include name="xmlbeans-3.0.2.jar"/>
+                <include name="xmlbeans-3.0*.jar"/>
             </fileset>
             <fileset dir="${compile.lib}">
                 <include name="xercesImpl-*.jar"/>
diff --git a/maven/poi-ooxml-schemas.pom b/maven/poi-ooxml-schemas.pom
index 9ea63d9f1d..e0fc307a55 100644
--- a/maven/poi-ooxml-schemas.pom
+++ b/maven/poi-ooxml-schemas.pom
@@ -75,7 +75,7 @@
     <dependency>
       <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
-      <version>3.0.3</version>
+      <version>3.1.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index bbb615320f..160645d870 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -77,7 +77,7 @@
         <sonar.scm.disabled>true</sonar.scm.disabled>
 
         <!-- define some of the third-party or plugin-versions globally to use the same in all modules -->
-        <xmlbeans.version>3.0.3</xmlbeans.version>
+        <xmlbeans.version>3.1.0</xmlbeans.version>
         <junit.version>4.12</junit.version>
         <xmlunit.version>2.5.1</xmlunit.version>
         <mockito.version>2.13.0</mockito.version>