From 0137329c282b36303557938082d9d93d1aa815fe 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/3] Fix dependencies on junit/hamcrest

---

 build.xml | 16 ++++++++--------

 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml

index f30c22e..43fe6e9 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">

@@ -168,8 +168,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}"/>

@@ -231,8 +231,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"/>

@@ -253,8 +253,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.31.1