This is an automated email from the ASF dual-hosted git repository. elharo pushed a commit to branch xapis in repository https://gitbox.apache.org/repos/asf/xerces-j.git
commit d1c1e9af4d2ff63b53b093c173c83b132aea5e4f Author: Elliotte Rusty Harold <[email protected]> AuthorDate: Sun Mar 1 13:37:41 2026 -0500 Remove dependency on bundled DOM SAX JAXP classes that have been bundled in the JDK since Java 1.4 --- build.xml | 28 ++++++++-------------------- 1 file changed, 8 insertions(+), 20 deletions(-) diff --git a/build.xml b/build.xml index fff872a88..c47eee389 100644 --- a/build.xml +++ b/build.xml @@ -70,7 +70,6 @@ Authors: <property name='parser_version' value='2_12_3'/> <property name='deprecatedjar.parser' value='xerces.jar'/> - <property name='jar.apis' value='xml-apis.jar'/> <property name='jar.parser' value='xercesImpl.jar'/> <property name='jar.samples' value='xercesSamples.jar'/> <property name='jar.dv' value='xercesDV.jar'/> @@ -285,7 +284,7 @@ Authors: destdir="${build.dest}" source="${javac.source}" target="${javac.target}" - classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}" + classpath="${build.dir}/classes:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" @@ -353,7 +352,7 @@ Authors: destdir="${build.dest}" source="${javac.source}" target="${javac.target}" - classpath="${build.dir}/classes:${tools.dir}/${jar.apis}" + classpath="${build.dir}/classes" debug="${debug}" debuglevel="${debuglevel}" includeAntRuntime="false" @@ -373,7 +372,7 @@ Authors: destdir="${build.dest}" source="${javac.source}" target="${javac.target}" - classpath="${tools.dir}/${jar.apis}:${build.dir}/classes:./tools/junit.jar" + classpath="${build.dir}/classes:./tools/junit.jar" debug="${debug}" debuglevel="${debuglevel}" includeAntRuntime="false" @@ -747,8 +746,6 @@ Authors: <!-- =================================================================== --> <target name="pack-bin" depends="pack-bin-common, jars"> <copy file="${build.dir}/${jar.parser}" tofile="${distbin.dir}/${jar.parser}"/> - <!-- include the xml-commons APIs --> - <copy file="${tools.dir}/${jar.apis}" tofile="${distbin.dir}/${jar.apis}"/> <!-- include the xml-commons resolver --> <copy file="${tools.dir}/${jar.resolver}" tofile="${distbin.dir}/${jar.resolver}"/> <!-- include the Xalan Serializer --> @@ -783,11 +780,11 @@ Authors: <zip zipfile="${build.dir}/deprecated${parser.Name}-bin.${parser.version}.zip" basedir="${build.dir}" includes="${parser.shortname}-${parser_version}/**" - excludes="*.class, **/${jar.parser}, **/${jar.apis}"/> + excludes="*.class, **/${jar.parser}"/> <tar tarfile="${build.dir}/deprecated${parser.Name}-bin.${parser.version}.tar" basedir="${build.dir}" includes="${parser.shortname}-${parser_version}/**" - excludes="*.class, **/${jar.parser}, **/${jar.apis}"/> + excludes="*.class, **/${jar.parser}"/> <gzip zipfile="${build.dir}/deprecated${parser.Name}-bin.${parser.version}.tar.gz" src="${build.dir}/deprecated${parser.Name}-bin.${parser.version}.tar" /> <!-- as before, let's kill of the ungzip'd tarball! --> @@ -797,7 +794,6 @@ Authors: <target name="test" depends="tests"> <path id="run.classpath"> - <pathelement location="${tools.dir}/${jar.apis}"/> <pathelement location="${tools.dir}/${jar.resolver}"/> <pathelement location="${tools.dir}/${jar.serializer}"/> <pathelement location="${tools.dir}/${jar.junit}"/> @@ -1002,8 +998,6 @@ Authors: <!-- Builds xercesImpl, xml-apis and sample jar files --> <!-- =================================================================== --> <target name="jars" depends="jar, sampjar"> - <!-- include the xml-commons APIs --> - <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/> <!-- include the xml-commons resolver --> <copy file="${tools.dir}/${jar.resolver}" tofile="${build.dir}/${jar.resolver}"/> <!-- include the Xalan Serializer --> @@ -1072,7 +1066,7 @@ Authors: optimize="${optimize}" includeAntRuntime="false" includeJavaRuntime="true" - classpath="${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"/> + classpath="${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}"/> </target> @@ -1331,8 +1325,6 @@ Authors: <!-- Builds xercesImpl (dtd), xml-apis, and sample jars --> <!-- =================================================================== --> <target name="dtdjars" depends="dtdjar, sampjar"> - <!-- include the xml-commons APIs --> - <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/> <!-- include the xml-commons resolver --> <copy file="${tools.dir}/${jar.resolver}" tofile="${build.dir}/${jar.resolver}"/> <!-- include the Xalan Serializer --> @@ -1365,7 +1357,7 @@ Authors: destdir="${build.dest}" source="${javac.source}" target="${javac.target}" - classpath="${build.dir}/classes:${tools.dir}/${jar.apis}" + classpath="${build.dir}/classes" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" @@ -1467,7 +1459,6 @@ Authors: <arg value="${parser.version}"/> <classpath> <pathelement location="tests/conformance/utilities.jar"/> - <pathelement location="${build.dir}/${jar.apis}"/> <pathelement location="${build.dir}/${jar.parser}"/> </classpath> </java> @@ -1480,7 +1471,6 @@ Authors: <arg value="${parser.version}"/> <classpath> <pathelement location="tests/conformance/utilities.jar"/> - <pathelement location="${build.dir}/${jar.apis}"/> <pathelement location="${build.dir}/${jar.parser}"/> </classpath> </java> @@ -1516,7 +1506,7 @@ Authors: destdir="${build.dest}" source="${javac.source}" target="${javac.target}" - classpath="${build.dir}/classes:${tools.dir}/${jar.apis}:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}" + classpath="${build.dir}/classes:${tools.dir}/${jar.resolver}:${tools.dir}/${jar.serializer}" debug="${debug}" debuglevel="${debuglevel}" deprecation="${deprecation}" @@ -1567,8 +1557,6 @@ Authors: <!-- Builds xercesImpl, xml-apis and sample jars with Schema 1.1 support --> <!-- =================================================================== --> <target name="jars-schema11" depends="jar-schema11, sampjar"> - <!-- include the xml-commons APIs --> - <copy file="${tools.dir}/${jar.apis}" tofile="${build.dir}/${jar.apis}"/> <!-- include the xml-commons resolver --> <copy file="${tools.dir}/${jar.resolver}" tofile="${build.dir}/${jar.resolver}"/> <!-- include the Xalan Serializer --> --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
