From e1489bb4070b4175ebb85dfeb9daba61c27a482c Mon Sep 17 00:00:00 2001
From: Alan Evans <alan@signal.org>
Date: Tue, 16 Mar 2021 14:24:28 -0300
Subject: [PATCH] Exclude junit brought in by spongycastle.

---
 app/witness-verifications.gradle                 |  6 ------
 device-transfer/lib/build.gradle                 | 12 +++++++++---
 device-transfer/lib/witness-verifications.gradle |  6 ------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/witness-verifications.gradle b/app/witness-verifications.gradle
index 30766b6d6..dbe0245f1 100644
--- a/app/witness-verifications.gradle
+++ b/app/witness-verifications.gradle
@@ -390,9 +390,6 @@ dependencyVerification {
         ['javax.inject:javax.inject:1',
          '91c77044a50c481636c32d916fd89c9118a72195390452c81065080f957de7ff'],
 
-        ['junit:junit:4.12',
-         '59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a'],
-
         ['me.leolin:ShortcutBadger:1.1.22',
          'cd1610dc48c5699229502187fdc3b5c5433870d5aab159332121b1f8c1dad8c3'],
 
@@ -408,9 +405,6 @@ dependencyVerification {
         ['org.greenrobot:eventbus:3.0.0',
          '180d4212467df06f2fbc9c8d8a2984533ac79c87769ad883bc421612f0b4e17c'],
 
-        ['org.hamcrest:hamcrest-core:1.3',
-         '66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9'],
-
         ['org.jsoup:jsoup:1.8.3',
          'abeaf34795a4de70f72aed6de5966d2955ec7eb348eeb813324f23c999575473'],
 
diff --git a/device-transfer/lib/build.gradle b/device-transfer/lib/build.gradle
index 5cf0e51d6..2285a21a2 100644
--- a/device-transfer/lib/build.gradle
+++ b/device-transfer/lib/build.gradle
@@ -30,9 +30,15 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation project(':core-util')
     implementation 'com.madgag.spongycastle:core:1.58.0.0'
-    implementation 'com.madgag.spongycastle:prov:1.58.0.0'
-    implementation 'com.madgag.spongycastle:pkix:1.54.0.0'
-    implementation 'com.madgag.spongycastle:pg:1.54.0.0'
+    implementation('com.madgag.spongycastle:prov:1.58.0.0') {
+        exclude group: 'junit'
+    }
+    implementation('com.madgag.spongycastle:pkix:1.54.0.0') {
+        exclude group: 'junit'
+    }
+    implementation('com.madgag.spongycastle:pg:1.54.0.0') {
+        exclude group: 'junit'
+    }
     api 'org.greenrobot:eventbus:3.0.0'
 
     testImplementation 'junit:junit:4.12'
diff --git a/device-transfer/lib/witness-verifications.gradle b/device-transfer/lib/witness-verifications.gradle
index fe3cb05f9..0657a0ed9 100644
--- a/device-transfer/lib/witness-verifications.gradle
+++ b/device-transfer/lib/witness-verifications.gradle
@@ -90,13 +90,7 @@ dependencyVerification {
         ['com.madgag.spongycastle:prov:1.58.0.0',
          '092fd09e7006b0814980513b013d4c2b3ffd24a49a635ab4b2d204bb51af1727'],
 
-        ['junit:junit:4.12',
-         '59721f0805e223d84b90677887d9ff567dc534d7c502ca903c0c2b17f05c116a'],
-
         ['org.greenrobot:eventbus:3.0.0',
          '180d4212467df06f2fbc9c8d8a2984533ac79c87769ad883bc421612f0b4e17c'],
-
-        ['org.hamcrest:hamcrest-core:1.3',
-         '66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9'],
     ]
 }