Skip to content

Commit cc2c2e0

Browse files
committed
Merge branch '2.18' into 2.19
2 parents 28db3a2 + 4354604 commit cc2c2e0

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

guava/src/test/java/com/fasterxml/jackson/datatype/guava/ImmutableListAcceptSingle185Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import java.util.List;
44

5-
import com.google.common.collect.ImmutableList;
65
import org.junit.jupiter.api.Test;
76

7+
import com.google.common.collect.ImmutableList;
8+
89
import com.fasterxml.jackson.annotation.JsonFormat;
910
import com.fasterxml.jackson.databind.ObjectMapper;
1011

release-notes/CREDITS-2.x

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,8 @@ Joo Hyuk Kim (JooHyukKim@github)
109109
* Contributed fix for #117: (guava) `ImmutableRangeSet` fails to deserialize
110110
without explicit deserializer
111111
(2.16.0)
112+
* Contributed fix for #185: `ACCEPT_SINGLE_VALUE_AS_ARRAY` doesn't work on Guava `ImmutableList`
113+
(2.18.5)
112114

113115
Ethan McCue (@bowbahdoe)
114116
* Reported #122: PCollections module info (`module-info.class`) incorrect
@@ -134,6 +136,10 @@ Arthur Chan (@arthurscchan)
134136
some circumstances
135137
(2.17.0)
136138

139+
Gergely Juhasz (@JGergely)
140+
* Reported #185: `ACCEPT_SINGLE_VALUE_AS_ARRAY` doesn't work on Guava `ImmutableList`
141+
(2.18.5)
142+
137143
Abhishek Kumar (@Abhishekkr3003)
138144
* Contributed #1: (guava) Add deserialization support for `Table<R, C, V>`
139145
(2.19.0)

release-notes/VERSION-2.x

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,25 @@ Active Maintainers:
2020

2121
-
2222

23+
2.19.1 (not yet released)
24+
25+
#185: `ACCEPT_SINGLE_VALUE_AS_ARRAY` doesn't work on Guava `ImmutableList`
26+
(reported by Gergely J)
27+
(fix contributed by Joo-Hyuk K)
28+
2329
2.19.0 (24-Apr-2025)
2430
2531
#1: (guava) Add deserialization support for `Table<R, C, V>`
2632
(contributed by Abhishek K)
2733
#174: Unify testing structure/tools [JSTEP-10]
2834
(contributed by Joo-Hyuk K)
2935
36+
2.18.5 (not yet released)
37+
38+
#185: `ACCEPT_SINGLE_VALUE_AS_ARRAY` doesn't work on Guava `ImmutableList`
39+
(reported by Gergely J)
40+
(fix contributed by Joo-Hyuk K)
41+
3042
2.18.4 (06-May-2025)
3143
2.18.3 (28-Feb-2025)
3244
2.18.2 (27-Nov-2024)

0 commit comments

Comments
 (0)