HBASE-22138 Undo our direct dependence on protos in google.protobuf.A…

…ny 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 <[email protected]> Signed-off-by: Nihal Jain <[email protected]> (cherry picked from commit eb24001)
apache · Oct 6, 2023 · 845ab10 · 845ab10
1 parent 32a6dfa
commit 845ab10
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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/>