From aaf0e2f7f93fa00255d50049b79035cfa36c510a Mon Sep 17 00:00:00 2001
From: PJ Fanning <fanningpj@apache.org>
Date: Sun, 14 Mar 2021 19:47:22 +0000
Subject: [PATCH] xmlbeans 5.0.0 release

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1887648 13f79535-47bb-0310-9956-ffa450edef68
---
 .classpath                                    |   8 ++++----
 build.gradle                                  |   3 +--
 build.xml                                     |   3 +--
 maven/poi-ooxml-full.pom                      |   2 +-
 maven/poi-ooxml-lite.pom                      |   2 +-
 sonar/pom.xml                                 |   2 +-
 .../ooxml-lite/java9/module-info.class        | Bin 1663 -> 1663 bytes
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/.classpath b/.classpath
index 916216ba2b..ec5f3187ab 100644
--- a/.classpath
+++ b/.classpath
@@ -17,7 +17,7 @@
 	<classpathentry kind="src" path="src/integrationtest"/>
 	<classpathentry kind="lib" path="lib/ant-1.10.1.jar"/>
 	<classpathentry kind="lib" path="lib/ant-launcher-1.10.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ooxml/xmlbeans-4.0.0.jar" sourcepath="lib/ooxml/xmlbeans-4.0.0-sources.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ooxml/xmlbeans-5.0.0.jar" sourcepath="lib/ooxml/xmlbeans-5.0.0-sources.jar"/>
 	<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="lib/junit-4.13.1.jar"/>
 	<classpathentry kind="lib" path="lib/ooxml/curvesapi-1.06.jar"/>
@@ -26,13 +26,13 @@
 	<classpathentry kind="lib" path="lib/main-tests/jmh-generator-annprocess-1.26.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry exported="true" kind="lib" path="compile-lib/log4j-api-2.14.0.jar"/>
-	<classpathentry kind="lib" path="lib/ooxml-provided/bcpkix-jdk15on-1.67.jar"/>
-	<classpathentry kind="lib" path="lib/ooxml-provided/bcprov-jdk15on-1.67.jar"/>
+	<classpathentry kind="lib" path="lib/ooxml-provided/bcpkix-jdk15on-1.68.jar"/>
+	<classpathentry kind="lib" path="lib/ooxml-provided/bcprov-jdk15on-1.68.jar"/>
 	<classpathentry kind="lib" path="lib/ooxml-tests/reflections-0.9.12.jar"/>
 	<classpathentry kind="lib" path="lib/ooxml-tests/guava-30.0-jre.jar"/>
 	<classpathentry kind="lib" path="lib/ooxml-tests/javassist-3.27.0-GA.jar"/>
 	<classpathentry kind="lib" path="lib/ooxml-tests/log4j-1.2.17.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/ooxml-provided/xmlsec-2.2.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="lib/ooxml-provided/xmlsec-2.2.1.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-codec-1.15.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/commons-collections4-4.4.jar"/>
 	<classpathentry kind="lib" path="lib/commons-math3-3.6.1.jar"/>
diff --git a/build.gradle b/build.gradle
index 845d107044..6363e71ff5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -298,8 +298,7 @@ project('ooxml') {
     compileJava.dependsOn 'downloadJarsToLibs'
 
     dependencies {
-        //compile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
-        compile files("../../lib/ooxml/xmlbeans-${xmlbeansVersion}.jar")
+        compile "org.apache.xmlbeans:xmlbeans:${xmlbeansVersion}"
         compile 'org.apache.commons:commons-collections4:4.4'
         compile "org.apache.commons:commons-math3:${commonsMathVersion}"
         compile "org.apache.commons:commons-compress:${commonsCompressVersion}"
diff --git a/build.xml b/build.xml
index 7e6ddf7af9..c9f9d53b30 100644
--- a/build.xml
+++ b/build.xml
@@ -327,8 +327,7 @@ under the License.
 
     <!-- jars in the ooxml-lib directory, see the fetch-ooxml-jars target-->
     <dependency prefix="ooxml.curvesapi" artifact="com.github.virtuald:curvesapi:1.06" usage="ooxml"/>
-    <dependency prefix="ooxml.xmlbeans" artifact="org.apache.xmlbeans:xmlbeans:5.0.0" usage="ooxml"
-                url="https://ci-builds.apache.org/job/POI/job/POI-XMLBeans-DSL-1.8/lastSuccessfulBuild/artifact/build/xmlbeans-5.0.0.jar"/>
+    <dependency prefix="ooxml.xmlbeans" artifact="org.apache.xmlbeans:xmlbeans:5.0.0" usage="ooxml"/>
     <dependency prefix="ooxml.commons-compress" artifact="org.apache.commons:commons-compress:1.20" usage="ooxml"/>
 
     <!-- jars in the ooxml-test-lib directory, see the fetch-ooxml-jars target-->
diff --git a/maven/poi-ooxml-full.pom b/maven/poi-ooxml-full.pom
index 76d38e799e..3696f23e7b 100644
--- a/maven/poi-ooxml-full.pom
+++ b/maven/poi-ooxml-full.pom
@@ -64,7 +64,7 @@
     <dependency>
       <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
-      <version>4.0.0</version>
+      <version>5.0.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/maven/poi-ooxml-lite.pom b/maven/poi-ooxml-lite.pom
index 5b0ffdc071..9ad3a4b9a2 100644
--- a/maven/poi-ooxml-lite.pom
+++ b/maven/poi-ooxml-lite.pom
@@ -70,7 +70,7 @@
     <dependency>
       <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
-      <version>4.0.0</version>
+      <version>5.0.0</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 8dfbf0df4b..898997314a 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -79,7 +79,7 @@
         <sonar.coverage.jacoco.xmlReportPaths>target/site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
 
         <!-- define some of the third-party or plugin-versions globally to use the same in all modules -->
-        <xmlbeans.version>4.0.0</xmlbeans.version>
+        <xmlbeans.version>5.0.0</xmlbeans.version>
         <junit.version>5.7.0</junit.version>
         <xmlunit.version>2.8.2</xmlunit.version>
         <mockito.version>3.6.28</mockito.version>
diff --git a/src/multimodule/ooxml-lite/java9/module-info.class b/src/multimodule/ooxml-lite/java9/module-info.class
index 5a1a8d9258b44306f29dce9dcd0d8a7b34bbf118..2a720c718dbce28980eac8ad74ea97e6d1dfe7c0 100644
GIT binary patch
literal 1663
zcmb7^+invv5QcwK=z(&Mp)C~Xfm4CTIkbhgv_h!2NJt>=-CZX!WY??pCQa}9ScnTA
zfQLfNPSU7U>5Amy^Ex~Kcs%>tzyJLF1z;2VQ&<w1{OH0?+mx_e!b%CNB|MRMD)CI>
zxx@>JHHnuJuOwbetV@(7lte|MDp8ZDOKeDNN^D8Ik$5YyEwLl9EAdWZPhd9U{OdMu
zIDti%Hp@EELCcgAXUop@qITKSG}2yR=9}*7@}c%dpmZjbf)0(2DPo!<XfCiCxJX4d
zNS$|$ObwDK`Zv*;J+y6`9Sf|Cj&hBL4U96qz+9Ya5Y!(8)(ca0t+!6~YL#kDMcT#!
zYlZO?S=mydZF<`jSQs7K%{RJ6olyOzDQenqr`$Z{k9}q$#S?+$3t}lznCc@N(^_+R
zjLE!Joz$vcrMg|It8TR}P|4r8#KhF#hD#%z`Qd5<dDPDLNR<aIon``R3`xH&wJ{Wl
z4YE#3ZrB?`<df9s(6@}q4o>&{ehmGQOT#2}f$^UD^<OFa7CCT1Co*w%+M$lmT=XfW
zhNhV{<lg;)Dn_OVU6AYj*DuFOp5Vi{2~00DacIJ`Rcwr#gnZB{{sbe7PfeQ+qKkdY
zCRF?GxXXHSm<b0vFDjb8x2LxAVncuS%~mg1^o&o=skRDK|GMLxaHl}nqigTGZkmBR
z=;Yf>w?Ervtot6H&&5Y|eqW(;xvl6JhIBog0D`XU{!ic%J^a7~mS~*7<r5lkg=drb
zBNi~l<1}-Id6hZKyvDrFyurN5yv4lDyu&OpCG#%x9&?U4&s<>MXFgyqG9NM@F&{G-
Fe*tug_i_LL

delta 620
zcmX|;OHUJF6o%h3ms02yu`>lqZHrt)F0BX@luJY0lely{)Tuy#8c?EfflIg3Z{u$u
zF>z^J_ygR!WkJ|O_yyvbw}#DgzURE>oJ=ye-mN$F`|r<R0P1M;z!GE*+OOa5N7dcK
zR$GwTqWN&+PnC5aJ%Zl7@Fc8lhsTkRUV+~}dQ%JEhRvO*_TgZEI|>hvePje_&S@(^
zRxlpl48|8(JHWm8YBCkzK6@pv-D>SNqX5338sC)6D;dx<FPKj3i+E~7f`aa+PLg8<
z^IhijPSKppgw|5W8qt}GVBWm6X4B1`@aSEDhi1!K(0JUOT6N7Q1sh3jF0GvElwgxO
zX6IF>yIM45CvW!b<P&BE4V~z=zS;fSstR7*wXW@)o`2GDRy29qz5ajS$!cp+uy!|m
z=45oZ-f_z2k5kZeMX<=U&mC5ME?A~+x<%DB!7BBmThYA@^VOX>we>IkfP+!3Hd3Fp
zAWiE_o+!X$?I#Dw92t;<<S;oxJ|N5FC^<$>kdMg6<P6Zz#~h_b&XWt|61hx1BUj0F
GlK2Ovmt;Bs

-- 
2.39.5