Revert "Upgrade external/junit to 4.13.2"

Revert submission 1601635

Reason for revert: b/181123058
Reverted Changes:
I8f5cd1266:Remove support for stuck threads
Ifdb59336d:Remove DisableOnDebug (new in 4.12) as it is not s...
I6abae5aed:Extra generic type information to aid certain java...
I5ec909df6:Upgrade external/junit to 4.13.2

Change-Id: Idaddfc2039816a8d7b12c91fdd540b801ab854ff

3 files changed, 14 insertions, 13 deletions

diff --git a/src/main/java/junit/runner/BaseTestRunner.java b/src/main/java/junit/runner/BaseTestRunner.java
index d63fae7..8268323 100644
--- a/src/main/java/junit/runner/BaseTestRunner.java
+++ b/src/main/java/junit/runner/BaseTestRunner.java
@@ -20,8 +20,6 @@ import junit.framework.Test;
 import junit.framework.TestListener;
 import junit.framework.TestSuite;
 
-import org.junit.internal.Throwables;
-
 /**
  * Base class for all test runners.
  * This class was born live on stage in Sardinia during XP2000.
@@ -235,7 +233,6 @@ public abstract class BaseTestRunner implements TestListener {
             setPreferences(new Properties(getPreferences()));
             getPreferences().load(is);
         } catch (IOException ignored) {
-        } catch (SecurityException ignored) {
         } finally {
             try {
                 if (is != null) {
@@ -267,7 +264,11 @@ public abstract class BaseTestRunner implements TestListener {
      * Returns a filtered stack trace
      */
     public static String getFilteredTrace(Throwable e) {
-        return BaseTestRunner.getFilteredTrace(Throwables.getStacktrace(e));
+        StringWriter stringWriter = new StringWriter();
+        PrintWriter writer = new PrintWriter(stringWriter);
+        e.printStackTrace(writer);
+        String trace = stringWriter.toString();
+        return BaseTestRunner.getFilteredTrace(trace);
     }
 
     /**
diff --git a/src/main/java/junit/runner/TestRunListener.java b/src/main/java/junit/runner/TestRunListener.java
index ce5b3d5..b5e22f5 100644
--- a/src/main/java/junit/runner/TestRunListener.java
+++ b/src/main/java/junit/runner/TestRunListener.java
@@ -8,18 +8,18 @@ package junit.runner;
  */
 public interface TestRunListener {
     /* test status constants*/
-    int STATUS_ERROR = 1;
-    int STATUS_FAILURE = 2;
+    public static final int STATUS_ERROR = 1;
+    public static final int STATUS_FAILURE = 2;
 
-    void testRunStarted(String testSuiteName, int testCount);
+    public void testRunStarted(String testSuiteName, int testCount);
 
-    void testRunEnded(long elapsedTime);
+    public void testRunEnded(long elapsedTime);
 
-    void testRunStopped(long elapsedTime);
+    public void testRunStopped(long elapsedTime);
 
-    void testStarted(String testName);
+    public void testStarted(String testName);
 
-    void testEnded(String testName);
+    public void testEnded(String testName);
 
-    void testFailed(int status, String testName, String trace);
+    public void testFailed(int status, String testName, String trace);
 }
diff --git a/src/main/java/junit/runner/Version.java b/src/main/java/junit/runner/Version.java
index 6c7862e..eaf3db7 100644
--- a/src/main/java/junit/runner/Version.java
+++ b/src/main/java/junit/runner/Version.java
@@ -9,7 +9,7 @@ public class Version {
 	}
 
 	public static String id() {
-		return "4.13.3-SNAPSHOT";
+		return "4.12-SNAPSHOT";
 	}
 	
 	public static void main(String[] args) {