You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by el...@apache.org on 2018/10/11 15:02:57 UTC
[2/3] hbase git commit: HBASE-21281 Upgrade bouncycastle to latest
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 <md...@apache.org>
Signed-off-by: Ted Yu <te...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/a0600089
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/a0600089
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/a0600089
Branch: refs/heads/branch-2.0
Commit: a06000895fe8682495e5808e3f694cba184cfb3a
Parents: aca3509
Author: Josh Elser <el...@apache.org>
Authored: Tue Oct 9 13:06:10 2018 -0400
Committer: Josh Elser <el...@apache.org>
Committed: Thu Oct 11 10:58:23 2018 -0400
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/a0600089/hbase-endpoint/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml
index 0633ce9..1f201ed 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 -->
http://git-wip-us.apache.org/repos/asf/hbase/blob/a0600089/hbase-http/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml
index 761ac69..0f2842c 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>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a0600089/hbase-server/pom.xml
----------------------------------------------------------------------
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index eef86aa..2fb433f 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -532,11 +532,6 @@
<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>
<scope>test</scope>
http://git-wip-us.apache.org/repos/asf/hbase/blob/a0600089/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 9999a8d..b0dfb48 100755
--- a/pom.xml
+++ b/pom.xml
@@ -1377,7 +1377,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>
@@ -1993,7 +1993,7 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-jdk16</artifactId>
+ <artifactId>bcprov-jdk15on</artifactId>
<version>${bouncycastle.version}</version>
<scope>test</scope>
</dependency>