Skip to content

Commit c143258

Browse files
authored
AVRO-4154: Make tools jar multi-release (#3406)
Some dependencies use multi-release jars. This change ensures they are included fully.
1 parent f131a5c commit c143258

File tree

2 files changed

+4
-1
lines changed

2 files changed

+4
-1
lines changed

lang/java/tools/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,10 @@
124124
<transformer
125125
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
126126
<mainClass>org.apache.avro.tool.Main</mainClass>
127+
<manifestEntries>
128+
<!-- Needed because some dependencies (at least dnsjava) use multi-release jars. -->
129+
<Multi-Release>true</Multi-Release>
130+
</manifestEntries>
127131
</transformer>
128132
<transformer implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
129133
</transformers>

share/docker/Dockerfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ RUN case "${BUILDARCH:?}" in \
202202
RUN python3 -m pip install --upgrade pip setuptools wheel \
203203
&& python3 -m pip install tox zstandard
204204

205-
206205
# Install Ruby
207206
RUN apt-get -qqy install ruby-full \
208207
&& apt-get -qqy clean

0 commit comments

Comments
 (0)