From 74c897c8ef43775e6debfe821c618e8f2ab3170b Mon Sep 17 00:00:00 2001
From: Jared Komoroski <jkomoroski@alianza.com>
Date: Tue, 12 May 2026 09:37:51 -0600
Subject: [PATCH] Correctly relocate the tld dat file to avoid resource
 collisions with the zerodep jar

---
 docker-java-transport-zerodep/pom.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docker-java-transport-zerodep/pom.xml b/docker-java-transport-zerodep/pom.xml
index 3cccafa33..bede6c040 100644
--- a/docker-java-transport-zerodep/pom.xml
+++ b/docker-java-transport-zerodep/pom.xml
@@ -89,6 +89,20 @@
 							<pattern>com.github.dockerjava.httpclient5</pattern>
 							<shadedPattern>com.github.dockerjava.zerodep</shadedPattern>
 						</relocation>
+						<!-- Relocate the public suffix resource so it doesn't conflict with
+						     standalone httpclient5 on the classpath. The standard relocation
+						     renames the resource file; the rawString relocation fixes the
+						     absolute-path string literal ("/org/publicsuffix/...") baked into
+						     PublicSuffixMatcherLoader bytecode by docker-java's own shade pass. -->
+						<relocation>
+							<pattern>org.publicsuffix</pattern>
+							<shadedPattern>com.github.dockerjava.zerodep.shaded.org.publicsuffix</shadedPattern>
+						</relocation>
+						<relocation>
+							<rawString>true</rawString>
+							<pattern>/org/publicsuffix</pattern>
+							<shadedPattern>/com/github/dockerjava/zerodep/shaded/org/publicsuffix</shadedPattern>
+						</relocation>
 					</relocations>
 					<transformers>
 						<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />