From ae62595c3fb28a2d7a88023ee6978ee0c331f51b Mon Sep 17 00:00:00 2001
From: ManyaMehrotra <mmehrotra@cloudera.com>
Date: Tue, 24 Mar 2026 15:32:30 +0530
Subject: [PATCH 1/4] HIVE-29518:Upgrade jackson-core to 2.18.6 due to
 GHSA-72hv-8253-57qq

---
 pom.xml                      | 2 +-
 standalone-metastore/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0ea93db9413f..8a8a0465794a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -154,7 +154,7 @@
     <httpcomponents5.core.version>5.3.4</httpcomponents5.core.version>
     <httpcomponents5.client.version>5.5</httpcomponents5.client.version>
     <ivy.version>2.5.2</ivy.version>
-    <jackson.version>2.16.1</jackson.version>
+    <jackson.version>2.18.6</jackson.version>
     <jamon.plugin.version>2.3.4</jamon.plugin.version>
     <jamon-runtime.version>2.4.1</jamon-runtime.version>
     <javax-servlet.version>3.1.0</javax-servlet.version>
diff --git a/standalone-metastore/pom.xml b/standalone-metastore/pom.xml
index dd0650312ce2..5eb34a8d4fef 100644
--- a/standalone-metastore/pom.xml
+++ b/standalone-metastore/pom.xml
@@ -87,7 +87,7 @@
     <guava.version>22.0</guava.version>
     <hadoop.version>3.4.2</hadoop.version>
     <hikaricp.version>4.0.3</hikaricp.version>
-    <jackson.version>2.16.1</jackson.version>
+    <jackson.version>2.18.6</jackson.version>
     <jexl.version>3.3</jexl.version>
     <javolution.version>5.5.1</javolution.version>
     <junit.version>4.13.2</junit.version>

From 7ad0e24529c1936d12bef1beea1b6db1ffffcb50 Mon Sep 17 00:00:00 2001
From: ManyaMehrotra <mmehrotra@cloudera.com>
Date: Wed, 1 Apr 2026 11:39:07 +0530
Subject: [PATCH 2/4] Updating java.util.concurrent.locks

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

diff --git a/pom.xml b/pom.xml
index 8a8a0465794a..d6ca47de3a9e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -92,7 +92,7 @@
     <test.excludes.additional/>
     <!-- Plugin and Plugin Dependency Versions -->
     <ant.contrib.version>1.0b3</ant.contrib.version>
-    <maven.test.jvm.args>-Xmx2048m -DJETTY_AVAILABLE_PROCESSORS=4 -Duser.country=US -Dio.netty.tryReflectionSetAccessible=true -Djava.locale.providers=COMPAT,CLDR --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.sql/java.sql=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED</maven.test.jvm.args>
+    <maven.test.jvm.args>-Xmx2048m -DJETTY_AVAILABLE_PROCESSORS=4 -Duser.country=US -Dio.netty.tryReflectionSetAccessible=true -Djava.locale.providers=COMPAT,CLDR --add-opens java.base/java.net=ALL-UNNAMED --add-opens java.base/java.util=ALL-UNNAMED --add-opens java.base/java.lang=ALL-UNNAMED --add-opens java.base/java.nio=ALL-UNNAMED --add-opens java.base/java.util.concurrent=ALL-UNNAMED --add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED --add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens java.base/java.util.regex=ALL-UNNAMED --add-opens java.base/java.lang.reflect=ALL-UNNAMED --add-opens java.sql/java.sql=ALL-UNNAMED --add-opens java.base/java.io=ALL-UNNAMED --add-opens java.base/java.text=ALL-UNNAMED</maven.test.jvm.args>
     <maven.checkstyle.plugin.version>3.5.0</maven.checkstyle.plugin.version>
     <maven.build-helper.plugin.version>3.4.0</maven.build-helper.plugin.version>
     <maven.eclipse.plugin.version>2.10</maven.eclipse.plugin.version>

From 6cbf8ef090cffe669f22c05c599d2abf367d766e Mon Sep 17 00:00:00 2001
From: ManyaMehrotra <mmehrotra@cloudera.com>
Date: Wed, 1 Apr 2026 15:22:31 +0530
Subject: [PATCH 3/4] Fix TestRuntimeStatsPersistence failure by adding missing
 setter in OperatorStats

---
 .../java/org/apache/hadoop/hive/ql/stats/OperatorStats.java   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ql/src/java/org/apache/hadoop/hive/ql/stats/OperatorStats.java b/ql/src/java/org/apache/hadoop/hive/ql/stats/OperatorStats.java
index 0cb8bbe58ddb..0c1aaebbfbb1 100644
--- a/ql/src/java/org/apache/hadoop/hive/ql/stats/OperatorStats.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/stats/OperatorStats.java
@@ -57,6 +57,10 @@ public String getOperatorId() {
     return operatorId;
   }
 
+  public void setOperatorId(final String operatorId) {
+    this.operatorId = operatorId;
+  }
+
   @Override
   public String toString() {
     return String.format("OperatorStats %s records: %d", operatorId, outputRecords);

From cce8a3a438c8e61f510fa6274a36401c2a7abb74 Mon Sep 17 00:00:00 2001
From: ManyaMehrotra <mmehrotra@cloudera.com>
Date: Tue, 7 Apr 2026 13:36:27 +0530
Subject: [PATCH 4/4] Adding add-opens for runtime execution

---
 .../src/java/org/apache/hadoop/hive/common/JavaVersionUtils.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/src/java/org/apache/hadoop/hive/common/JavaVersionUtils.java b/common/src/java/org/apache/hadoop/hive/common/JavaVersionUtils.java
index c1584310d0c2..61fe010bf16a 100644
--- a/common/src/java/org/apache/hadoop/hive/common/JavaVersionUtils.java
+++ b/common/src/java/org/apache/hadoop/hive/common/JavaVersionUtils.java
@@ -41,6 +41,7 @@ public static String getAddOpensFlagsIfNeeded() {
       return " --add-opens=java.base/java.net=ALL-UNNAMED" +
           " --add-opens=java.base/java.util=ALL-UNNAMED" +
           " --add-opens=java.base/java.util.concurrent=ALL-UNNAMED" +
+          " --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" +
           " --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" +
           " --add-opens=java.base/java.lang=ALL-UNNAMED" +
           " --add-opens=java.base/java.io=ALL-UNNAMED" +