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/8b66dea2 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/8b66dea2 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/8b66dea2 Branch: refs/heads/master Commit: 8b66dea2ff034315336d7b768f0b7667413e6e3d Parents: db9a5b7 Author: Josh Elser <els...@apache.org> Authored: Tue Oct 9 13:06:10 2018 -0400 Committer: Josh Elser <els...@apache.org> Committed: Thu Oct 11 11:02:32 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/8b66dea2/hbase-endpoint/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml index 8950de1..554a01f 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/8b66dea2/hbase-http/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-http/pom.xml b/hbase-http/pom.xml index 667b3f5..fb70451 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/8b66dea2/hbase-server/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index 473b740..9f1454b 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -538,11 +538,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/8b66dea2/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b4ae6a8..a345088 100755 --- a/pom.xml +++ b/pom.xml @@ -1522,7 +1522,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> @@ -2199,7 +2199,7 @@ </dependency> <dependency> <groupId>org.bouncycastle</groupId> - <artifactId>bcprov-jdk16</artifactId> + <artifactId>bcprov-jdk15on</artifactId> <version>${bouncycastle.version}</version> <scope>test</scope> </dependency>
