commit 355a661a53b2996112a3557522a6b37d64e22670
author Andreas Beeker <kiwiwings@apache.org> Sun Jun 20 19:47:05 2021 +0000
committer Andreas Beeker <kiwiwings@apache.org> Sun Jun 20 19:47:05 2021 +0000
tree 698c1a921d14afec8f940924458553c8bff5978a
parent 12e6e27d07f66415b0948cdc7070ae1420ef9448

remove reference to the bootstrap xmlbeans version, which lead to wrong references to the "FACTORY" class (old xmlbeans) or static variable (new xmlbeans) in generated code

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

build.xml

diff --git a/build.xml b/build.xml
index b36f2d0..285514a 100644
--- a/build.xml
+++ b/build.xml
@@ -358,6 +358,9 @@
         <replaceregexp match="^.*@deprecated.*\r?\n.*\r?\n" replace="" flags="gm">
             <fileset dir="build/bootstrap/generated-sources" includes="**/*.java"/>
         </replaceregexp>
+        <replaceregexp match='public static final class Factory.*No instance of this class allowed\n\s\}' replace="" flags="gm">
+            <fileset dir="build/bootstrap/generated-sources" includes="**/*.java"/>
+        </replaceregexp>
         <replaceregexp match='^(\s+).*type =[^\n]*\r?\n.*\((.*)\.class[^"]+"([^"]+)"[^"]+("[^"]+").*$' replace="\1org.apache.xmlbeans.impl.schema.XmlObjectFactory&lt;\2> Factory = new org.apache.xmlbeans.impl.schema.XmlObjectFactory&lt;>(\3.TypeSystemHolder.typeSystem, \4);&#10;\1org.apache.xmlbeans.SchemaType type = Factory.getType();" flags="gm">
             <fileset dir="build/bootstrap/generated-sources" includes="**/*.java" excludes="**/impl/xb/*/impl/**"/>
         </replaceregexp>
@@ -377,7 +380,6 @@
             <src refid="sources"/>
             <src path="build/bootstrap/generated-sources"/>
             <classpath>
-                <path refid="oldxbean"/>
                 <pathelement location="${ant.jar}"/>
                 <pathelement location="${ant-junit.jar}"/>
                 <pathelement location="${ant-junit4.jar}"/>