File xom-build.patch of Package xom
diff --git a/build.xml b/build.xml
index 201e497..e408abf 100644
--- a/build.xml
+++ b/build.xml
@@ -65,12 +65,12 @@ subject line. The XOM home page is https://xom.nu/
<property name="dist.dir" value="./dist"/>
<property name="clover.dir" value="./clover"/>
<property name="testreports.dir" value="./testreports" />
- <property name="jaxen.dir" value="${build.dir}/jaxen-classes"/>
<property name="xmlapis.jar" value="${lib.dir}/xml-apis-1.4.01.jar"/>
<property name="parser.jar" value="${lib.dir}/xercesImpl-2.12.2.jar"/>
<property name="tagsoup.jar" value="${lib2.dir}/tagsoup-1.2.1.jar"/>
<property name="junit.jar" value="${lib.dir}/junit.jar"/>
+ <property name="jaxen.jar" value="${lib.dir}/jaxen-1.1.6.jar"/>
<property name="xom.jar" value="${build.dir}/${name}-${version}.jar"/>
<property name="xom-core" value="${build.dest}"/>
@@ -89,7 +89,7 @@ subject line. The XOM home page is https://xom.nu/
<pathelement location="${parser.jar}"/>
<pathelement location="${xmlapis.jar}"/>
<pathelement location="${junit.jar}"/>
- <pathelement location="${jaxen.dir}"/>
+ <pathelement location="${jaxen.jar}"/>
<pathelement location="${servlet.jar}"/>
</path>
@@ -97,7 +97,7 @@ subject line. The XOM home page is https://xom.nu/
<pathelement location="${xmlapis.jar}"/>
<pathelement location="${parser.jar}"/>
<pathelement location="${xom-core}"/>
- <pathelement location="${jaxen.dir}"/>
+ <pathelement location="${jaxen.jar}"/>
</path>
<path id="test.class.path">
@@ -183,15 +183,15 @@ XOM Build file
</target>
- <target name="compile-core" depends="prepare, compile-jaxen"
+ <target name="compile-core" depends="prepare"
description="Compile the source code">
<javac srcdir="${build.src}"
destdir="${build.dest}"
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
- target="1.6"
- source="1.6"
+ target="1.8"
+ source="1.8"
encoding="UTF-8"
fork="true"
includeAntRuntime="false"
@@ -218,8 +218,8 @@ XOM Build file
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
- target="1.6"
- source="1.6"
+ target="1.8"
+ source="1.8"
encoding="UTF-8"
includeAntRuntime="false">
<classpath refid="compile.class.path"/>
@@ -271,21 +271,13 @@ XOM Build file
<target name="jar" depends="compile" description="Create xom.jar">
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask"
- classpath="${lib2.dir}/jarjar-1.0.jar"/>
- <jarjar jarfile="${build.dir}/${name}-${version}.jar"
+ <jar destfile="${build.dir}/${name}-${version}.jar"
basedir="${build.dest}"
index="no"
compress="yes"
includes="nu/xom/* nu/xom/xslt/* nu/xom/xinclude/* nu/xom/converters/* nu/xom/canonical/* nu/xom/tests/XOMTestCase.class"
excludes="nu/xom/samples/* nu/xom/benchmarks/* nu/xom/pantry/* nu/xom/tools/* nu/xom/integrationtests/*">
- <fileset dir="${jaxen.dir}"
- excludes="**Demo.class **/package.html org/jaxen/xom/** org/jaxen/XPathTestBase.class org/jaxen/jdom/** org/jaxen/dom4j/** org/jaxen/javabean/** org/jaxen/dom/** org/jaxen/**Test.class org/jaxen/saxpath/base/**Test.class org/jaxen/saxpath/helpers/**Test.class org/jaxen/saxpath/helpers/**Test.class org/jaxen/pattern/** org/jaxen/saxpath/SAXPathParseException.class org/w3c/dom/UserDataHandler.class org/jaxen/pattern/PriorityTest.class">
- </fileset>
-
- <rule pattern="org.jaxen.**" result="nu.xom.jaxen.@1"/>
-
<manifest>
<attribute name="Built-By" value="${user.name}"/>
<attribute name="Specification-Title" value="XOM"/>
@@ -345,7 +337,7 @@ XOM Build file
<attribute name="Implementation-Title" value="nu.xom.canonical"/>
</section>
</manifest>
- </jarjar>
+ </jar>
<!-- Put a copy in the dist dir too, because I never remember to upload
the jar from the build directory. -->
@@ -392,7 +384,9 @@ XOM Build file
noindex="false"
windowtitle="${Name} ${version} API"
docencoding="UTF-8"
+ encoding="UTF-8"
charset="UTF-8"
+ source="1.8"
link="http://www.junit.org/junit/javadoc/3.8.1"
doctitle="${Name} ${version}"
bottom="Copyright 2002-${year} <a href='https://www.elharo.com/'>Elliotte Rusty Harold</a>
@@ -436,7 +430,9 @@ XOM Build file
noindex="false"
windowtitle="${Name} ${version} API"
docencoding="UTF-8"
+ enconding="UTF-8"
charset="UTF-8"
+ source="1.8"
noqualifier="java.lang:java.io"
link="http://www.junit.org/junit/javadoc/3.8.1"
doctitle="${Name} ${version}"
@@ -454,8 +450,8 @@ XOM Build file
debug="${debug}"
optimize="${optimize}"
deprecation="${deprecation}"
- target="1.6"
- source="1.6"
+ target="1.8"
+ source="1.8"
encoding="UTF-8"
includeAntRuntime="false"
includes="nu/xom/tools/*">
@@ -720,7 +716,7 @@ XOM Build file
<!-- Generate a Maven JAR for uploading to OSRRH and hence placement onto ibiblio and mirrors.
See https://maven.apache.org/guides/mini/guide-central-repository-upload.html -->
- <target name="maven2" depends="jar, sources.jar, javadoc.jar" >
+ <target name="maven2" depends="jar" >
<property name="pom2.template" location="project2.xml" />
<property name="pom2.file" location="${build.dir}/maven2/project.xml" />
<property name="package.jar" location="${build.dir}/${name}-${version}.jar"/>
@@ -740,40 +736,6 @@ XOM Build file
</target>
- <target name="compile-jaxen" description="Compile Jaxen" depends="get-jaxen">
- <javac srcdir="${build.dir}/jaxen-${jaxenversion}/src/java/main"
- destdir="${build.dir}/jaxen-classes"
- debug="${debug}"
- optimize="${optimize}"
- deprecation="${deprecation}"
- target="1.6"
- source="1.6"
- encoding="UTF-8"
- includeAntRuntime="false"
- excludes="org/jaxen/dom/**
- org/jaxen/jdom/**
- org/jaxen/dom4j/**
- org/jaxen/pattern/**
- org/jaxen/javabean/**
- org/jaxen/xom/**
- org/jaxen/function/xslt/**
- org/jaxen/function/ext/**
- org/w3c/dom/**
- org/jaxen/saxpath/expr/DefaultPredicated.java
- org/jaxen/saxpath/helpers/DefaultXPathHandler.java
- org/jaxen/util/StackedIterator.java
- org/jaxen/util/XPath2XMLVisitor.java
- org/jaxen/util/LinkedIterator.java
- org/jaxen/util/SelfAxisIterator.java
- ">
- <classpath refid="compile.class.path"/>
- </javac>
- </target>
-
- <target name="get-jaxen" description="Download Jaxen source code" depends="prepare">
- <unzip src="jaxen-${jaxenversion}-src.zip" dest="${build.dir}" />
- </target>
-
<target name="debug" depends="init" description="Print various Ant properties">
<echoproperties/>
</target>
