From deb026dfd2892c6049c498cbb5e773cf85668d69 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 1a26ba884b43..24691403509d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -907,7 +907,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/>
@@ -4589,4 +4589,11 @@
       </build>
     </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 cea1c20c3ab03520f4209f7c682859617031794b Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Wed, 25 Sep 2024 11:10:50 +0200
Subject: [PATCH 2/5] bump protobuf version in hbase-protocol-shaded and
 hbase-examples

---
 hbase-examples/pom.xml        | 2 +-
 hbase-protocol-shaded/pom.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index 06468980b22c..f0d5adca00a2 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>4.27.3</internal.protobuf.version>
+    <internal.protobuf.version>4.28.2</internal.protobuf.version>
   </properties>
   <dependencies>
     <dependency>
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index ce24ad670fc4..47b1eacabef8 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>4.27.3</internal.protobuf.version>
+    <internal.protobuf.version>4.28.2</internal.protobuf.version>
   </properties>
   <dependencies>
     <!--BE CAREFUL! Any dependency added here needs to be

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

---
 hbase-examples/pom.xml        | 5 +++--
 hbase-protocol-shaded/pom.xml | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index f0d5adca00a2..c39e977cba6a 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -30,8 +30,9 @@
   <name>Apache HBase - Examples</name>
   <description>Examples of HBase usage</description>
   <properties>
-    <!--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>
   </properties>
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 47b1eacabef8..fc80e7d41f57 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -31,8 +31,9 @@
   <description>Shaded protobuf protocol classes used by HBase internally.</description>
   <properties>
     <maven.javadoc.skip>true</maven.javadoc.skip>
-    <!--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>
   </properties>

From 7bb890970749d38df6e37490f3642e24ab9d4701 Mon Sep 17 00:00:00 2001
From: Nick Dimiduk <ndimiduk@apache.org>
Date: Thu, 26 Sep 2024 11:06:50 +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 24691403509d..53c0d9b72adb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1834,6 +1834,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.
@@ -4589,11 +4596,4 @@
       </build>
     </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 b28b7f480ab0933c3a2a6067ec6c30c8864cc003 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 53c0d9b72adb..71b89cc3e163 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1834,13 +1834,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.