From 5cd49dcc78a859d302201db333e36fa8659754bd Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Mon, 19 Feb 2024 17:36:24 +0100
Subject: [PATCH 1/3] HBASE-28379 Upgrade thirdparty dep to 4.1.6

Also bump maven-shade-plugin version to support jackson upgrade and JDK21 bytecode class version
65
---
 hbase-examples/pom.xml        |  2 +-
 hbase-protocol-shaded/pom.xml |  2 +-
 hbase-shaded/pom.xml          |  2 +-
 pom.xml                       | 16 +++++++++++++---
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index 5a7d8f957da0..731d9ae1df64 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -33,7 +33,7 @@
     <!--Version of protobuf that hbase uses internally (we shade our pb)
          Must match what is out in hbase-thirdparty include.
     -->
-    <internal.protobuf.version>3.24.3</internal.protobuf.version>
+    <internal.protobuf.version>3.25.2</internal.protobuf.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index b2d9f79bbd08..39ecccc0015d 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -34,7 +34,7 @@
     <!--Version of protobuf that hbase uses internally (we shade our pb)
          Must match what is out in hbase-thirdparty include.
     -->
-    <internal.protobuf.version>3.24.3</internal.protobuf.version>
+    <internal.protobuf.version>3.25.2</internal.protobuf.version>
   </properties>
   <dependencies>
     <!--BE CAREFUL! Any dependency added here needs to be
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 151cc4e49a4b..d87a8c381c5e 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -83,7 +83,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-shade-plugin</artifactId>
-          <version>3.4.1</version>
+          <version>3.5.1</version>
           <executions>
             <execution>
               <id>aggregate-into-a-jar-with-relocated-third-parties</id>
diff --git a/pom.xml b/pom.xml
index b8ac1067cf4a..fd34be238255 100644
--- a/pom.xml
+++ b/pom.xml
@@ -840,8 +840,12 @@
     <httpclient.version>4.5.13</httpclient.version>
     <httpcore.version>4.4.13</httpcore.version>
     <metrics-core.version>3.2.6</metrics-core.version>
-    <jackson.version>2.15.2</jackson.version>
-    <jackson.databind.version>2.15.2</jackson.databind.version>
+    <!--
+      Note that the version of jackson-[annotations,core,databind] must be kept in sync with the
+      version of jackson-jaxrs-json-provider shipped in hbase-thirdparty.
+    -->
+    <jackson.version>2.16.1</jackson.version>
+    <jackson.databind.version>2.16.1</jackson.databind.version>
     <jaxb-api.version>2.3.1</jaxb-api.version>
     <servlet.api.version>3.1.0</servlet.api.version>
     <wx.rs.api.version>2.1.1</wx.rs.api.version>
@@ -909,7 +913,13 @@
     <snappy.version>1.1.10.4</snappy.version>
     <xz.version>1.9</xz.version>
     <zstd-jni.version>1.5.5-2</zstd-jni.version>
-    <hbase-thirdparty.version>4.1.5</hbase-thirdparty.version>
+    <!--
+        Note that the version of protobuf shipped in hbase-thirdparty must match the version used
+        in hbase-protocol-shaded and hbase-examples. The version of jackson-[annotations,core,
+        databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
+        hbase-thirdparty.
+    -->
+    <hbase-thirdparty.version>4.1.6-28374-d2c399f-SNAPSHOT</hbase-thirdparty.version>
     <!-- Coverage properties -->
     <jacoco.version>0.8.8</jacoco.version>
     <jacocoArgLine/>

From 19d2593f81a7ac439880742fefdda8e62886b82b Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Tue, 27 Feb 2024 16:19:22 +0100
Subject: [PATCH 2/3] Switch to staged RC0

---
 pom.xml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index fd34be238255..294a228ac69e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -919,7 +919,7 @@
         databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
         hbase-thirdparty.
     -->
-    <hbase-thirdparty.version>4.1.6-28374-d2c399f-SNAPSHOT</hbase-thirdparty.version>
+    <hbase-thirdparty.version>4.1.6</hbase-thirdparty.version>
     <!-- Coverage properties -->
     <jacoco.version>0.8.8</jacoco.version>
     <jacocoArgLine/>
@@ -1834,6 +1834,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <repositories>
+    <repository>
+      <id>staging</id>
+      <name>staging</name>
+      <url>https://repository.apache.org/content/repositories/orgapachehbase-1533/</url>
+    </repository>
+  </repositories>
   <build>
     <!-- Plugin versions are inherited from ASF parent pom: https://maven.apache.org/pom/asf/
          For specific version use a property and define it in the parent pom.

From 856d3bd7d41c2df55277f69ae0581388c19bf250 Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Mon, 4 Mar 2024 12:34:30 +0100
Subject: [PATCH 3/3] 4.1.6 is released. remove staging repository

---
 pom.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 294a228ac69e..2340f0bbb3ca 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1834,13 +1834,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>staging</id>
-      <name>staging</name>
-      <url>https://repository.apache.org/content/repositories/orgapachehbase-1533/</url>
-    </repository>
-  </repositories>
   <build>
     <!-- Plugin versions are inherited from ASF parent pom: https://maven.apache.org/pom/asf/
          For specific version use a property and define it in the parent pom.