diff --git a/build.xml b/build.xml index d7adbc1b35ab..fef35b3393e2 100644 --- a/build.xml +++ b/build.xml @@ -5,7 +5,7 @@ - + diff --git a/doc/ReleaseNotes4.7.txt b/doc/ReleaseNotes4.7.txt index a3ad9efb1be2..11b70c1fa826 100644 --- 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 index 07aefd07ed4f..401be434d95f 100644 --- 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) {