From 4334a8f9097840cf2d56f5e065489fabdca2cb22 Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Wed, 25 Sep 2024 10:51:21 +0200
Subject: [PATCH 1/5] Test with hbase-thirdparty 4.1.9RC0

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

diff --git a/pom.xml b/pom.xml
index 6df1d2ae7e13..9d28a7e4db4d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -669,7 +669,7 @@
         databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
         hbase-thirdparty.
     -->
-    <hbase-thirdparty.version>4.1.8</hbase-thirdparty.version>
+    <hbase-thirdparty.version>4.1.9</hbase-thirdparty.version>
     <!-- Coverage properties -->
     <jacoco.version>0.8.8</jacoco.version>
     <jacocoArgLine/>
@@ -5097,4 +5097,11 @@
       </properties>
     </profile>
   </profiles>
+  <repositories>
+    <repository>
+      <id>hbase-thirdparty-4.1.9RC0</id>
+      <name>hbase-thirdparty-4.1.9RC0</name>
+      <url>https://repository.apache.org/content/repositories/orgapachehbase-1556/</url>
+    </repository>
+  </repositories>
 </project>

From d379c62fde7967e23556284bbda6cd1771dbc8e9 Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Wed, 25 Sep 2024 11:26:09 +0200
Subject: [PATCH 2/5] Bump internal.protobuf.version

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

diff --git a/pom.xml b/pom.xml
index 9d28a7e4db4d..96990f6386ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -610,7 +610,7 @@
     <external.protoc.version>${external.protobuf.version}</external.protoc.version>
     <!--Version of protobuf that hbase uses internally (we shade our pb)
          Must match what is out in hbase-thirdparty include. -->
-    <internal.protobuf.version>4.26.1</internal.protobuf.version>
+    <internal.protobuf.version>4.28.2</internal.protobuf.version>
     <protobuf.plugin.version>0.6.1</protobuf.plugin.version>
     <thrift.path>thrift</thrift.path>
     <thrift.version>0.14.1</thrift.version>

From 573a1ee5c403fc18852e0d32f1a55dc5d6262473 Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Wed, 25 Sep 2024 11:32:46 +0200
Subject: [PATCH 3/5] reformat protobuf comment

---
 pom.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 96990f6386ee..0a11b1b3d24d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -608,8 +608,10 @@
     <external.protobuf.groupid>com.google.protobuf</external.protobuf.groupid>
     <external.protobuf.version>2.5.0</external.protobuf.version>
     <external.protoc.version>${external.protobuf.version}</external.protoc.version>
-    <!--Version of protobuf that hbase uses internally (we shade our pb)
-         Must match what is out in hbase-thirdparty include. -->
+    <!--
+      Version of protobuf that hbase uses internally (we shade our pb) Must match what is out
+      in hbase-thirdparty include.
+    -->
     <internal.protobuf.version>4.28.2</internal.protobuf.version>
     <protobuf.plugin.version>0.6.1</protobuf.plugin.version>
     <thrift.path>thrift</thrift.path>

From 3eeeb0d4c1814391d0272733f2a1b010ea85deba Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Thu, 26 Sep 2024 11:15:53 +0200
Subject: [PATCH 4/5] spotless:apply

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

diff --git a/pom.xml b/pom.xml
index 0a11b1b3d24d..2d2cdc534782 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1600,6 +1600,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <repositories>
+    <repository>
+      <id>hbase-thirdparty-4.1.9RC0</id>
+      <name>hbase-thirdparty-4.1.9RC0</name>
+      <url>https://repository.apache.org/content/repositories/orgapachehbase-1556/</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.
@@ -5099,11 +5106,4 @@
       </properties>
     </profile>
   </profiles>
-  <repositories>
-    <repository>
-      <id>hbase-thirdparty-4.1.9RC0</id>
-      <name>hbase-thirdparty-4.1.9RC0</name>
-      <url>https://repository.apache.org/content/repositories/orgapachehbase-1556/</url>
-    </repository>
-  </repositories>
 </project>

From ecd95df2ee9a05ac044fba607c4b95b631e22866 Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Fri, 27 Sep 2024 14:37:07 +0200
Subject: [PATCH 5/5] remove staging repository

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

diff --git a/pom.xml b/pom.xml
index 2d2cdc534782..2c6c80896a90 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1600,13 +1600,6 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
-  <repositories>
-    <repository>
-      <id>hbase-thirdparty-4.1.9RC0</id>
-      <name>hbase-thirdparty-4.1.9RC0</name>
-      <url>https://repository.apache.org/content/repositories/orgapachehbase-1556/</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.