Skip to content

Commit 6affde8

Browse files
committed
Manual merge of pom.xml change
1 parent 8c3cfae commit 6affde8

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,12 @@ com.fasterxml.jackson.core.*;version=${project.version}
192192
<filter>
193193
<artifact>ch.randelshofer:fastdoubleparser</artifact>
194194
<excludes>
195+
<exclude>META-INF/LICENSE</exclude>
196+
<exclude>META-INF/MANIFEST.MF</exclude>
195197
<exclude>META-INF/versions/**/module-info.*</exclude>
198+
<!-- 09-Jun-2025, PJ: [core#1446] Exclude Multi-Release classes
199+
for Java 22 due to issues in Android Linting tool -->
200+
<exclude>META-INF/versions/22/**</exclude>
196201
</excludes>
197202
</filter>
198203
</filters>
@@ -234,10 +239,6 @@ com.fasterxml.jackson.core.*;version=${project.version}
234239
<pattern>META-INF/versions/21/ch/randelshofer/fastdoubleparser</pattern>
235240
<shadedPattern>META-INF/versions/21/com/fasterxml/jackson/core/internal/shaded/fdp/v${project.version.underscore}</shadedPattern>
236241
</relocation>
237-
<relocation>
238-
<pattern>META-INF/versions/22/ch/randelshofer/fastdoubleparser</pattern>
239-
<shadedPattern>META-INF/versions/22/com/fasterxml/jackson/core/internal/shaded/fdp/v${project.version.underscore}</shadedPattern>
240-
</relocation>
241242
</relocations>
242243
</configuration>
243244
</execution>

0 commit comments

Comments
 (0)