Skip to content

Commit 05b64c3

Browse files
committed
Merge branch '2.18' into 2.19
2 parents 8e81ccb + 09e96ac commit 05b64c3

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

pom.xml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,12 @@ com.fasterxml.jackson.core.*;version=${project.version}
197197
<filter>
198198
<artifact>ch.randelshofer:fastdoubleparser</artifact>
199199
<excludes>
200+
<exclude>META-INF/LICENSE</exclude>
201+
<exclude>META-INF/MANIFEST.MF</exclude>
200202
<exclude>META-INF/versions/**/module-info.*</exclude>
203+
<!-- 09-Jun-2025, PJ: [core#1446] Exclude Multi-Release classes
204+
for Java 22 due to issues in Android Linting tool -->
205+
<exclude>META-INF/versions/22/**</exclude>
201206
</excludes>
202207
</filter>
203208
</filters>
@@ -239,10 +244,6 @@ com.fasterxml.jackson.core.*;version=${project.version}
239244
<pattern>META-INF/versions/21/ch/randelshofer/fastdoubleparser</pattern>
240245
<shadedPattern>META-INF/versions/21/com/fasterxml/jackson/core/internal/shaded/fdp/v${project.version.underscore}</shadedPattern>
241246
</relocation>
242-
<relocation>
243-
<pattern>META-INF/versions/22/ch/randelshofer/fastdoubleparser</pattern>
244-
<shadedPattern>META-INF/versions/22/com/fasterxml/jackson/core/internal/shaded/fdp/v${project.version.underscore}</shadedPattern>
245-
</relocation>
246247
</relocations>
247248
</configuration>
248249
</execution>

release-notes/CREDITS-2.x

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,11 @@ Haruki (@stackunderflow111)
470470
when custom characterEscape is used
471471
(2.18.3)
472472
473+
Vincent Biret (@baywet)
474+
* Reported #1446: Invalid package reference to "java.lang.foreign" from
475+
`com.fasterxml.jackson.core:jackson-core` (from `FastDoubleParser`) [Android]
476+
(2.18.5)
477+
473478
Yanming Zhou (@quaff)
474479
* Requested #633: Allow skipping `RS` CTRL-CHAR to support JSON Text Sequences
475480
(2.19.0)

release-notes/VERSION-2.x

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ a pure JSON library.
5252
#1433: `JsonParser#getNumberType()` throws `JsonParseException` when
5353
the current token is non-numeric instead of returning null
5454
(reported by @CrazySqueak)
55+
#1446: Invalid package reference to "java.lang.foreign" from
56+
`com.fasterxml.jackson.core:jackson-core` (from `FastDoubleParser`) [Android]
57+
(reported by Vincent B)
58+
(fix by @pjfanning)
5559

5660
2.18.4 (06-May-2025)
5761

0 commit comments

Comments
 (0)