From 93fa541ad1acc25d0212716fc649d76ec9caae7e Mon Sep 17 00:00:00 2001
From: "pj.fanning" <pj.fanning@workday.com>
Date: Fri, 5 Jan 2018 16:19:24 +0000
Subject: [PATCH 1/6] use xmlbeans fork v2.6.3

---
 .classpath                            | 2 +-
 build.gradle                          | 2 +-
 build.xml                             | 6 +++---
 maven/ooxml-schemas.pom               | 2 +-
 maven/ooxml-security.pom              | 2 +-
 maven/poi-ooxml-schemas.pom           | 4 ++--
 sonar/ooxml-schema-encryption/pom.xml | 2 +-
 sonar/ooxml-schema-security/pom.xml   | 2 +-
 sonar/ooxml-schema/pom.xml            | 2 +-
 sonar/ooxml/pom.xml                   | 2 +-
 sonar/pom.xml                         | 4 ++--
 11 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/.classpath b/.classpath
index 54aafe080ff..abcbb78197f 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-2.6.0.jar" sourcepath="ooxml-lib/xmlbeans-2.6.0.jar"/>
+	<classpathentry exported="true" kind="lib" path="ooxml-lib/xmlbeans-2.6.3.jar" sourcepath="ooxml-lib/xmlbeans-2.6.3.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.05.jar"/>
diff --git a/build.gradle b/build.gradle
index 0af981841ef..7b2190f1139 100644
--- a/build.gradle
+++ b/build.gradle
@@ -195,7 +195,7 @@ project('ooxml') {
 	compileJava.dependsOn 'ant-compile-ooxml-xsds'
 	
 	dependencies {
-		compile 'org.apache.xmlbeans:xmlbeans:2.6.0'
+		compile 'com.github.pjfanning:xmlbeans:2.6.3'
 		compile 'org.apache.commons:commons-collections4:4.1'
 		compile 'org.apache.commons:commons-math3:3.6.1'
 		compile 'org.apache.santuario:xmlsec:2.1.0'
diff --git a/build.xml b/build.xml
index 4e1ffa15d90..47afd9d31b0 100644
--- a/build.xml
+++ b/build.xml
@@ -192,9 +192,9 @@ under the License.
     <property name="ooxml.xmlbeans23.jar" location="${ooxml.lib}/xmlbeans-2.3.0.jar"/>
     <property name="ooxml.xmlbeans23.url"
               value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.3.0/xmlbeans-2.3.0.jar"/>
-    <property name="ooxml.xmlbeans26.jar" location="${ooxml.lib}/xmlbeans-2.6.0.jar"/>
+    <property name="ooxml.xmlbeans26.jar" location="${ooxml.lib}/xmlbeans-2.6.3.jar"/>
     <property name="ooxml.xmlbeans26.url"
-              value="${repository.m2}/maven2/org/apache/xmlbeans/xmlbeans/2.6.0/xmlbeans-2.6.0.jar"/>
+              value="${repository.m2}/maven2/com/github/pjfanning/xmlbeans/2.6.3/xmlbeans-2.6.3.jar"/>
 
     <!-- coverage libs -->
     <property name="jacoco.zip" location="${main.lib}/jacoco-0.7.9.zip"/>
@@ -1912,7 +1912,7 @@ under the License.
                 <globmapper from="*" to="${zipdir}/lib/*"/>
             </mappedresources>
             <mappedresources cache="true">
-                <fileset dir="${ooxml.lib}" includes="xmlbeans-2.6.0.jar.orig,curvesapi-*.jar"/>
+                <fileset dir="${ooxml.lib}" includes="xmlbeans-2.6.*.jar.orig,curvesapi-*.jar"/>
                 <regexpmapper from="^(.*\.jar)(\.orig)?$$" to="${zipdir}/ooxml-lib/\1"/>
             </mappedresources>
             <mappedresources cache="true">
diff --git a/maven/ooxml-schemas.pom b/maven/ooxml-schemas.pom
index da49544ae12..426ae77b1dc 100644
--- a/maven/ooxml-schemas.pom
+++ b/maven/ooxml-schemas.pom
@@ -62,7 +62,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.xmlbeans</groupId>
+      <groupId>com.github.pjfanning</groupId>
       <artifactId>xmlbeans</artifactId>
       <version>2.3.0</version>
     </dependency>
diff --git a/maven/ooxml-security.pom b/maven/ooxml-security.pom
index de9112e211c..35f27848bb9 100644
--- a/maven/ooxml-security.pom
+++ b/maven/ooxml-security.pom
@@ -71,7 +71,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.xmlbeans</groupId>
+      <groupId>com.github.pjfanning</groupId>
       <artifactId>xmlbeans</artifactId>
       <version>2.3.0</version>
     </dependency>
diff --git a/maven/poi-ooxml-schemas.pom b/maven/poi-ooxml-schemas.pom
index baf531d542c..052b8a92b33 100644
--- a/maven/poi-ooxml-schemas.pom
+++ b/maven/poi-ooxml-schemas.pom
@@ -60,9 +60,9 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.xmlbeans</groupId>
+      <groupId>com.github.pjfanning</groupId>
       <artifactId>xmlbeans</artifactId>
-      <version>2.6.0</version>
+      <version>2.6.3</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/sonar/ooxml-schema-encryption/pom.xml b/sonar/ooxml-schema-encryption/pom.xml
index 12131fa9394..bc331a8e23d 100644
--- a/sonar/ooxml-schema-encryption/pom.xml
+++ b/sonar/ooxml-schema-encryption/pom.xml
@@ -47,7 +47,7 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>org.apache.xmlbeans</groupId>
+			<groupId>com.github.pjfanning</groupId>
 			<artifactId>xmlbeans</artifactId>
 			<version>${xmlbeans.version}</version>
 		</dependency>
diff --git a/sonar/ooxml-schema-security/pom.xml b/sonar/ooxml-schema-security/pom.xml
index 8ee9e4c01c6..1c505a25d90 100644
--- a/sonar/ooxml-schema-security/pom.xml
+++ b/sonar/ooxml-schema-security/pom.xml
@@ -126,7 +126,7 @@
 
     <dependencies>
 		<dependency>
-			<groupId>org.apache.xmlbeans</groupId>
+			<groupId>com.github.pjfanning</groupId>
 			<artifactId>xmlbeans</artifactId>
 			<version>${xmlbeans.version}</version>
 		</dependency>    	
diff --git a/sonar/ooxml-schema/pom.xml b/sonar/ooxml-schema/pom.xml
index 881d9823d88..00eabac28f7 100644
--- a/sonar/ooxml-schema/pom.xml
+++ b/sonar/ooxml-schema/pom.xml
@@ -81,7 +81,7 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
-          <groupId>org.apache.xmlbeans</groupId>
+          <groupId>com.github.pjfanning</groupId>
           <artifactId>xmlbeans</artifactId>
           <version>${xmlbeans.version}</version>
         </dependency>
diff --git a/sonar/ooxml/pom.xml b/sonar/ooxml/pom.xml
index 65745528a2a..c63ce41caeb 100644
--- a/sonar/ooxml/pom.xml
+++ b/sonar/ooxml/pom.xml
@@ -129,7 +129,7 @@
 		</dependency>
 
 		<dependency>
-		  <groupId>org.apache.xmlbeans</groupId>
+		  <groupId>com.github.pjfanning</groupId>
 		  <artifactId>xmlbeans</artifactId>
 		  <version>${xmlbeans.version}</version>
 		</dependency>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index f28962f69f1..e43721bfda7 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -63,7 +63,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>2.6.0</xmlbeans.version>
+		<xmlbeans.version>2.6.3</xmlbeans.version>
 		<junit.version>4.12</junit.version>
 		<maven.plugin.resources.version>3.0.1</maven.plugin.resources.version>
 		<maven.plugin.jar.version>3.0.1</maven.plugin.jar.version>
@@ -269,7 +269,7 @@
 			</build>
       <dependencies>
         <dependency>
-          <groupId>org.apache.xmlbeans</groupId>
+          <groupId>com.github.pjfanning</groupId>
           <artifactId>xmlbeans</artifactId>
           <version>${xmlbeans.version}</version>
         </dependency>

From 8c57f6dcec5b366171caf589d5fe140d45fe97eb Mon Sep 17 00:00:00 2001
From: "pj.fanning" <pj.fanning@workday.com>
Date: Fri, 5 Jan 2018 16:21:04 +0000
Subject: [PATCH 2/6] reset groupId for poms that use xmlbeans 2.3.0

---
 maven/ooxml-schemas.pom  | 2 +-
 maven/ooxml-security.pom | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/maven/ooxml-schemas.pom b/maven/ooxml-schemas.pom
index 426ae77b1dc..da49544ae12 100644
--- a/maven/ooxml-schemas.pom
+++ b/maven/ooxml-schemas.pom
@@ -62,7 +62,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.github.pjfanning</groupId>
+      <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
       <version>2.3.0</version>
     </dependency>
diff --git a/maven/ooxml-security.pom b/maven/ooxml-security.pom
index 35f27848bb9..de9112e211c 100644
--- a/maven/ooxml-security.pom
+++ b/maven/ooxml-security.pom
@@ -71,7 +71,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>com.github.pjfanning</groupId>
+      <groupId>org.apache.xmlbeans</groupId>
       <artifactId>xmlbeans</artifactId>
       <version>2.3.0</version>
     </dependency>

From 0315cdd0396170e5fad148dc471c60a927cdcc18 Mon Sep 17 00:00:00 2001
From: "pj.fanning" <pj.fanning@workday.com>
Date: Sat, 6 Jan 2018 14:52:45 +0000
Subject: [PATCH 3/6] remove xmlbeans-2.6.0

---
 build.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.xml b/build.xml
index 47afd9d31b0..22109a5b8bb 100644
--- a/build.xml
+++ b/build.xml
@@ -585,6 +585,7 @@ under the License.
             </fileset>
             <fileset dir="${ooxml.lib}">
                 <!-- remove jars from previous versions, but not the current version -->
+                <include name="xmlbeans-2.6.0.jar"/>
                 <include name="ooxml-schemas-src-1.1.jar"/>
                 <include name="ooxml-schemas-1.1-sources.jar"/>
                 <include name="ooxml-schemas-1.1.jar"/>

From e950b49c5393e42dd50eaa77790291faadb3047e Mon Sep 17 00:00:00 2001
From: "pj.fanning" <pj.fanning@workday.com>
Date: Thu, 11 Jan 2018 14:34:57 +0000
Subject: [PATCH 4/6] xmlbeans 2.6.4 - and remove piccolo workaround (since
 2.6.4 jar removes the piccolo classes)

---
 build.xml | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/build.xml b/build.xml
index 62e619d90ee..51b4553a90c 100644
--- a/build.xml
+++ b/build.xml
@@ -189,9 +189,9 @@ under the License.
     <property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.05.jar"/>
     <property name="ooxml.curvesapi.url"
               value="${repository.m2}/maven2/com/github/virtuald/curvesapi/1.05/curvesapi-1.05.jar"/>
-    <property name="ooxml.xmlbeans26.jar" location="${ooxml.lib}/xmlbeans-2.6.3.jar"/>
+    <property name="ooxml.xmlbeans26.jar" location="${ooxml.lib}/xmlbeans-2.6.4.jar"/>
     <property name="ooxml.xmlbeans26.url"
-              value="${repository.m2}/maven2/com/github/pjfanning/xmlbeans/2.6.3/xmlbeans-2.6.3.jar"/>
+              value="${repository.m2}/maven2/com/github/pjfanning/xmlbeans/2.6.4/xmlbeans-2.6.4.jar"/>
 
     <!-- coverage libs -->
     <property name="jacoco.zip" location="${main.lib}/jacoco-0.7.9.zip"/>
@@ -686,11 +686,7 @@ under the License.
     <target name="fetch-ooxml-jars" depends="check-ooxml-jars" unless="ooxml.jars.present">
         <mkdir dir="${ooxml.lib}"/>
         <downloadfile src="${ooxml.curvesapi.url}" dest="${ooxml.curvesapi.jar}"/>
-        <downloadfile src="${ooxml.xmlbeans26.url}" dest="${ooxml.xmlbeans26.jar}.orig"/>
-        <!-- remove piccolo parser, so we don't use unsafe calls to it instead of using jaxp -->
-        <zip destfile="${ooxml.xmlbeans26.jar}">
-            <zipfileset src="${ooxml.xmlbeans26.jar}.orig" excludes="org/apache/xmlbeans/impl/piccolo/**"/>
-        </zip>
+        <downloadfile src="${ooxml.xmlbeans26.url}" dest="${ooxml.xmlbeans26.jar}"/>
     </target>
     <target name="check-svn-jars">
         <condition property="svn.jars.present">
@@ -796,7 +792,7 @@ under the License.
 
             <taskdef name="xmlbean"
                      classname="org.apache.xmlbeans.impl.tool.XMLBean"
-                     classpath="${ooxml.xmlbeans26.jar}.orig"/>
+                     classpath="${ooxml.xmlbeans26.jar}"/>
 
             <property name="xmlbean.xsds.dir" location="build/xmlbean-xsds"/>
             <property name="xmlbean.sources.dir" location="build/xmlbean-sources"/>
@@ -827,7 +823,7 @@ under the License.
                     nopvr="@{nopvr}"
                     >
                 <classpath>
-                    <path location="${ooxml.xmlbeans26.jar}.orig"/>
+                    <path location="${ooxml.xmlbeans26.jar}"/>
                 </classpath>
             </xmlbean>
 
@@ -1906,7 +1902,7 @@ under the License.
                 <globmapper from="*" to="${zipdir}/lib/*"/>
             </mappedresources>
             <mappedresources cache="true">
-                <fileset dir="${ooxml.lib}" includes="xmlbeans-2.6.*.jar.orig,curvesapi-*.jar"/>
+                <fileset dir="${ooxml.lib}" includes="xmlbeans-2.6.*.jar,curvesapi-*.jar"/>
                 <regexpmapper from="^(.*\.jar)(\.orig)?$$" to="${zipdir}/ooxml-lib/\1"/>
             </mappedresources>
             <mappedresources cache="true">

From 90ad490ab52309c935591791f0841092ce49ae3c Mon Sep 17 00:00:00 2001
From: "pj.fanning" <pj.fanning@workday.com>
Date: Fri, 26 Jan 2018 08:07:54 +0000
Subject: [PATCH 5/6] fix stray references to xmlbeans 2.6.3

---
 .classpath                  | 2 +-
 build.gradle                | 2 +-
 maven/poi-ooxml-schemas.pom | 2 +-
 sonar/pom.xml               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.classpath b/.classpath
index abcbb78197f..742f52d082d 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-2.6.3.jar" sourcepath="ooxml-lib/xmlbeans-2.6.3.jar"/>
+	<classpathentry exported="true" kind="lib" path="ooxml-lib/xmlbeans-2.6.4.jar" sourcepath="ooxml-lib/xmlbeans-2.6.4.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.05.jar"/>
diff --git a/build.gradle b/build.gradle
index 7b2190f1139..753b54a058d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -195,7 +195,7 @@ project('ooxml') {
 	compileJava.dependsOn 'ant-compile-ooxml-xsds'
 	
 	dependencies {
-		compile 'com.github.pjfanning:xmlbeans:2.6.3'
+		compile 'com.github.pjfanning:xmlbeans:2.6.4'
 		compile 'org.apache.commons:commons-collections4:4.1'
 		compile 'org.apache.commons:commons-math3:3.6.1'
 		compile 'org.apache.santuario:xmlsec:2.1.0'
diff --git a/maven/poi-ooxml-schemas.pom b/maven/poi-ooxml-schemas.pom
index 052b8a92b33..691886eb931 100644
--- a/maven/poi-ooxml-schemas.pom
+++ b/maven/poi-ooxml-schemas.pom
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>com.github.pjfanning</groupId>
       <artifactId>xmlbeans</artifactId>
-      <version>2.6.3</version>
+      <version>2.6.4</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index e43721bfda7..00c654f261d 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -63,7 +63,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>2.6.3</xmlbeans.version>
+		<xmlbeans.version>2.6.4</xmlbeans.version>
 		<junit.version>4.12</junit.version>
 		<maven.plugin.resources.version>3.0.1</maven.plugin.resources.version>
 		<maven.plugin.jar.version>3.0.1</maven.plugin.jar.version>

From 711eac352491837b9abd239a85d0a20228b78020 Mon Sep 17 00:00:00 2001
From: PJ Fanning <pj@kontainers.co.uk>
Date: Sat, 26 May 2018 10:39:11 +0100
Subject: [PATCH 6/6] xmlbeans 2.6.5

---
 .classpath                  | 2 +-
 build.gradle                | 2 +-
 build.xml                   | 4 ++--
 maven/poi-ooxml-schemas.pom | 2 +-
 sonar/pom.xml               | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.classpath b/.classpath
index dca3342a79e..f2cc38e43f1 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-2.6.4.jar" sourcepath="ooxml-lib/xmlbeans-2.6.4.jar"/>
+	<classpathentry exported="true" kind="lib" path="ooxml-lib/xmlbeans-2.6.5.jar" sourcepath="ooxml-lib/xmlbeans-2.6.5.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.05.jar"/>
diff --git a/build.gradle b/build.gradle
index 35d724b0a8c..830794fffbb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -189,7 +189,7 @@ project('ooxml') {
 	compileJava.dependsOn 'ant-compile-ooxml-xsds'
 	
 	dependencies {
-		compile 'com.github.pjfanning:xmlbeans:2.6.4'
+		compile 'com.github.pjfanning:xmlbeans:2.6.5'
 		compile 'org.apache.commons:commons-collections4:4.1'
 		compile 'org.apache.commons:commons-math3:3.6.1'
 		compile 'org.apache.santuario:xmlsec:2.1.0'
diff --git a/build.xml b/build.xml
index 3c83dbef632..4ad9fbb632f 100644
--- a/build.xml
+++ b/build.xml
@@ -199,9 +199,9 @@ under the License.
     <property name="ooxml.curvesapi.jar" location="${ooxml.lib}/curvesapi-1.05.jar"/>
     <property name="ooxml.curvesapi.url"
               value="${repository.m2}/maven2/com/github/virtuald/curvesapi/1.05/curvesapi-1.05.jar"/>
-    <property name="ooxml.xmlbeans26.jar" location="${ooxml.lib}/xmlbeans-2.6.4.jar"/>
+    <property name="ooxml.xmlbeans26.jar" location="${ooxml.lib}/xmlbeans-2.6.5.jar"/>
     <property name="ooxml.xmlbeans26.url"
-              value="${repository.m2}/maven2/com/github/pjfanning/xmlbeans/2.6.4/xmlbeans-2.6.4.jar"/>
+              value="${repository.m2}/maven2/com/github/pjfanning/xmlbeans/2.6.5/xmlbeans-2.6.5.jar"/>
 
     <!-- coverage libs -->
     <property name="jacoco.zip" location="${main.lib}/jacoco-0.8.1.zip"/>
diff --git a/maven/poi-ooxml-schemas.pom b/maven/poi-ooxml-schemas.pom
index 691886eb931..586afa63751 100644
--- a/maven/poi-ooxml-schemas.pom
+++ b/maven/poi-ooxml-schemas.pom
@@ -62,7 +62,7 @@
     <dependency>
       <groupId>com.github.pjfanning</groupId>
       <artifactId>xmlbeans</artifactId>
-      <version>2.6.4</version>
+      <version>2.6.5</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/sonar/pom.xml b/sonar/pom.xml
index 1b70cd0eb94..38b3caff58f 100644
--- a/sonar/pom.xml
+++ b/sonar/pom.xml
@@ -63,7 +63,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>2.6.4</xmlbeans.version>
+		<xmlbeans.version>2.6.5</xmlbeans.version>
 		<junit.version>4.12</junit.version>
 		<xmlunit.version>2.5.1</xmlunit.version>
 		<mockito.version>2.13.0</mockito.version>