From 06a81d4d31d5b806e59ba52a6eecc3f99adbe06b 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 249b9381deef..4e616a829fc9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -668,7 +668,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/>
@@ -5105,4 +5105,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 0c7e2f382e1bd524009ee32c3c0d20396c380bc5 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 4e616a829fc9..e352421de954 100644
--- a/pom.xml
+++ b/pom.xml
@@ -609,7 +609,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.27.3</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 fdd92fe623695adf3ed97aebf1fb8e75a1372b10 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 e352421de954..5f28b393b715 100644
--- a/pom.xml
+++ b/pom.xml
@@ -607,8 +607,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 aa0adc1dd34f51aecb048aec2040465f31946820 Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Thu, 26 Sep 2024 11:09:21 +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 5f28b393b715..b59f3482b796 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1608,6 +1608,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.
@@ -5107,11 +5114,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 d683d65b84434455980e2fcfc9d91459deebaf2e 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 b59f3482b796..98a09218f448 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1608,13 +1608,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.