Skip to content

[CTM-480] Update bouncy castle #4908

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
calypsomatic merged 1 commit into from
May 20, 2026
Merged

[CTM-480] Update bouncy castle #4908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions project/Merging.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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") =>
Expand Down
Loading