diff -urEbwB xmlbeans-2.6.0.orig/build.xml xmlbeans-2.6.0/build.xml
--- xmlbeans-2.6.0.orig/build.xml	2023-08-29 02:56:01.675622269 +0200
+++ xmlbeans-2.6.0/build.xml	2023-08-29 02:59:37.787132806 +0200
@@ -60,21 +60,11 @@
                 <include name="saxonb8-6-1.zip"/>
                 <include name="saxonb8-2.zip"/>
                 <include name="saxonb8-1.zip"/>
-                <include name="jsr173_1.0_api_bundle.jar"/>
-                <include name="jsr173_1.0_api.jar"/>
                 <include name="saxon9.jar"/>
                 <include name="saxon9-dom.jar"/>
                 <include name="saxon8.jar"/>
                 <include name="saxon8-dom.jar"/>
                 <include name="xcresolver.zip"/>
-                <!-- the entries below are to delete the previous versions of the jsr173 jars -->
-                <include name="jsr173.jar"/>
-                <include name="jsr173_api.jar"/>
-                <include name="jsr173_ri.jar"/>
-                <include name="jsr173_1.0_api-mini-bundle.jar"/>
-                <include name="jsr173_1.0_ri.jar"/>
-                <include name="BEA Binary RI License (JSR 173).1(Clean).txt"/>
-                <include name="README(jsr_173 api and ri).txt"/>
             </fileset>
         </delete>
     </target>
@@ -128,39 +118,6 @@
         <copy file="external/lib/saxon9-dom.jar" tofile="build/lib/saxon9-dom.jar"/>
     </target>
 
-    <target name="jsr173-bundle.downloaded">
-        <condition property="jsr173-bundle.exists">
-            <available file="external/lib/jsr173_1.0_api_bundle.jar"/>
-        </condition>
-    </target>
-
-    <target name="jsr173-bundle.jar"
-            depends="jsr173-bundle.downloaded, dirs"
-            unless="jsr173-bundle.exists">
-        <get dest="external/lib/jsr173_1.0_api_bundle.jar"
-            src="http://www.apache.org/dist/java-repository/xmlbeans/jars/jsr173_1.0_api_bundle.jar"
-            verbose="true" usetimestamp="true" ignoreerrors="true"/>
-    </target>
-
-    <target name="jsr173_1.0.jars.extracted">
-        <condition property="jsr173_1.0.jars.exist">
-            <available file="build/lib/jsr173_1.0_api.jar"/>
-        </condition>
-    </target>
-
-    <target name="jsr173_1.0.jars"><!--
-            depends="jsr173-bundle.jar, jsr173_1.0.jars.extracted"
-            unless="jsr173_1.0.jars.exist">
-        <unjar src="external/lib/jsr173_1.0_api_bundle.jar" dest="external/lib" >
-            <patternset>
-                <include name="jsr173_1.0_api.jar"/>
-            </patternset>
-        </unjar!-->
-
-        <!-- copy jsr173 API jar and license files to build/lib -->
-        <copy file="external/lib/jsr173_1.0_api.jar" tofile="build/lib/jsr173_1.0_api.jar"/>
-    </target>
-
     <!-- get resolver.jar -->
     <target name="check.xcresolver.zip">
         <condition property="xcresolver.zip.exists">
@@ -356,7 +313,6 @@
                 <include name="xmlbeans-qname.jar"/>
                 <include name="xbean_xpath.jar"/>
                 <include name="resolver.jar"/>
-                <include name="jsr173_1.0_api.jar"/>
                 <include name="BEA Binary RI License (JSR 173).1(Clean).txt"/>
                 <include name="README(jsr_173 api and ri).txt"/>
             </fileset>
@@ -545,12 +501,9 @@
 
     <!-- xmlpublic target ============================================== -->
 
-    <target name="xmlpublic.classes" depends="dirs, jsr173_1.0.jars">
+    <target name="xmlpublic.classes" depends="dirs">
         <mkdir dir="build/classes/xmlpublic"/>
         <javac srcdir="src/xmlpublic" sourcepath="src/xmlinputstream" destdir="build/classes/xmlpublic" source="${javac.source}" target="${javac.target}" debug="on">
-            <classpath>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-            </classpath>
         </javac>
 
         <!-- Need properties files for XmlError -->
@@ -586,7 +539,6 @@
         <mkdir dir="build/classes/typestore"/>
         <javac srcdir="src/typestore" destdir="build/classes/typestore" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
                 <pathelement location="build/classes/xmlinputstream"/>
                 <pathelement location="build/classes/xmlpublic"/>
                 <pathelement location="build/classes/common"/>
@@ -597,11 +549,10 @@
 
     <!-- common target ============================================= -->
 
-    <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes, jsr173_1.0.jars">
+    <target name="common.classes" depends="dirs, xmlpublic.classes, xmlinputstream.classes">
         <mkdir dir="build/classes/common"/>
         <javac srcdir="src/common" destdir="build/classes/common" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
                 <pathelement location="build/classes/xmlinputstream"/>
                 <pathelement location="build/classes/xmlpublic"/>
             </classpath>
@@ -639,7 +590,7 @@
 
     <target name="typeimpl.classes" depends="dirs, store.classes,
         repackage.classes, xmlpublic.classes, typeholder.template, typestore.classes, xsdschema.classes,
-        configschema.classes, toolschema.classes, jsr173_1.0.jars, jam.classes">
+        configschema.classes, toolschema.classes, jam.classes">
         <mkdir dir="build/classes/typeimpl"/>
         <javac destdir="build/classes/typeimpl" source="${javac.source}" target="${javac.target}" debug="on" encoding="ISO-8859-1">
             <classpath>
@@ -655,7 +606,6 @@
                 <pathelement location="build/classes/xmlschema"/>
                 <pathelement location="build/classes/toolschema"/>
                 <pathelement location="build/classes/jam"/>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
             </classpath>
 
             <src path="src/typeimpl"/>
@@ -681,7 +631,6 @@
         <mkdir dir="build/classes/xmlcomp"/>
         <javac srcdir="src/xmlcomp" destdir="build/classes/xmlcomp" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
                 <pathelement location="build/classes/xmlinputstream"/>
                 <pathelement location="build/classes/xmlpublic"/>
                 <pathelement location="build/classes/common"/>
@@ -697,11 +646,10 @@
 
     <!-- marshal target =============================================== -->
 
-    <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes, jsr173_1.0.jars">
+    <target name="marshal.classes" depends="dirs, typeimpl.classes, xmlpublic.classes">
         <mkdir dir="build/classes/marshal"/>
         <javac srcdir="src/marshal" destdir="build/classes/marshal" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
                 <pathelement location="build/classes/configschema"/>
                 <pathelement location="build/classes/xmlinputstream"/>
                 <pathelement location="build/classes/xmlpublic"/>
@@ -743,7 +691,6 @@
         <javac srcdir="src/store" destdir="build/classes/store" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath id="store.compile.path">
                 <pathelement location="build/classes/typestore"/>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
                 <pathelement location="build/classes/xmlinputstream"/>
                 <pathelement location="build/classes/xmlpublic"/>
                 <pathelement location="build/classes/common"/>
@@ -762,7 +709,6 @@
         <javac srcdir="src/tools" destdir="build/classes/tools" source="${javac.source}" target="${javac.target}" debug="on">
             <classpath id="tools.compile.path">
                 <pathelement location="build/classes/typestore"/>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
                 <pathelement location="build/classes/xmlinputstream"/>
                 <pathelement location="build/classes/xmlpublic"/>
                 <pathelement location="build/classes/common"/>
@@ -784,13 +730,11 @@
 
     <path id="bootstrap.run.path">
         <pathelement location="build/private/lib/oldxbean.jar"/>
-        <pathelement location="build/lib/jsr173_1.0_api.jar"/>
         <pathelement location="build/classes/xmlpublic"/>
     </path>
 
     <path id="bootstrap.compile.path">
         <pathelement location="build/classes/xmlpublic"/>
-        <pathelement location="build/lib/jsr173_1.0_api.jar"/>
     </path>
 
     <property name="bootstrap.compile.path" refid="bootstrap.compile.path"/>
@@ -834,7 +778,7 @@
         </condition>
     </target>
 
-    <target name="xmlschema.classes" depends="xmlschema.check, xmlpublic.classes, oldxbean.jar, jsr173_1.0.jars" unless="xmlschema.notRequired">
+    <target name="xmlschema.classes" depends="xmlschema.check, xmlpublic.classes, oldxbean.jar" unless="xmlschema.notRequired">
         <delete dir="build/classes/xmlschema"/>
         <delete dir="build/src/xmlschema"/>
         <java classname="${bootstrap_schema_compiler}" classpathref="bootstrap.run.path" fork="true" failonerror="true">
@@ -1063,7 +1007,6 @@
         <pathelement location="build/classes/common"/>
         <pathelement location="external/lib/junit.jar"/>
         <pathelement location="build/ar/xbean.jar"/>
-        <pathelement location="build/lib/jsr173_1.0_api.jar"/>
         <pathelement location="build/classes/xmlinputstream"/>
     </path>
 
@@ -1073,7 +1016,7 @@
     </path>
 
 
-    <target name="drt.classes" depends="dirs,jsr173_1.0.jars">
+    <target name="drt.classes" depends="dirs">
         <mkdir dir="build/private/classes/drt"/>
         <javac
             destdir="build/private/classes/drt"
@@ -1093,7 +1036,6 @@
 
     <path id="scomp.run.path">
         <pathelement location="build/lib/xbean.jar"/>
-        <pathelement location="build/lib/jsr173_1.0_api.jar"/>
     </path>
 
     <target name="stsschema.check">
@@ -1118,7 +1060,7 @@
         </uptodate>
     </target>
 
-    <target name="jam.classes" depends="jam.classes.check, dirs, repackage.classes, jsr173_1.0.jars" unless="jam.classes.notRequired">
+    <target name="jam.classes" depends="jam.classes.check, dirs, repackage.classes" unless="jam.classes.notRequired">
         <delete dir="build/private/jam"/>
         <mkdir dir="build/private/jam"/>
         <unjar src="external/lib/jam-0.1.0-src.jar" dest="build/private/jam"/>
@@ -1140,9 +1082,6 @@
             source="1.8" target="1.8"
             debug="on">
             <src path="build/private/jam/src_repackage"/>
-            <classpath>
-                <pathelement location="build/lib/jsr173_1.0_api.jar"/>
-            </classpath>
         </javac>
     </target>
 
