From e4f0f298e9d2606319a0775db154378628a8554e Mon Sep 17 00:00:00 2001 From: David Morris Date: Mon, 26 Oct 2026 16:44:55 +0000 Subject: [PATCH 1/3] patch shaded Bouncy Castle dependencies Pin bcprov, bcutil and bcpkix (jdk18on) together at 1.86 in the core shaded build and allow the LICENSE.md resource the newer jars ship. Originally proposed in #12139; rebased onto main after #12138 with the conflicting force block and JarFileShadingTest list merged. Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_015e4ZbVcQMuDUob7DCLdUHm --- core/build.gradle | 3 +++ .../java/org/testcontainers/JarFileShadingTest.java | 1 + 2 files changed, 4 insertions(+) diff --git a/core/build.gradle b/core/build.gradle index 4a09d594e31..1085c5c1717 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -59,6 +59,9 @@ configurations.all { force 'com.fasterxml.jackson.core:jackson-core:2.18.12' force 'com.fasterxml.jackson.core:jackson-databind:2.18.12' force 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.12' + force 'org.bouncycastle:bcprov-jdk18on:1.86' + force 'org.bouncycastle:bcutil-jdk18on:1.86' + force 'org.bouncycastle:bcpkix-jdk18on:1.86' } } diff --git a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java index 40a82d54e92..837a0e57729 100644 --- a/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java +++ b/core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java @@ -28,6 +28,7 @@ void testMetaInf() throws Exception { "native-image", "Schubfach-LICENSE", "FastDoubleParser-ThirdParty-LICENSE", + "LICENSE.md", "FastDoubleParser-LICENSE" ); } From d17f9e4a74462c2230f457a4dd718dff6f34df85 Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 14 Nov 2026 11:41:11 +0000 Subject: [PATCH 2/3] Note when to drop the Bouncy Castle forces Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_015e4ZbVcQMuDUob7DCLdUHm --- core/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/core/build.gradle b/core/build.gradle index 1085c5c1717..9bc8ed9fc40 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -59,6 +59,7 @@ configurations.all { force 'com.fasterxml.jackson.core:jackson-core:2.18.12' force 'com.fasterxml.jackson.core:jackson-databind:2.18.12' force 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.12' + // docker-java-core still pulls in Bouncy Castle 1.82. Remove these forces once a docker-java release ships 1.86 or newer. force 'org.bouncycastle:bcprov-jdk18on:1.86' force 'org.bouncycastle:bcutil-jdk18on:1.86' force 'org.bouncycastle:bcpkix-jdk18on:1.86' From 61a8489d327b3f4295f56945c48b76bb4ba5ab5b Mon Sep 17 00:00:00 2001 From: Claude Date: Sat, 14 Nov 2026 11:43:16 +0000 Subject: [PATCH 3/3] Reference the upstream docker-java Bouncy Castle bump Co-Authored-By: Claude Opus 5.5 Claude-Session: https://claude.ai/code/session_015e4ZbVcQMuDUob7DCLdUHm --- core/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/build.gradle b/core/build.gradle index 9bc8ed9fc40..06d79e66e28 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -59,7 +59,7 @@ configurations.all { force 'com.fasterxml.jackson.core:jackson-core:2.18.12' force 'com.fasterxml.jackson.core:jackson-databind:2.18.12' force 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.12' - // docker-java-core still pulls in Bouncy Castle 1.82. Remove these forces once a docker-java release ships 1.86 or newer. + // docker-java-core still pulls in Bouncy Castle 1.82. Remove these forces once a docker-java release ships 1.86 or newer (docker-java/docker-java#2696). force 'org.bouncycastle:bcprov-jdk18on:1.86' force 'org.bouncycastle:bcutil-jdk18on:1.86' force 'org.bouncycastle:bcpkix-jdk18on:1.86'