[SPR-5995] Renamed makeNotifier() to springMakeNotifier() in order to allow compatibility with JUnit 4.5, 4.6, and 4.7.

Author: sbrannen

org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java

@@ -228,7 +228,7 @@ protected Object createTest() throws Exception {
 	 */
 	@Override
 	protected void runChild(FrameworkMethod frameworkMethod, RunNotifier notifier) {
-		EachTestNotifier eachNotifier = makeNotifier(frameworkMethod, notifier);
+		EachTestNotifier eachNotifier = springMakeNotifier(frameworkMethod, notifier);
 		if (isTestMethodIgnored(frameworkMethod)) {
 			eachNotifier.fireTestIgnored();
 			return;
@@ -249,7 +249,15 @@ protected void runChild(FrameworkMethod frameworkMethod, RunNotifier notifier) {
 		}
 	}
 
-	private EachTestNotifier makeNotifier(FrameworkMethod method, RunNotifier notifier) {
+	/**
+	 * <code>springMakeNotifier()</code> is an exact copy of
+	 * {@link BlockJUnit4ClassRunner BlockJUnit4ClassRunner's}
+	 * <code>makeNotifier()</code> method, but we have decided to prefix it with
+	 * "spring" and keep it <code>private</code> in order to avoid the
+	 * compatibility clashes that were introduced in JUnit between versions 4.5,
+	 * 4.6, and 4.7.
+	 */
+	private EachTestNotifier springMakeNotifier(FrameworkMethod method, RunNotifier notifier) {
 		Description description = describeChild(method);
 		return new EachTestNotifier(notifier, description);
 	}