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>
This commit is contained in:
parent
afa7d6ed43
commit
fedaedd6a1
|
@ -229,12 +229,6 @@
|
||||||
<artifactId>mockito-core</artifactId>
|
<artifactId>mockito-core</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</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>
|
</dependencies>
|
||||||
<profiles>
|
<profiles>
|
||||||
<!-- Skip the tests in this module -->
|
<!-- Skip the tests in this module -->
|
||||||
|
|
|
@ -263,7 +263,7 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bouncycastle</groupId>
|
<groupId>org.bouncycastle</groupId>
|
||||||
<artifactId>bcprov-jdk16</artifactId>
|
<artifactId>bcprov-jdk15on</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
|
|
@ -537,11 +537,6 @@
|
||||||
<artifactId>hadoop-minikdc</artifactId>
|
<artifactId>hadoop-minikdc</artifactId>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
|
||||||
<groupId>org.bouncycastle</groupId>
|
|
||||||
<artifactId>bcprov-jdk16</artifactId>
|
|
||||||
<scope>test</scope>
|
|
||||||
</dependency>
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.apache.kerby</groupId>
|
<groupId>org.apache.kerby</groupId>
|
||||||
<artifactId>kerb-client</artifactId>
|
<artifactId>kerb-client</artifactId>
|
||||||
|
|
4
pom.xml
4
pom.xml
|
@ -1381,7 +1381,7 @@
|
||||||
<joni.version>2.1.11</joni.version>
|
<joni.version>2.1.11</joni.version>
|
||||||
<jcodings.version>1.0.18</jcodings.version>
|
<jcodings.version>1.0.18</jcodings.version>
|
||||||
<spy.version>2.12.2</spy.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>
|
<kerby.version>1.0.1</kerby.version>
|
||||||
<commons-crypto.version>1.0.0</commons-crypto.version>
|
<commons-crypto.version>1.0.0</commons-crypto.version>
|
||||||
<curator.version>4.0.0</curator.version>
|
<curator.version>4.0.0</curator.version>
|
||||||
|
@ -2038,7 +2038,7 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.bouncycastle</groupId>
|
<groupId>org.bouncycastle</groupId>
|
||||||
<artifactId>bcprov-jdk16</artifactId>
|
<artifactId>bcprov-jdk15on</artifactId>
|
||||||
<version>${bouncycastle.version}</version>
|
<version>${bouncycastle.version}</version>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
Loading…
Reference in New Issue