Merge branch '2.x' into 3.0

Author: cowtowncoder

cbor/src/main/java/tools/jackson/dataformat/cbor/CBORParser.java

@@ -3378,6 +3378,25 @@ protected void _skipIncomplete() throws JacksonException
                 && type != CBORConstants.MAJOR_TYPE_BYTES) {
             _throwInternal();
         }
+
+        // [dataformats-binary#599]: If we are in a stringref namespace, we need to
+        // actually read and store the string/bytes value instead of just skipping it,
+        // so that later string references can find it.
+        // The finish methods will determine if the value should be added to the
+        // reference table based on shouldReferenceString().
+        if (!_stringRefs.empty()) {
+            if (type == CBORConstants.MAJOR_TYPE_TEXT) {
+                // Need to actually read the text (which may add to stringRefs)
+                _finishTextToken(_typeByte);
+            } else {
+                // For bytes: decode length then read (which may add to stringRefs)
+                int len = _decodeExplicitLength(_typeByte & 0x1F);
+                _finishBytes(len);
+            }
+            return;
+        }
+
+        // Standard skip logic when not in stringref namespace
         final int lowBits = _typeByte & 0x1F;
         if (lowBits <= 23) {
             if (lowBits > 0) {

cbor/src/test/java/module-info.java

@@ -24,5 +24,5 @@
     opens tools.jackson.dataformat.cbor.seq;
     opens tools.jackson.dataformat.cbor.testutil;
     opens tools.jackson.dataformat.cbor.testutil.failure;
-    opens tools.jackson.dataformat.cbor.tofix;
+    //opens tools.jackson.dataformat.cbor.tofix;
 }

cbor/src/test/java/tools/jackson/dataformat/cbor/tofix/StringRef599Test.java renamed to cbor/src/test/java/tools/jackson/dataformat/cbor/StringRef599Test.java

@@ -1,17 +1,16 @@
-package tools.jackson.dataformat.cbor.tofix;
+package tools.jackson.dataformat.cbor;
 
 import java.util.Arrays;
 
+import org.junit.jupiter.api.Test;
+
 import tools.jackson.core.JsonToken;
 import tools.jackson.databind.ObjectMapper;
 
 import tools.jackson.dataformat.cbor.*;
-import tools.jackson.dataformat.cbor.testutil.failure.JacksonTestFailureExpected;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
-import org.junit.jupiter.api.Test;
-
 public class StringRef599Test extends CBORTestBase
 {
     private final ObjectMapper VANILLA_MAPPER = cborMapper();
@@ -27,7 +26,6 @@ public void testDupsNoStringRef() throws Exception
     }
 
     // [dataformats-binary#599]
-    @JacksonTestFailureExpected
     @Test
     public void testDupsWithStringRef() throws Exception
     {

release-notes/CREDITS-2.x

@@ -422,3 +422,7 @@ Vincent Eigenberger (@beseder1)
  * Contributed fix for #601: Jackson subtype Avro schema unions are non-deterministic
    and therefore incompatible with each other
   (2.20.1)
+
+Yohei Kishimoto (@morokosi)
+ * Reported #599: (cbor) Unable to deserialize stringref-enabled CBOR with ignored properties
+  (2.21.0)

release-notes/VERSION-2.x

@@ -16,7 +16,10 @@ Active maintainers:
 
 2.21.0 (not yet released)
 
-No changes since 2.20
+#599: (cbor) Unable to deserialize stringref-enabled CBOR with ignored properties
+ (reported by Yohei K)
+#623: (ion) Upgrade `ion-java` dep to 1.11.11 (from 1.11.10)
+ (requested by @Shaurya0108)
 
 2.20.1 (not yet released)
 
@@ -26,6 +29,7 @@ No changes since 2.20
  (fix by Vincent E)
 #616: CBOR text gets truncated on decoding
  (reported, fix contributed by Manuel S)
+#623: (ion) Upgrade `ion-java` dep to 1.11.11 (from 1.11.10)
 
 2.20.0 (28-Aug-2025)
 
@@ -53,6 +57,8 @@ No changes since 2.20
  (fix by Vincent E)
 #616: CBOR text gets truncated on decoding
  (reported, fix contributed by Manuel S)
+#623: (ion) Upgrade `ion-java` dep to 1.11.11 (from 1.11.10)
+ (requested by @Shaurya0108)
 
 2.19.2 (18-Jul-2025)
 
@@ -89,6 +95,11 @@ No changes since 2.19.1
 #571: Unable to deserialize a pojo with IonStruct
  (reported, fix contributed by Josh C)
 
+2.18.5 (not yet released)
+
+#623: (ion) Upgrade `ion-java` dep to 1.11.11 (from 1.11.10)
+ (requested by @Shaurya0108)
+
 2.18.4 (06-May-2025)
 
 #569: (ion) `IonParser` fails to parse some `long` values saying