From e954e8a6068fee61e720731ad3db4afc882971f5 Mon Sep 17 00:00:00 2001 From: Bria Morgan Date: Tue, 19 May 2026 11:33:07 -0400 Subject: [PATCH] update bouncy castle --- project/Dependencies.scala | 6 +++++- project/Merging.scala | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8f69c23a00..f66c31ee28 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -13,6 +13,7 @@ object Dependencies { val slickV = "3.4.1" val nettyCodecHttpV = "4.1.132.Final" val guavaV = "32.1.3-jre" + val bouncyCastleV = "1.84" val monocleV = "3.2.0" val opencensusV = "0.29.0" val munitCatsEffectV = "1.0.7" @@ -133,6 +134,9 @@ object Dependencies { val nettyCodecHttp: ModuleID = "io.netty" % "netty-codec-http" % nettyCodecHttpV val guava: ModuleID = "com.google.guava" % "guava" % guavaV + val bcprov: ModuleID = "org.bouncycastle" % "bcprov-jdk18on" % bouncyCastleV + val bcpkix: ModuleID = "org.bouncycastle" % "bcpkix-jdk18on" % bouncyCastleV + val bcutil: ModuleID = "org.bouncycastle" % "bcutil-jdk18on" % bouncyCastleV val okHttp = "com.squareup.okhttp3" % "okhttp" % "4.12.0" val terraCommonLibV = "1.1.38-SNAPSHOT" @@ -224,7 +228,7 @@ object Dependencies { val ssh: ModuleID = "com.hierynomus" % "sshj" % "0.37.0" % "test" val googleCloudOSLogin = "com.google.cloud" % "google-cloud-os-login" % "2.2.7" % "test" - val commonOverrides = List(nettyCodecHttp) + val commonOverrides = List(nettyCodecHttp, bcprov, bcpkix, bcutil) val automationOverrides = List(guava) val automationDependencies = List( diff --git a/project/Merging.scala b/project/Merging.scala index c3fe17064a..9ea651539c 100644 --- a/project/Merging.scala +++ b/project/Merging.scala @@ -26,9 +26,9 @@ object Merging { case x if x.endsWith("/module-info.class") => MergeStrategy.discard // For the following error: // Error: Deduplicate found different file contents in the following: - // Error: Jar name = bcpkix-jdk18on-1.78.jar, jar org = org.bouncycastle, entry target = META-INF/versions/9/OSGI-INF/MANIFEST.MF - // Error: Jar name = bcprov-jdk18on-1.78.jar, jar org = org.bouncycastle, entry target = META-INF/versions/9/OSGI-INF/MANIFEST.MF - // Error: Jar name = bcutil-jdk18on-1.78.jar, jar org = org.bouncycastle, entry target = META-INF/versions/9/OSGI-INF/MANIFEST.MF + // Error: Jar name = bcpkix-jdk18on-1.84.jar, jar org = org.bouncycastle, entry target = META-INF/versions/9/OSGI-INF/MANIFEST.MF + // Error: Jar name = bcprov-jdk18on-1.84.jar, jar org = org.bouncycastle, entry target = META-INF/versions/9/OSGI-INF/MANIFEST.MF + // Error: Jar name = bcutil-jdk18on-1.84.jar, jar org = org.bouncycastle, entry target = META-INF/versions/9/OSGI-INF/MANIFEST.MF case x if x.endsWith("/OSGI-INF/MANIFEST.MF") => MergeStrategy.first case x if x.contains("bouncycastle") =>