This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/master by this push:
new eb240012483 HBASE-22138 Undo our direct dependence on protos in
google.protobuf.Any in Procedure.proto (#5411)
eb240012483 is described below
commit eb24001248304e53c6383f309fbfc00a8437b3a1
Author: Duo Zhang <zhang...@apache.org>
AuthorDate: Fri Oct 6 21:45:21 2023 +0800
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 <ndimi...@apache.org>
Signed-off-by: Nihal Jain <nihalj...@apache.org>
---
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 8336b5666dc..addc96cd34c 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 56058b8e2b9..3badb8f2d39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -898,7 +898,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/>
