From ed2f77a9f5468a2b331bf77384d6970553ea2630 Mon Sep 17 00:00:00 2001
From: Sebastian Baunsgaard <baunsgaard@apache.org>
Date: Thu, 25 Jun 2026 09:22:19 +0000
Subject: [PATCH 1/2] Bump jackson core/databind/annotations to 2.15.4

Align the full jackson trio on 2.15.4, the latest patch in the 2.15.x
line. Previously only jackson-databind was declared (2.15.2) while
jackson-core and jackson-annotations were resolved transitively, leaving
the trio open to a core/databind/annotations skew.

The version stays in the 2.15.x line on purpose: Spark 3.5.7 ships
jackson-module-scala 2.15.2, which rejects any jackson-databind outside
[2.15.0, 2.16.0) at runtime. Bumping databind beyond that range makes
RDDOperationScope$ fail to initialize and breaks every Spark-touching
path, so 2.15.4 is the highest safe bump while Spark 3.5.x is pinned.
---
 pom.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 5762dc2289e..cb3118358ce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1433,10 +1433,26 @@
 			<version>1.4</version>
 		</dependency>
 
+		<!-- Keep the jackson trio aligned on the same patch. The version is
+		     capped at 2.15.x because Spark 3.5.x ships jackson-module-scala
+		     2.15.x, which rejects any jackson-databind outside [2.15.0, 2.16.0)
+		     at runtime. 2.15.4 is the latest patch in that line. -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.15.4</version>
+		</dependency>
+
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.15.2</version>
+			<version>2.15.4</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-annotations</artifactId>
+			<version>2.15.4</version>
 		</dependency>
 
 		<dependency>

From afd48999d11cf227445bc97a5741c0c72ad47faf Mon Sep 17 00:00:00 2001
From: Sebastian Baunsgaard <baunsgaard@apache.org>
Date: Thu, 25 Jun 2026 11:05:05 +0000
Subject: [PATCH 2/2] Extract jackson version to a pom property

Introduce a jackson.version property (2.15.4) and reference it from the
jackson-core, jackson-databind, and jackson-annotations dependencies so
the trio stays aligned from a single place.
---
 pom.xml | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index cb3118358ce..cfd3d8464fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
 		<antlr.version>4.8</antlr.version>
 		<protobuf.version>3.23.4</protobuf.version>
 		<spark.version>3.5.7</spark.version>
+		<jackson.version>2.15.4</jackson.version>
 		<scala.version>2.12.18</scala.version>
 		<scala.binary.version>2.12</scala.binary.version>
 		<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss z</maven.build.timestamp.format>
@@ -1433,26 +1434,22 @@
 			<version>1.4</version>
 		</dependency>
 
-		<!-- Keep the jackson trio aligned on the same patch. The version is
-		     capped at 2.15.x because Spark 3.5.x ships jackson-module-scala
-		     2.15.x, which rejects any jackson-databind outside [2.15.0, 2.16.0)
-		     at runtime. 2.15.4 is the latest patch in that line. -->
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-core</artifactId>
-			<version>2.15.4</version>
+			<version>${jackson.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.15.4</version>
+			<version>${jackson.version}</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
-			<version>2.15.4</version>
+			<version>${jackson.version}</version>
 		</dependency>
 
 		<dependency>