4.7 final

adriannistoruiuc · Jul 28, 2009 · a8629da · a8629da
1 parent 23ffc6b
commit a8629da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/build.xml b/build.xml
@@ -5,7 +5,7 @@
 	<property name="src" value="src/main/java" />
 	<property name="target" location="target" />
 	<property name="bin" location="${target}/main" />
-	<property name="version" value="4.7-RC1" />
+	<property name="version" value="4.7" />
 	<property name="dist" value="junit${version}" />
 	<property name="versionfile" value="${src}/junit/runner/Version.java" />
 	<property name="zipfile"  value="${dist}/${dist}.zip" />

diff --git a/doc/ReleaseNotes4.7.txt b/doc/ReleaseNotes4.7.txt
@@ -178,7 +178,9 @@
 ### Matchers ###
 - Due to typing incompatibilities, JUnit is still including the 1.1 release
   of hamcrest.  This is not a change from 4.6, but is a change from
-  pre-beta releases of 4.7.
+  pre-beta releases of 4.7.  Due to this incompatibility, tests using
+  Hamcrest 1.2 must still use the MatcherAssert.assertThat method from 
+  Hamcrest, not Assert.assertThat from JUnit.
 
 ### Docs ###
 - Javadocs now link to online JDK javadocs (bug 2090230)

diff --git a/src/main/java/junit/runner/Version.java b/src/main/java/junit/runner/Version.java
@@ -9,7 +9,7 @@ private Version() {
 	}
 
 	public static String id() {
-		return "4.7-RC1";
+		return "4.7";
 	}
 
 	public static void main(String[] args) {