This is an automated email from the ASF dual-hosted git repository. opwvhk pushed a commit to branch branch-1.12 in repository https://gitbox.apache.org/repos/asf/avro.git
commit 654eee55395d15e555a777aeda04dc2622beaa04 Author: Oscar Westra van Holthe - Kind <[email protected]> AuthorDate: Thu Jun 12 15:24:32 2025 +0200 AVRO-4154: Make tools jar multi-release (#3406) Some dependencies use multi-release jars. This change ensures they are included fully. (cherry picked from commit c143258a49a03de0c77e9f1a7532c33f11c6bab7) --- lang/java/tools/pom.xml | 4 ++++ share/docker/Dockerfile | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/lang/java/tools/pom.xml b/lang/java/tools/pom.xml index 9301944fef..ce3811bc0d 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> diff --git a/share/docker/Dockerfile b/share/docker/Dockerfile index 41b1e6368c..3bb45bc25c 100644 --- a/share/docker/Dockerfile +++ b/share/docker/Dockerfile @@ -211,7 +211,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
