lib

diff --git a/build.xml b/build.xml
index ef43a12..eaf9c49 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,6 +1,6 @@
 <project name="hayashi" default="all" basedir=".">\r
     <property name="src" value="${basedir}/src" />\r
-    <property name="obj" value="${basedir}/classes" />\r
+    <property name="obj" value="${basedir}/build" />\r
     <property name="javadoc.dest" value="${basedir}/doc" />\r
     <property name="report" value="${basedir}/report" />\r
     <property file="build.properties" />\r
@@ -9,7 +9,8 @@
 \r
     <!--クラスパスを設定 -->\r
     <path id="compile.classpath">\r
-        <pathelement location="lib/junit.jar"/>\r
+        <pathelement location="lib/junit-4.12.jar"/>\r
+        <pathelement location="lib/hamcrest-core-1.3"/>\r
         <pathelement location="lib/xercesImpl.jar"/>\r
         <pathelement location="lib/mail-1.4.jar"/>\r
         <pathelement location="lib/activation-1.1.jar"/>\r

diff --git a/lib/hamcrest-core-1.3.jar b/lib/hamcrest-core-1.3.jar
new file mode 100644 (file)
index 0000000..9d5fe16
Binary files /dev/null and b/lib/hamcrest-core-1.3.jar differ

diff --git a/lib/junit-4.12.jar b/lib/junit-4.12.jar
new file mode 100644 (file)
index 0000000..3a7fc26
Binary files /dev/null and b/lib/junit-4.12.jar differ

diff --git a/lib/junit.jar b/lib/junit.jar
deleted file mode 100644 (file)
index 674d71e..0000000
Binary files a/lib/junit.jar and /dev/null differ

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 5664a80..c8df05b 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -5,7 +5,8 @@ endorsed.classpath=
 #Sun Sep 10 09:45:00 JST 2017
 excludes=
 file.reference.activation-1.1.jar=lib/activation-1.1.jar
-file.reference.junit.jar=lib/junit.jar
+file.reference.hamcrest-core-1.3.jar=lib/hamcrest-core-1.3.jar
+file.reference.junit-4.12.jar=lib/junit-4.12.jar
 file.reference.mail-1.4.jar=lib/mail-1.4.jar
 file.reference.servlet-api.jar=lib/servlet-api.jar
 file.reference.xercesImpl.jar=lib/xercesImpl.jar
@@ -91,7 +92,8 @@ javac.classpath=\
     ${file.reference.servlet-api.jar}:\
     ${file.reference.xercesImpl.jar}:\
     ${file.reference.activation-1.1.jar}:\
-    ${file.reference.junit.jar}
+    ${file.reference.hamcrest-core-1.3.jar}:\
+    ${file.reference.junit-4.12.jar}
 annotation.processing.enabled.in.editor=false
 build.generated.sources.dir=${build.dir}/generated-sources
 javadoc.version=false