Merge branch '3.0' into 3.x

Author: cowtowncoder

release-notes/VERSION-2.x

@@ -16,7 +16,7 @@ Project: jackson-databind
   customizability
  (contributed by @wrongwrong)
 
-2.20.1 (not yet released)
+2.20.1 (30-Oct-2025)
 
 #5292: `MapperFeature.FIX_FIELD_NAME_UPPER_CASE_PREFIX` does not work with
   Constructor parameters
@@ -71,6 +71,11 @@ Project: jackson-databind
   with `ObjectMapper`, prepare for 3.0)
 - Generate SBOMs [JSTEP-14]
 
+2.19.4 (29-Oct-2025)
+2.19.3 (29-Oct-2025)
+
+No changes since 2.19.2
+
 2.19.2 (18-Jul-2025)
 
 #5202: `JsonSetter.contentNulls` ignored for `Object[]`, `String[]`
@@ -175,6 +180,10 @@ Project: jackson-databind
 #5069: Add copy-constructor for `MappingIterator`
  (contributed by @wrongwrong)
 
+2.18.5 (27-Oct-2025)
+
+No changes since 2.18.4
+
 2.18.4 (06-May-2025)
 
 #4628: `@JsonIgnore` and `@JsonProperty.access=READ_ONLY` on Record property

src/test/java/tools/jackson/databind/misc/ParsingContext2525Test.java

@@ -1,7 +1,5 @@
 package tools.jackson.databind.misc;
 
-import java.io.IOException;
-
 import org.junit.jupiter.api.Test;
 
 import tools.jackson.core.*;
@@ -72,7 +70,7 @@ public void testFullDocWithBuffer() throws Exception
         }
     }
 
-    private TokenBuffer _readAsTokenBuffer(String doc) throws IOException
+    private TokenBuffer _readAsTokenBuffer(String doc)
     {
         try (JsonParser p = MAPPER.createParser(doc)) {
             p.nextToken();

src/test/java/tools/jackson/databind/misc/PropertyMismatch5372Test.java

@@ -0,0 +1,70 @@
+package tools.jackson.databind.misc;
+
+import java.io.StringReader;
+import java.io.ByteArrayInputStream;
+import java.nio.charset.StandardCharsets;
+
+import org.junit.jupiter.api.Test;
+
+import tools.jackson.databind.ObjectMapper;
+import tools.jackson.databind.testutil.DatabindTestUtil;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+// [databind#5372]: Property name mismatch problem,
+// caused by [core#1491]; verify that databind usage fixed as well
+public class PropertyMismatch5372Test extends DatabindTestUtil
+{
+    static class TestObject5372 {
+        private String aaaabbbbcccc;
+        private String aaaabbbbcccc2;
+
+        public String getAaaabbbbcccc2() {
+            return aaaabbbbcccc2;
+        }
+
+        public void setAaaabbbbcccc2(String aaaabbbbcccc2) {
+            this.aaaabbbbcccc2 = aaaabbbbcccc2;
+        }
+
+        public String getAaaabbbbcccc() {
+            return aaaabbbbcccc;
+        }
+
+        public void setAaaabbbbcccc(String aaaabbbbcccc) {
+            this.aaaabbbbcccc = aaaabbbbcccc;
+        }
+    }
+
+    private final String KEY_1 = "aaaabbbbcccc";
+    private final String KEY_2 = "aaaabbbbcccc2";
+
+    private final String DOC_5372 = """
+{
+"%s": "v3",
+"%s": "v4"
+}
+""".formatted(KEY_1, KEY_2);
+
+    private final ObjectMapper MAPPER = newJsonMapper();
+
+    @Test
+    void testIssue5372Bytes() throws Exception
+    {
+        final byte[] bytes = DOC_5372.getBytes(StandardCharsets.UTF_8);
+        _assert5372(MAPPER.readValue(bytes, TestObject5372.class));
+        _assert5372(MAPPER.readValue(new ByteArrayInputStream(bytes), TestObject5372.class));
+    }
+
+    @Test
+    void testIssue5372Chars() throws Exception
+    {
+        _assert5372(MAPPER.readValue(DOC_5372, TestObject5372.class));
+        _assert5372(MAPPER.readValue(new StringReader(DOC_5372), TestObject5372.class));
+    }
+
+    private void _assert5372(TestObject5372 result) {
+        assertEquals("v3", result.getAaaabbbbcccc());
+        assertEquals("v4", result.getAaaabbbbcccc2());
+    }
+}