Enable build using OpenJDK 1.8, adding xercesImpl 2.12 to lib

6 files changed, 35 insertions, 4 deletions

diff --git a/.classpath b/.classpath
index 6e8cea4..f4aad79 100644
--- a/.classpath
+++ b/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" output="classes" path="src/main/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Ant"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jre1.6.0_35"/>
+	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-8-openjdk-amd64"/>
 	<classpathentry kind="lib" path="/usr/share/java/xercesImpl.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/.externalToolBuilders/New_Builder.launch b/.externalToolBuilders/New_Builder.launch
new file mode 100644
index 0000000..b59157e
--- /dev/null
+++ b/.externalToolBuilders/New_Builder.launch
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
+<booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
+<booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
+<booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="ant-cpptasks"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/ant-cpptasks/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="full,incremental,"/>
+<booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_WORKING_DIRECTORY" value="${workspace_loc:/ant-cpptasks}"/>
+</launchConfiguration>
diff --git a/.project b/.project
index 9ae998a..9d95f78 100644
--- a/.project
+++ b/.project
@@ -10,6 +10,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+				<dictionary>
+					<key>LaunchConfigHandle</key>
+					<value>&lt;project&gt;/.externalToolBuilders/New_Builder.launch</value>
+				</dictionary>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/build.xml b/build.xml
index 376caea..3987efd 100644
--- a/build.xml
+++ b/build.xml
@@ -135,8 +135,8 @@
            target="${javac.target}"
            source="${javac.source}"
            deprecation="${deprecation}"
-           optimize="${optimize}" >
-    </javac>
+           optimize="${optimize}"
+           classpath="${lib.dir}/xercesImpl-2.12.0.jar"/>
   </target>
 
   <!--
@@ -177,7 +177,7 @@
            target="${javac.target}"
            source="${javac.source}"
            optimize="false"
-           classpath="${build.lib}/${name}.jar;${java.class.path}"/>
+           classpath="${lib.dir}/xercesImpl-2.12.0.jar;${build.lib}/${name}.jar;${java.class.path}"/>
     <jar jarfile="${tests.build.lib}/${name}_test.jar">
             <fileset dir="." includes="NOTICE LICENSE"/>
             <fileset dir="${tests.build.classes}"/>
diff --git a/lib/xercesImpl-2.12.0.LICENSE-2.0.txt b/lib/xercesImpl-2.12.0.LICENSE-2.0.txt
new file mode 100644
index 0000000..82e90ab
--- /dev/null
+++ b/lib/xercesImpl-2.12.0.LICENSE-2.0.txt
@@ -0,0 +1,8 @@
+File retrieved via: https://repo1.maven.org/maven2/xerces/xercesImpl/2.12.0/xercesImpl-2.12.0.jar
+https://mvnrepository.com/artifact/xerces/xercesImpl/2.12.0
+
+Apache License
+Version 2.0, January 2004
+http://www.apache.org/licenses/
+http://www.apache.org/licenses/LICENSE-2.0.txt
+
diff --git a/lib/xercesImpl-2.12.0.jar b/lib/xercesImpl-2.12.0.jar
new file mode 100644
index 0000000..b69d01d
--- /dev/null
+++ b/lib/xercesImpl-2.12.0.jar