Skip to content

Fix: Shade jackson-annotations and jackson-core to avoid classpath conflicts #11335

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

Open
anqorithm wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −1
Open

Fix: Shade jackson-annotations and jackson-core to avoid classpath conflicts #11335

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
9 changes: 8 additions & 1 deletion core/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ tasks.japicmp {

configurations.all {
resolutionStrategy {
force 'com.fasterxml.jackson.core:jackson-annotations:2.18.4'
force 'com.fasterxml.jackson.core:jackson-core:2.18.4'
force 'com.fasterxml.jackson.core:jackson-databind:2.18.4'
force 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.4'
}
Expand Down Expand Up @@ -83,12 +85,17 @@ dependencies {
api platform('com.github.docker-java:docker-java-bom:3.7.0')
shaded platform('com.github.docker-java:docker-java-bom:3.7.0')

api "com.github.docker-java:docker-java-api"
api("com.github.docker-java:docker-java-api") {
exclude group: 'com.fasterxml.jackson.core', module: 'jackson-annotations'
}

shaded('com.github.docker-java:docker-java-core') {
exclude group: 'com.google.guava', module: 'guava'
}

shaded 'com.fasterxml.jackson.core:jackson-annotations:2.18.4'
shaded 'com.fasterxml.jackson.core:jackson-core:2.18.4'

api 'com.github.docker-java:docker-java-transport-zerodep'

shaded 'com.google.guava:guava:33.3.1-jre'
Expand Down
14 changes: 14 additions & 0 deletions core/src/jarFileTest/java/org/testcontainers/JarFileShadingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,20 @@ void testMetaInfServices() throws Exception {
.allMatch(it -> it.startsWith("org.testcontainers."));
}

@Test
void testJacksonAnnotationsAreShaded() throws Exception {
Path jacksonAnnotations = root.resolve("org/testcontainers/shaded/com/fasterxml/jackson/annotation");
assertThat(Files.exists(jacksonAnnotations))
.as("Jackson annotations should be shaded to avoid classpath conflicts")
.isTrue();
}

@Test
void testJacksonCoreIsShaded() throws Exception {
Path jacksonCore = root.resolve("org/testcontainers/shaded/com/fasterxml/jackson/core");
assertThat(Files.exists(jacksonCore)).as("Jackson core should be shaded to avoid classpath conflicts").isTrue();
}

private ListAssert<String> assertThatFileList(Path path) throws IOException {
return (ListAssert) assertThat(Files.list(path))
.extracting(Path::getFileName)
Expand Down