commit 0577986151ad3f6c66be24e20bc1e2869b1fe87a
author Pete Bentley <prb@google.com> Wed Apr 13 11:54:29 2022 +0000
committer Pete Bentley <prb@google.com> Wed Apr 13 11:54:29 2022 +0000
tree c5eb9168a7c0c20cf88179d9e6273fd49f999932
parent 1e24ad219694fc0f449451a039788e147ff85e71

Revert "Merge Conscrypt Upstream master."

This reverts commit 1e24ad219694fc0f449451a039788e147ff85e71.

Reason for revert: Need to resubmit this as multiple CLs to allow selective cherry-picking to Mainline branches.

Change-Id: Idb762f8469618b83ca17c09fd84bd19edbc8ed67

build.gradle

diff --git a/build.gradle b/build.gradle
index 52afe3c..08b9ebd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -110,7 +110,7 @@
                 // Test dependencies.
                 bouncycastle_apis: 'org.bouncycastle:bcpkix-jdk15on:1.63',
                 bouncycastle_provider: 'org.bouncycastle:bcprov-jdk15on:1.63',
-                junit  : 'junit:junit:4.13.2',
+                junit  : 'junit:junit:4.12',
                 mockito: 'org.mockito:mockito-core:2.28.2',
                 truth  : 'com.google.truth:truth:1.0',