Merge junit and hamcrest jars; older project versions expect hamcrest…

… classes in junit.jar

framework/projects/Collections/Collections.build.xml

@@ -28,7 +28,6 @@ of the checked-out project version.
 <project name="D4j-Collections" basedir="${basedir}">
 
     <property name="easymock.jar" value="${d4j.dir.projects}/Collections/lib/easymock-2.0.jar"/>
-    <property name="hamcrest.jar" value="${d4j.dir.projects}/Collections/lib/hamcrest-core-1.3.jar"/>
 
     <!-- Generate all debugging information -->
     <property name="compile.debug" value="yes" />
@@ -61,7 +60,6 @@ of the checked-out project version.
         <pathelement location="${classes.dir}"/>
 	<pathelement location="${test.classes.dir}"/>
 	<pathelement path="${junit.jar}" />
-        <pathelement location="${hamcrest.jar}"/>
         <pathelement location="${easymock.jar}"/>
     </path>
 

framework/projects/Lang/Lang.build.xml

@@ -72,7 +72,6 @@ of the checked-out project version.
         <pathelement path="${asm.jar}" />
         <pathelement path="${easymock.jar}" />
         <pathelement path="${commons-io.jar}" />
-        <pathelement path="${hamcrest.jar}" />
         <pathelement path="${junit.jar}" />
     </path>
 </project>

framework/projects/defects4j.build.xml

@@ -46,8 +46,7 @@ project-specific build file ("project_id"/"project_id".build.xml) for the
             classpath="${d4j.home}/framework/lib/ant-contrib.jar"/>
 
     <!-- Dependencies used by all projects -->
-    <property name="junit.jar"  value="${d4j.home}/framework/projects/lib/junit-4.12.jar"/>
-    <property name="hamcrest.jar" value="${d4j.home}/framework/projects/lib/hamcrest-core-1.3.jar"/>
+    <property name="junit.jar"  value="${d4j.home}/framework/projects/lib/junit-4.12-hamcrest-1.3.jar"/>
     <property name="cobertura.jar" value="${d4j.home}/framework/projects/lib/cobertura-2.0.3.jar"/>
 
     <!-- Location of libraries of test generation tool-->