From b204f3d52cedb91392f7d175102158bd3c611363 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Tue, 6 May 2025 17:47:48 -0700
Subject: [PATCH 1/8] [maven-release-plugin] prepare for next development
 iteration

---
 avro/pom.xml     | 2 +-
 cbor/pom.xml     | 2 +-
 ion/pom.xml      | 2 +-
 pom.xml          | 6 +++---
 protobuf/pom.xml | 2 +-
 smile/pom.xml    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/avro/pom.xml b/avro/pom.xml
index c03b0b2bb..ced811763 100644
--- a/avro/pom.xml
+++ b/avro/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.18.4</version>
+    <version>2.18.5-SNAPSHOT</version>
   </parent>
   <artifactId>jackson-dataformat-avro</artifactId>
   <name>Jackson dataformat: Avro</name>
diff --git a/cbor/pom.xml b/cbor/pom.xml
index 20e998b77..165bc9a92 100644
--- a/cbor/pom.xml
+++ b/cbor/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.18.4</version>
+    <version>2.18.5-SNAPSHOT</version>
   </parent>
   <artifactId>jackson-dataformat-cbor</artifactId>
   <name>Jackson dataformat: CBOR</name>
diff --git a/ion/pom.xml b/ion/pom.xml
index 1ac8b13a3..c0227302b 100644
--- a/ion/pom.xml
+++ b/ion/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.18.4</version>
+    <version>2.18.5-SNAPSHOT</version>
   </parent>
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformat-ion</artifactId>
diff --git a/pom.xml b/pom.xml
index 93274d90b..3f914e085 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformats-binary</artifactId>
   <name>Jackson dataformats: Binary</name>
-  <version>2.18.4</version>
+  <version>2.18.5-SNAPSHOT</version>
   <packaging>pom</packaging>
   <description>Parent pom for Jackson binary dataformats.
   </description>
@@ -35,7 +35,7 @@
     <connection>scm:git:git@github.com:FasterXML/jackson-dataformats-binary.git</connection>
     <developerConnection>scm:git:git@github.com:FasterXML/jackson-dataformats-binary.git</developerConnection>
     <url>https://github.com/FasterXML/jackson-dataformats-binary</url>
-    <tag>jackson-dataformats-binary-2.18.4</tag>
+    <tag>HEAD</tag>
   </scm>
   <issueManagement>
     <url>https://github.com/FasterXML/jackson-dataformats-binary/issues</url>
@@ -45,7 +45,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- for Reproducible Builds -->
-    <project.build.outputTimestamp>2025-05-07T00:47:07Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-05-07T00:47:48Z</project.build.outputTimestamp>
     
     <!-- 20-Mar-2021, tatu: limit heap for tests to catch some
 	 of "too big allocation" cases
diff --git a/protobuf/pom.xml b/protobuf/pom.xml
index 621e2165f..4c3d64365 100644
--- a/protobuf/pom.xml
+++ b/protobuf/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.18.4</version>
+    <version>2.18.5-SNAPSHOT</version>
   </parent>
   <artifactId>jackson-dataformat-protobuf</artifactId>
   <name>Jackson dataformat: Protobuf</name>
diff --git a/smile/pom.xml b/smile/pom.xml
index f283be776..194715e55 100644
--- a/smile/pom.xml
+++ b/smile/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.18.4</version>
+    <version>2.18.5-SNAPSHOT</version>
   </parent>
   <artifactId>jackson-dataformat-smile</artifactId>
   <name>Jackson dataformat: Smile</name>

From f4bbe00f7b5b2e81a47637a2d1b670d68d23a7c3 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Tue, 6 May 2025 17:51:03 -0700
Subject: [PATCH 2/8] Back to snapshot dep

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3f914e085..60bb93ec3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-base</artifactId>
-    <version>2.18.4</version>
+    <version>2.18.5-SNAPSHOT</version>
   </parent>
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformats-binary</artifactId>

From 36e2eb4c6dbe8a2c59e6a2f6050219e14c5ef8f6 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Thu, 8 May 2025 14:31:18 -0700
Subject: [PATCH 3/8] Fix CI wrt branch restrictions

---
 .github/workflows/main.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d32c849aa..4bdbc6d9a 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,12 +1,11 @@
 name: Build and Deploy Snapshot
 on:
   push:
-    branches:
+    branches: ['2.*']
     paths-ignore:
     - "README.md"
     - "release-notes/*"
   pull_request:
-    branches:
     paths-ignore:
     - "README.md"
     - "release-notes/*"

From 198031ff9617b2f8b70d7885b06c51dff587ef33 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Tue, 27 May 2025 09:47:06 -0700
Subject: [PATCH 4/8] Update snapshot access to Central Portal

---
 .github/workflows/main.yml |  6 +++---
 pom.xml                    | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4bdbc6d9a..c85c8c8b5 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -29,7 +29,7 @@ jobs:
         distribution: 'temurin'
         java-version: ${{ matrix.java_version }}
         cache: 'maven'
-        server-id: sonatype-nexus-snapshots
+        server-id: central-snapshots
         server-username: CI_DEPLOY_USERNAME
         server-password: CI_DEPLOY_PASSWORD
         # See https://github.com/actions/setup-java/blob/v2/docs/advanced-usage.md#Publishing-using-Apache-Maven
@@ -43,8 +43,8 @@ jobs:
     - name: Deploy snapshot
       if: github.event_name != 'pull_request' && matrix.java_version == '8' && endsWith(steps.projectVersion.outputs.version, '-SNAPSHOT')
       env:
-        CI_DEPLOY_USERNAME: ${{ secrets.CI_DEPLOY_USERNAME }}
-        CI_DEPLOY_PASSWORD: ${{ secrets.CI_DEPLOY_PASSWORD }}
+        CI_DEPLOY_USERNAME: ${{ secrets.CENTRAL_DEPLOY_USERNAME }}
+        CI_DEPLOY_PASSWORD: ${{ secrets.CENTRAL_DEPLOY_PASSWORD }}
         # MAVEN_GPG_PASSPHRASE: ${{ secrets.MAVEN_GPG_PASSPHRASE }}
       run: ./mvnw -B -q -ff -DskipTests -ntp source:jar deploy
     - name: Generate code coverage
diff --git a/pom.xml b/pom.xml
index 60bb93ec3..149d46b8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -70,13 +70,13 @@
     </dependency>    
   </dependencies>
 
-  <!-- Alas, need to include snapshot reference since otherwise can not find
-       snapshot of parent... -->
+  <!-- Need to include snapshot reference to find snapshot of parent -->
   <repositories>
+    <!-- 13-May-2025, tatu: now access snapshots via Central Portal -->
     <repository>
-      <id>sonatype-nexus-snapshots</id>
-      <name>Sonatype Nexus Snapshots</name>
-      <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+      <id>central-snapshots</id>
+      <name>Sonatype Central Portal (snapshots)</name>
+      <url>https://central.sonatype.com/repository/maven-snapshots</url>
       <releases><enabled>false</enabled></releases>
       <snapshots><enabled>true</enabled></snapshots>
     </repository>

From acc862aec989e60ce0fbf000a33812de95a947b2 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Thu, 23 Oct 2025 15:13:08 -0700
Subject: [PATCH 5/8] Update ion-java from 1.11.10 to 1.11.11 (#623)

---
 ion/pom.xml                                                  | 2 +-
 .../jackson/dataformat/ion/IonNumberOverflowTest.java        | 4 +++-
 release-notes/VERSION-2.x                                    | 5 +++++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ion/pom.xml b/ion/pom.xml
index c0227302b..207cf888a 100644
--- a/ion/pom.xml
+++ b/ion/pom.xml
@@ -39,7 +39,7 @@ tree model)
     <dependency>
       <groupId>com.amazon.ion</groupId>
       <artifactId>ion-java</artifactId>
-      <version>1.11.10</version>
+      <version>1.11.11</version>
     </dependency>
 
     <!-- Extends Jackson core, databind -->
diff --git a/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonNumberOverflowTest.java b/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonNumberOverflowTest.java
index 8793d3c41..2185c41e1 100644
--- a/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonNumberOverflowTest.java
+++ b/ion/src/test/java/com/fasterxml/jackson/dataformat/ion/IonNumberOverflowTest.java
@@ -81,7 +81,9 @@ public void testLongAsBigIntegerSize() throws Exception {
         BigInteger bigIntLongValue = new BigInteger(Long.MAX_VALUE + "").subtract(BigInteger.TEN);
         IonParser bigIntLongParser = (IonParser) new IonFactory().createParser(bigIntLongValue.toString());
         assertEquals(JsonToken.VALUE_NUMBER_INT, bigIntLongParser.nextToken());
-        assertEquals(JsonParser.NumberType.BIG_INTEGER, bigIntLongParser.getNumberType());
+        // 23-Oct-2025: Ion 1.11.11+ changed behavior: values that fit in long are now
+        //   classified as LONG (was BIG_INTEGER before)
+        assertEquals(JsonParser.NumberType.LONG, bigIntLongParser.getNumberType());
         assertEquals(JsonParser.NumberTypeFP.UNKNOWN, bigIntLongParser.getNumberTypeFP());
         assertEquals(bigIntLongValue.longValue(), bigIntLongParser.getLongValue());
     }    
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index e9db9c84b..ce60b6419 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -14,6 +14,11 @@ Active maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
+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

From 3c7875af054e5b519a8d53da85b239129f9e07d8 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Mon, 27 Oct 2025 09:22:53 -0700
Subject: [PATCH 6/8] Fix #599: handle skipping of CBOR string refs (#627)

---
 .../jackson/dataformat/cbor/CBORParser.java   | 19 ++++++++
 .../dataformat/cbor/StringRef599Test.java     | 44 +++++++++++++++++++
 release-notes/VERSION-2.x                     |  2 +
 3 files changed, 65 insertions(+)
 create mode 100644 cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/StringRef599Test.java

diff --git a/cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java b/cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java
index 52f1d3514..e0e40415b 100644
--- a/cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java
+++ b/cbor/src/main/java/com/fasterxml/jackson/dataformat/cbor/CBORParser.java
@@ -3199,6 +3199,25 @@ protected void _skipIncomplete() throws IOException
                 && 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) {
diff --git a/cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/StringRef599Test.java b/cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/StringRef599Test.java
new file mode 100644
index 000000000..d3cb77ba6
--- /dev/null
+++ b/cbor/src/test/java/com/fasterxml/jackson/dataformat/cbor/StringRef599Test.java
@@ -0,0 +1,44 @@
+package com.fasterxml.jackson.dataformat.cbor;
+
+import java.util.Arrays;
+
+import com.fasterxml.jackson.core.JsonToken;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import org.junit.Test;
+
+public class StringRef599Test extends CBORTestBase
+{
+    private final ObjectMapper VANILLA_MAPPER = cborMapper();
+    private final ObjectMapper REF_MAPPER = cborMapper(cborFactoryBuilder()
+            .enable(CBORGenerator.Feature.STRINGREF)
+            .build());
+
+    // [dataformats-binary#599]
+    @Test
+    public void testDupsNoStringRef() throws Exception
+    {
+        _testStringRef(VANILLA_MAPPER);
+    }
+
+    // [dataformats-binary#599]
+    @Test
+    public void testDupsWithStringRef() throws Exception
+    {
+        _testStringRef(REF_MAPPER);
+    }
+
+    private void _testStringRef(ObjectMapper mapper) throws Exception
+    {
+        byte[] cbor = mapper.writeValueAsBytes(Arrays.asList("foo", "foo"));
+        try (CBORParser p = cborParser(cbor)) {
+             assertToken(JsonToken.START_ARRAY, p.nextToken());
+             assertToken(JsonToken.VALUE_STRING, p.nextToken());
+             // important! Skip String value
+             assertToken(JsonToken.VALUE_STRING, p.nextToken());
+             // equally important; try to check second instance
+             assertEquals("foo", p.getText());
+             assertToken(JsonToken.END_ARRAY, p.nextToken());
+        }
+    }
+}
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index ce60b6419..d4cf9e3c5 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -16,6 +16,8 @@ Active maintainers:
 
 2.18.5 (not yet released)
 
+#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)
 

From 3d0c9aa224b0138719fffcb7620465e3e694bf4b Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Mon, 27 Oct 2025 19:04:51 -0700
Subject: [PATCH 7/8] Prep for 2.18.5 release

---
 pom.xml                   | 2 +-
 release-notes/VERSION-2.x | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 149d46b8a..55252a3c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.fasterxml.jackson</groupId>
     <artifactId>jackson-base</artifactId>
-    <version>2.18.5-SNAPSHOT</version>
+    <version>2.18.5</version>
   </parent>
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformats-binary</artifactId>
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
index d4cf9e3c5..25572b00e 100644
--- a/release-notes/VERSION-2.x
+++ b/release-notes/VERSION-2.x
@@ -14,7 +14,7 @@ Active maintainers:
 === Releases ===
 ------------------------------------------------------------------------
 
-2.18.5 (not yet released)
+2.18.5 (27-Oct-2025)
 
 #599: (cbor) Unable to deserialize stringref-enabled CBOR with ignored properties
  (reported by Yohei K)

From 3552edff8f0eb50fc79ca90b19cfe667b0b927f5 Mon Sep 17 00:00:00 2001
From: Tatu Saloranta <tatu.saloranta@iki.fi>
Date: Mon, 27 Oct 2025 19:05:48 -0700
Subject: [PATCH 8/8] [maven-release-plugin] prepare release
 jackson-dataformats-binary-2.18.5

---
 avro/pom.xml     | 2 +-
 cbor/pom.xml     | 2 +-
 ion/pom.xml      | 2 +-
 pom.xml          | 6 +++---
 protobuf/pom.xml | 2 +-
 smile/pom.xml    | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/avro/pom.xml b/avro/pom.xml
index ced811763..a52b2af4b 100644
--- a/avro/pom.xml
+++ b/avro/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.18.5-SNAPSHOT</version>
+    <version>2.18.5</version>
   </parent>
   <artifactId>jackson-dataformat-avro</artifactId>
   <name>Jackson dataformat: Avro</name>
diff --git a/cbor/pom.xml b/cbor/pom.xml
index 165bc9a92..87f008c87 100644
--- a/cbor/pom.xml
+++ b/cbor/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.18.5-SNAPSHOT</version>
+    <version>2.18.5</version>
   </parent>
   <artifactId>jackson-dataformat-cbor</artifactId>
   <name>Jackson dataformat: CBOR</name>
diff --git a/ion/pom.xml b/ion/pom.xml
index 207cf888a..0d18da1b5 100644
--- a/ion/pom.xml
+++ b/ion/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.18.5-SNAPSHOT</version>
+    <version>2.18.5</version>
   </parent>
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformat-ion</artifactId>
diff --git a/pom.xml b/pom.xml
index 55252a3c4..3ae2a0590 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,7 +9,7 @@
   <groupId>com.fasterxml.jackson.dataformat</groupId>
   <artifactId>jackson-dataformats-binary</artifactId>
   <name>Jackson dataformats: Binary</name>
-  <version>2.18.5-SNAPSHOT</version>
+  <version>2.18.5</version>
   <packaging>pom</packaging>
   <description>Parent pom for Jackson binary dataformats.
   </description>
@@ -35,7 +35,7 @@
     <connection>scm:git:git@github.com:FasterXML/jackson-dataformats-binary.git</connection>
     <developerConnection>scm:git:git@github.com:FasterXML/jackson-dataformats-binary.git</developerConnection>
     <url>https://github.com/FasterXML/jackson-dataformats-binary</url>
-    <tag>HEAD</tag>
+    <tag>jackson-dataformats-binary-2.18.5</tag>
   </scm>
   <issueManagement>
     <url>https://github.com/FasterXML/jackson-dataformats-binary/issues</url>
@@ -45,7 +45,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
     <!-- for Reproducible Builds -->
-    <project.build.outputTimestamp>2025-05-07T00:47:48Z</project.build.outputTimestamp>
+    <project.build.outputTimestamp>2025-10-28T02:05:13Z</project.build.outputTimestamp>
     
     <!-- 20-Mar-2021, tatu: limit heap for tests to catch some
 	 of "too big allocation" cases
diff --git a/protobuf/pom.xml b/protobuf/pom.xml
index 4c3d64365..c0da02298 100644
--- a/protobuf/pom.xml
+++ b/protobuf/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.18.5-SNAPSHOT</version>
+    <version>2.18.5</version>
   </parent>
   <artifactId>jackson-dataformat-protobuf</artifactId>
   <name>Jackson dataformat: Protobuf</name>
diff --git a/smile/pom.xml b/smile/pom.xml
index 194715e55..c315e9d1f 100644
--- a/smile/pom.xml
+++ b/smile/pom.xml
@@ -9,7 +9,7 @@
   <parent>
     <groupId>com.fasterxml.jackson.dataformat</groupId>
     <artifactId>jackson-dataformats-binary</artifactId>
-    <version>2.18.5-SNAPSHOT</version>
+    <version>2.18.5</version>
   </parent>
   <artifactId>jackson-dataformat-smile</artifactId>
   <name>Jackson dataformat: Smile</name>