Skip to content

Commit 731835b

Browse files
committed
Merge branch '2.20' into 2.x
2 parents 48149b6 + 762a032 commit 731835b

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/StringRef599Test.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import java.util.Arrays;
44

5+
import org.junit.jupiter.api.Test;
6+
57
import com.fasterxml.jackson.core.JsonToken;
68
import com.fasterxml.jackson.databind.ObjectMapper;
79

810
import static org.junit.jupiter.api.Assertions.assertEquals;
911

10-
import org.junit.jupiter.api.Test;
11-
1212
public class StringRef599Test extends CBORTestBase
1313
{
1414
private final ObjectMapper VANILLA_MAPPER = cborMapper();

release-notes/VERSION-2.x

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Active maintainers:
2323

2424
2.20.1 (not yet released)
2525

26+
#599: (cbor) Unable to deserialize stringref-enabled CBOR with ignored properties
27+
(reported by Yohei K)
2628
#601: Jackson subtype Avro schema unions are non-deterministic and therefore
2729
incompatible with each other
2830
(reported by Raphael W)
@@ -51,6 +53,8 @@ Active maintainers:
5153

5254
2.19.3 (not yet released)
5355

56+
#599: (cbor) Unable to deserialize stringref-enabled CBOR with ignored properties
57+
(reported by Yohei K)
5458
#601: Jackson subtype Avro schema unions are non-deterministic and therefore
5559
incompatible with each other
5660
(reported by Raphael W)
@@ -97,6 +101,8 @@ No changes since 2.19.1
97101

98102
2.18.5 (not yet released)
99103

104+
#599: (cbor) Unable to deserialize stringref-enabled CBOR with ignored properties
105+
(reported by Yohei K)
100106
#623: (ion) Upgrade `ion-java` dep to 1.11.11 (from 1.11.10)
101107
(requested by @Shaurya0108)
102108

0 commit comments

Comments
 (0)