From 845ab101a5a9f99235cd66587b2179a84f44c3e5 Mon Sep 17 00:00:00 2001
From: Duo Zhang <zhangduo@apache.org>
Date: Fri, 6 Oct 2023 21:45:21 +0800
Subject: [PATCH] HBASE-22138 Undo our direct dependence on protos in
 google.protobuf.Any in Procedure.proto (#5411)

Bump the hbase thirdparty dependency to 4.1.5 where we relocated the proto files in protobuf-java jar
The generated protobuf messages are OK since we do not need to change any non generated java code

Signed-off-by: Nick Dimiduk <ndimiduk@apache.org>
Signed-off-by: Nihal Jain <nihaljain@apache.org>
(cherry picked from commit eb24001248304e53c6383f309fbfc00a8437b3a1)
---
 hbase-protocol-shaded/src/main/protobuf/server/Procedure.proto | 2 +-
 pom.xml                                                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hbase-protocol-shaded/src/main/protobuf/server/Procedure.proto b/hbase-protocol-shaded/src/main/protobuf/server/Procedure.proto
index 8336b5666dc8..addc96cd34c4 100644
--- a/hbase-protocol-shaded/src/main/protobuf/server/Procedure.proto
+++ b/hbase-protocol-shaded/src/main/protobuf/server/Procedure.proto
@@ -24,7 +24,7 @@ option java_generic_services = true;
 option java_generate_equals_and_hash = true;
 option optimize_for = SPEED;
 
-import "google/protobuf/any.proto";
+import "org/apache/hbase/thirdparty/google/protobuf/any.proto";
 import "server/ErrorHandling.proto";
 
 enum ProcedureState {
diff --git a/pom.xml b/pom.xml
index fff91f96d73a..8163bd52f626 100644
--- a/pom.xml
+++ b/pom.xml
@@ -892,7 +892,7 @@
     <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.4</hbase-thirdparty.version>
+    <hbase-thirdparty.version>4.1.5</hbase-thirdparty.version>
     <!-- Coverage properties -->
     <jacoco.version>0.8.8</jacoco.version>
     <jacocoArgLine/>