This is an automated email from the ASF dual-hosted git repository. zhangduo pushed a commit to branch branch-2.4 in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push: new 207dc36be61 HBASE-22138 Undo our direct dependence on protos in google.protobuf.Any in Procedure.proto (#5411) 207dc36be61 is described below commit 207dc36be615d807921f8a70dc7e724eb58d64b4 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> (cherry picked from commit eb24001248304e53c6383f309fbfc00a8437b3a1) --- hbase-protocol-shaded/src/main/protobuf/Procedure.proto | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hbase-protocol-shaded/src/main/protobuf/Procedure.proto b/hbase-protocol-shaded/src/main/protobuf/Procedure.proto index c41330729f4..b588f3b954b 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Procedure.proto +++ b/hbase-protocol-shaded/src/main/protobuf/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 "ErrorHandling.proto"; enum ProcedureState { diff --git a/pom.xml b/pom.xml index 002f2f690fd..03264012a0a 100755 --- a/pom.xml +++ b/pom.xml @@ -631,7 +631,7 @@ <wagon.ssh.version>2.12</wagon.ssh.version> <xml.maven.version>1.0.1</xml.maven.version> <spotless.version>2.27.2</spotless.version> - <hbase-thirdparty.version>4.1.4</hbase-thirdparty.version> + <hbase-thirdparty.version>4.1.5</hbase-thirdparty.version> <maven-site.version>3.12.0</maven-site.version> <!-- Coverage properties --> <jacoco.version>0.8.8</jacoco.version>