From df823903e6ab15e9b336b5e5828afaaa87b66086 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 31 Jul 2020 13:30:15 +0100
Subject: [PATCH 1/4] Fix dependencies on junit/hamcrest

---
 build.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index cff1184..4474244 100644
--- a/build.xml
+++ b/build.xml
@@ -2,8 +2,8 @@
 <project name="jffi" default="jar" basedir=".">
   <description>Builds, tests, and runs the project jffi.</description>
   <path id="classpath.test">
-    <pathelement location="lib/junit_4/junit-4.11.jar"/>
-    <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
+    <pathelement location="lib/junit.jar"/>
+    <pathelement location="lib/hamcrest_core.jar"/>
   </path>
 
   <target name="clean-java" depends="-init">
@@ -181,8 +181,8 @@
       <classpath>
         <pathelement location="${build.classes.dir}"/>
         <pathelement location="${build.test.dir}/classes"/>
-        <pathelement location="lib/junit_4/junit-4.11.jar"/>
-        <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
+        <pathelement location="lib/junit.jar"/>
+        <pathelement location="lib/hamcrest_core.jar"/>
       </classpath>
       <sysproperty key="java.library.path" value="${build.native.dir}"/>
 
@@ -207,8 +207,8 @@
       <classpath>
         <pathelement location="${build.classes.dir}"/>
         <pathelement location="${build.test.dir}/classes"/>
-        <pathelement location="lib/junit_4/junit-4.11.jar"/>
-        <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
+        <pathelement location="lib/junit.jar"/>
+        <pathelement location="lib/hamcrest_core.jar"/>
       </classpath>
       <sysproperty key="java.library.path" value="${build.native.dir}"/>
       <formatter type="plain" usefile="false"/>
@@ -229,8 +229,8 @@
     <javac srcdir="${src.test.dir}" destdir="${build.test.dir}/classes" includeantruntime="false" classpathref="classpath.test">
       <classpath>
         <pathelement location="${build.classes.dir}"/>
-        <pathelement location="lib/junit_4/junit-4.11.jar"/>
-        <pathelement location="lib/junit_4/hamcrest-core-1.3.jar"/>
+        <pathelement location="lib/junit.jar"/>
+        <pathelement location="lib/hamcrest_core.jar"/>
       </classpath>
     </javac>
   </target>
-- 
2.26.2