Merge branch 'concurrent-run-listeners' into concurrent-run-listeners_remove-jcip-deps

Conflicts:
	src/test/java/org/junit/runner/notification/SynchronizedRunListenerTest.java

Author: kcooney

Diff for: src/main/java/org/junit/experimental/annotations/ThreadSafe.java

@@ -0,0 +1,17 @@
+package org.junit.experimental.annotations;
+
+import java.lang.annotation.*;
+
+/**
+ * Implementation is guaranteed to be free of race conditions
+ * when accessed by multiple threads simultaneously.
+ *
+ * @author Tibor Digana (tibor17)
+ * @version 4.12
+ * @since 4.12
+ */
+@Documented
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface ThreadSafe {
+}

Diff for: src/main/java/org/junit/runner/notification/SynchronizedRunListener.java

@@ -4,12 +4,17 @@
 import org.junit.runner.Result;
 
 /**
- * SynchronizedRunListener decorates {@link RunListener} and
- * has all methods synchronized.
+ * SynchronizedRunListener decorates {@link RunListener}, has all methods
+ * synchronized and is <em>not</em> public.
+ * <p>
+ * Due to backward compatibility, this synchronized listener behaves thread
+ * safe as {@link RunListener} in the old synchronized {@link RunNotifier}.
  *
  * @author Tibor Digana (tibor17)
  * @version 4.12
  * @since 4.12
+ *
+ * @see RunNotifier
  */
 @Concurrent
 final class SynchronizedRunListener extends RunListener {

Diff for: src/test/java/org/junit/runner/notification/SynchronizedRunListenerTest.java

@@ -1,5 +1,3 @@
-// Copyright 2013 Google Inc. All Rights Reserved.
-
 package org.junit.runner.notification;
 
 import static org.hamcrest.CoreMatchers.instanceOf;

Diff for: src/test/java/org/junit/tests/AllTests.java

@@ -173,8 +173,8 @@
         StopwatchTest.class,
         RunNotifierTest.class,
         ConcurrentRunNotifierTest.class,
-        SynchronizedRunListenerTest.class,
-        AddRemoveListenerTest.class
+        AddRemoveListenerTest.class,
+        SynchronizedRunListenerTest.class
 })
 public class AllTests {
     public static Test suite() {