diff --git a/dumper/app/build.gradle b/dumper/app/build.gradle index 22f3fde4d..8b25952c6 100644 --- a/dumper/app/build.gradle +++ b/dumper/app/build.gradle @@ -67,6 +67,7 @@ dependencies { // *-over-slf4j bridges used exclude group: "ch.qos.reload4j", module: "reload4j" exclude group: "org.slf4j", module: "slf4j-reload4j" + exclude group: "org.bouncycastle", module: "bcprov-jdk15on" // We use 18, which is the latest and support JDK 1.8+ } //Overrides for hadoop-common transient deps implementation libs.commons.beanutils // explicit version for vulnerabilities update @@ -76,6 +77,7 @@ dependencies { implementation libs.nimbus.jose.jwt // explicit version for vulnerabilities update implementation libs.zookeeper // explicit version for vulnerabilities update implementation libs.common.configuration2 // explicit version for vulnerabilities update + implementation libs.bouncycastle // explicit version for vulnerabilities update implementation libs.hadoop.hdfs.client implementation(libs.harawata.appdirs) { diff --git a/dumper/app/gradle.lockfile b/dumper/app/gradle.lockfile index 7bd7d95dc..34bef6c76 100644 --- a/dumper/app/gradle.lockfile +++ b/dumper/app/gradle.lockfile @@ -220,7 +220,7 @@ org.apache.thrift:libthrift:0.20.0=compileClasspath,runtimeClasspath,testCompile org.apache.yetus:audience-annotations:0.12.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.bouncycastle:bcprov-jdk15on:1.70=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +org.bouncycastle:bcprov-jdk18on:1.82=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.checkerframework:checker-compat-qual:2.5.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.checkerframework:checker-qual:3.51.0=annotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor org.checkerframework:checker-qual:3.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dumper/lib-ext-hive-metastore/build.gradle b/dumper/lib-ext-hive-metastore/build.gradle index 563f2f474..4ae02511a 100644 --- a/dumper/lib-ext-hive-metastore/build.gradle +++ b/dumper/lib-ext-hive-metastore/build.gradle @@ -32,6 +32,7 @@ configurations { // *-over-slf4j bridges used exclude group: "ch.qos.reload4j", module: "reload4j" exclude group: "org.slf4j", module: "slf4j-reload4j" + exclude group: "org.bouncycastle", module: "bcprov-jdk15on" // We use 18, which is the latest and support JDK 1.8+ } } diff --git a/dumper/lib-ext-hive-metastore/gradle.lockfile b/dumper/lib-ext-hive-metastore/gradle.lockfile index 16f513cfa..60a8803f1 100644 --- a/dumper/lib-ext-hive-metastore/gradle.lockfile +++ b/dumper/lib-ext-hive-metastore/gradle.lockfile @@ -243,7 +243,6 @@ org.apache.thrift:libthrift:0.9.3=hive312RuntimeClasspath org.apache.yetus:audience-annotations:0.12.0=hive312RuntimeClasspath org.apache.zookeeper:zookeeper-jute:3.9.4=hive312RuntimeClasspath org.apache.zookeeper:zookeeper:3.9.4=hive312RuntimeClasspath -org.bouncycastle:bcprov-jdk15on:1.70=hive312RuntimeClasspath org.checkerframework:checker-qual:2.5.2=hive312RuntimeClasspath org.checkerframework:checker-qual:3.51.0=annotationProcessor,testAnnotationProcessor,testFixturesAnnotationProcessor org.checkerframework:checker-qual:3.51.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 20c407a36..e588fecc1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -120,6 +120,7 @@ gradle-license-report = { module = "com.github.jk1:gradle-license-report", versi guava = { module = "com.google.guava:guava", version.ref = "guava" } hadoop-auth = { module = "org.apache.hadoop:hadoop-auth", version.ref = "hadoop"} hadoop-common = { module = "org.apache.hadoop:hadoop-common", version.ref = "hadoop" } +bouncycastle = { module = "org.bouncycastle:bcprov-jdk18on", version = "1.82" } common-configuration2 = { module = "org.apache.commons:commons-configuration2", version.ref = "common-configuration2" } nimbus-jose-jwt = { module = "com.nimbusds:nimbus-jose-jwt", version.ref = "nimbus-jose-jwt" } dnsjava = { module = "dnsjava:dnsjava", version.ref = "dnsjava" } diff --git a/gradle/license-allowed.json b/gradle/license-allowed.json index f1a57bbde..b7942836e 100644 --- a/gradle/license-allowed.json +++ b/gradle/license-allowed.json @@ -113,6 +113,10 @@ "moduleLicense": "Bouncy Castle Licence", "moduleName": "org.bouncycastle:bcprov-jdk15on" }, + { + "moduleLicense": "Bouncy Castle Licence", + "moduleName": "org.bouncycastle:bcprov-jdk18on" + }, { "moduleLicense": null, "moduleName": "javax.servlet.jsp:jsp-api"