Merge branch '2.17'

FasterXML · Dec 20, 2023 · 6a19bc4 · 6a19bc4
2 parents baa5069 + fc337c4
commit 6a19bc4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...ion/failing/UncaughtException303Test.java → ...n/dataformat/ion/DatabindRead303Test.java b/...ion/failing/UncaughtException303Test.java → ...n/dataformat/ion/DatabindRead303Test.java
@@ -1,4 +1,4 @@
-package tools.jackson.dataformat.ion.failing;
+package tools.jackson.dataformat.ion;
 
 import java.net.URL;
 
@@ -9,7 +9,7 @@
 
 import static org.junit.Assert.*;
 
-public class UncaughtException303Test
+public class DatabindRead303Test
 {
     private final IonObjectMapper MAPPER = IonObjectMapper.builder().build();
 
@@ -22,8 +22,9 @@ public void testUncaughtException303() throws Exception
             MAPPER.readTree(poc);
             fail("Should not pass with invalid content");
         } catch (StreamReadException e) {
-            // !!! TODO: change to match what we actually expect
-            verifyException(e, "MATCH MESSAGE");
+            // 19-Dec-2023, tatu: Looks like message depends on ion-java version,
+            //     cannot easily verify
+            // verifyException(e, "Value exceeds the length of its parent container");
         }
     }
 

diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -28,6 +28,11 @@ Active maintainers:
  (fix contributed by Arthur C)
 -(ion) Update `com.amazon.ion:ion-java` to 1.11.0 (from 1.10.5)
 
+2.16.1 (not yet released)
+
+#303: `NullPointerException` in `IonParser.nextToken()`
+ (reported by @ZanderHuang)
+
 2.16.0 (15-Nov-2023)
 
 #400: (avro) Rewrite Avro buffer recycling (`ApacheCodecRecycler.java`) to