From 09a855c9100d58a453f13d12ab83a97e0faa6f11 Mon Sep 17 00:00:00 2001
From: Oscar Westra van Holthe - Kind <opwvhk@apache.org>
Date: Thu, 12 Jun 2025 13:34:19 +0200
Subject: [PATCH 1/2] AVRO-4154: Make tools jar multi-release

Some dependencies use multi-release jars. This change ensures they are
included fully.
---
 lang/java/tools/pom.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/lang/java/tools/pom.xml b/lang/java/tools/pom.xml
index 19cc756e608..50f1bae2a8b 100644
--- a/lang/java/tools/pom.xml
+++ b/lang/java/tools/pom.xml
@@ -124,6 +124,10 @@
                 <transformer
                   implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
                   <mainClass>org.apache.avro.tool.Main</mainClass>
+                  <manifestEntries>
+                    <!-- Needed because some dependencies (at least dnsjava) use multi-release jars. -->
+                    <Multi-Release>true</Multi-Release>
+                  </manifestEntries>
                 </transformer>
                 <transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
               </transformers>

From 20cf505283b125fa3e5e52390c65c4d51e1581aa Mon Sep 17 00:00:00 2001
From: Oscar Westra van Holthe - Kind <opwvhk@apache.org>
Date: Thu, 12 Jun 2025 13:58:55 +0200
Subject: [PATCH 2/2] AVRO-4154: Remove empty line to trigger build

---
 share/docker/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile
index 70bf2275531..11d6fdd0a0d 100644
--- a/share/docker/Dockerfile
+++ b/share/docker/Dockerfile
@@ -202,7 +202,6 @@ RUN case "${BUILDARCH:?}" in \
 RUN python3 -m pip install --upgrade pip setuptools wheel \
  && python3 -m pip install tox zstandard
 
-
 # Install Ruby
 RUN apt-get -qqy install ruby-full \
  && apt-get -qqy clean