Skip to content

Commit 21aa4c6

Browse files
[b450547977] update bouncy castle to jdk18 (#1015)
* update bouncy castle to jdk18 * update comments
1 parent bb7c3f4 commit 21aa4c6

File tree

6 files changed

+9
-2
lines changed

6 files changed

+9
-2
lines changed

dumper/app/build.gradle

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ dependencies {
6767
// *-over-slf4j bridges used
6868
exclude group: "ch.qos.reload4j", module: "reload4j"
6969
exclude group: "org.slf4j", module: "slf4j-reload4j"
70+
exclude group: "org.bouncycastle", module: "bcprov-jdk15on" // We use 18, which is the latest and support JDK 1.8+
7071
}
7172
//Overrides for hadoop-common transient deps
7273
implementation libs.commons.beanutils // explicit version for vulnerabilities update
@@ -76,6 +77,7 @@ dependencies {
7677
implementation libs.nimbus.jose.jwt // explicit version for vulnerabilities update
7778
implementation libs.zookeeper // explicit version for vulnerabilities update
7879
implementation libs.common.configuration2 // explicit version for vulnerabilities update
80+
implementation libs.bouncycastle // explicit version for vulnerabilities update
7981

8082
implementation libs.hadoop.hdfs.client
8183
implementation(libs.harawata.appdirs) {

dumper/app/gradle.lockfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ org.apache.thrift:libthrift:0.20.0=compileClasspath,runtimeClasspath,testCompile
220220
org.apache.yetus:audience-annotations:0.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
221221
org.apache.zookeeper:zookeeper-jute:3.9.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
222222
org.apache.zookeeper:zookeeper:3.9.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
223-
org.bouncycastle:bcprov-jdk15on:1.70=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
223+
org.bouncycastle:bcprov-jdk18on:1.82=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
224224
org.checkerframework:checker-compat-qual:2.5.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath
225225
org.checkerframework:checker-qual:3.51.0=annotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor
226226
org.checkerframework:checker-qual:3.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath

dumper/lib-ext-hive-metastore/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ configurations {
3232
// *-over-slf4j bridges used
3333
exclude group: "ch.qos.reload4j", module: "reload4j"
3434
exclude group: "org.slf4j", module: "slf4j-reload4j"
35+
exclude group: "org.bouncycastle", module: "bcprov-jdk15on" // We use 18, which is the latest and support JDK 1.8+
3536
}
3637
}
3738

dumper/lib-ext-hive-metastore/gradle.lockfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,6 @@ org.apache.thrift:libthrift:0.9.3=hive312RuntimeClasspath
243243
org.apache.yetus:audience-annotations:0.12.0=hive312RuntimeClasspath
244244
org.apache.zookeeper:zookeeper-jute:3.9.4=hive312RuntimeClasspath
245245
org.apache.zookeeper:zookeeper:3.9.4=hive312RuntimeClasspath
246-
org.bouncycastle:bcprov-jdk15on:1.70=hive312RuntimeClasspath
247246
org.checkerframework:checker-qual:2.5.2=hive312RuntimeClasspath
248247
org.checkerframework:checker-qual:3.51.0=annotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor
249248
org.checkerframework:checker-qual:3.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath

gradle/libs.versions.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ gradle-license-report = { module = "com.github.jk1:gradle-license-report", versi
120120
guava = { module = "com.google.guava:guava", version.ref = "guava" }
121121
hadoop-auth = { module = "org.apache.hadoop:hadoop-auth", version.ref = "hadoop"}
122122
hadoop-common = { module = "org.apache.hadoop:hadoop-common", version.ref = "hadoop" }
123+
bouncycastle = { module = "org.bouncycastle:bcprov-jdk18on", version = "1.82" }
123124
common-configuration2 = { module = "org.apache.commons:commons-configuration2", version.ref = "common-configuration2" }
124125
nimbus-jose-jwt = { module = "com.nimbusds:nimbus-jose-jwt", version.ref = "nimbus-jose-jwt" }
125126
dnsjava = { module = "dnsjava:dnsjava", version.ref = "dnsjava" }

gradle/license-allowed.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,10 @@
113113
"moduleLicense": "Bouncy Castle Licence",
114114
"moduleName": "org.bouncycastle:bcprov-jdk15on"
115115
},
116+
{
117+
"moduleLicense": "Bouncy Castle Licence",
118+
"moduleName": "org.bouncycastle:bcprov-jdk18on"
119+
},
116120
{
117121
"moduleLicense": null,
118122
"moduleName": "javax.servlet.jsp:jsp-api"

0 commit comments

Comments
 (0)