From fedaedd6a1a855456dd3ac062d5b884aa8b5c214 Mon Sep 17 00:00:00 2001
From: Josh Elser <elserj@apache.org>
Date: Tue, 9 Oct 2018 13:06:10 -0400
Subject: [PATCH] HBASE-21281 Upgrade bouncycastle to latest

BC 1.47 introduced some incompatible API changes which came in via
a new Maven artifact. We don't use any changed API in HBase. This
also removes some unnecessary dependencies on bcprov in other
modules (presumably, they are vestiges)

Signed-off-by: Mike Drob <mdrob@apache.org>
Signed-off-by: Ted Yu <tedyu@apache.org>
---
 hbase-endpoint/pom.xml | 6 ------
 hbase-http/pom.xml     | 2 +-
 hbase-server/pom.xml   | 5 -----
 pom.xml                | 4 ++--
 4 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml
index 573fa19190f..154d0741414 100644
--- a/hbase-endpoint/pom.xml
+++ b/hbase-endpoint/pom.xml
@@ -229,12 +229,6 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <!-- Some tests rely on Hadoop's KeyStoreTestUtil, which needs bc. -->
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk16</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
   <profiles>
     <!-- Skip the tests in this module -->
diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml
index e8ea2f33891..8cf5e2a4ce1 100644
--- a/hbase-http/pom.xml
+++ b/hbase-http/pom.xml
@@ -263,7 +263,7 @@
     </dependency>
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk16</artifactId>
+      <artifactId>bcprov-jdk15on</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index c6fc78283ac..ff76c637449 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -537,11 +537,6 @@
       <artifactId>hadoop-minikdc</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.bouncycastle</groupId>
-      <artifactId>bcprov-jdk16</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.apache.kerby</groupId>
       <artifactId>kerb-client</artifactId>
diff --git a/pom.xml b/pom.xml
index f8b9fc95ccd..f05c8f1f51b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1381,7 +1381,7 @@
     <joni.version>2.1.11</joni.version>
     <jcodings.version>1.0.18</jcodings.version>
     <spy.version>2.12.2</spy.version>
-    <bouncycastle.version>1.46</bouncycastle.version>
+    <bouncycastle.version>1.60</bouncycastle.version>
     <kerby.version>1.0.1</kerby.version>
     <commons-crypto.version>1.0.0</commons-crypto.version>
     <curator.version>4.0.0</curator.version>
@@ -2038,7 +2038,7 @@
       </dependency>
       <dependency>
         <groupId>org.bouncycastle</groupId>
-        <artifactId>bcprov-jdk16</artifactId>
+        <artifactId>bcprov-jdk15on</artifactId>
         <version>${bouncycastle.version}</version>
         <scope>test</scope>
       </dependency>