Skip to content

Commit eb24001

Browse files
authored
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>
1 parent 7ec0176 commit eb24001

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

hbase-protocol-shaded/src/main/protobuf/server/Procedure.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ option java_generic_services = true;
2424
option java_generate_equals_and_hash = true;
2525
option optimize_for = SPEED;
2626

27-
import "google/protobuf/any.proto";
27+
import "org/apache/hbase/thirdparty/google/protobuf/any.proto";
2828
import "server/ErrorHandling.proto";
2929

3030
enum ProcedureState {

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -898,7 +898,7 @@
898898
<snappy.version>1.1.10.4</snappy.version>
899899
<xz.version>1.9</xz.version>
900900
<zstd-jni.version>1.5.5-2</zstd-jni.version>
901-
<hbase-thirdparty.version>4.1.4</hbase-thirdparty.version>
901+
<hbase-thirdparty.version>4.1.5</hbase-thirdparty.version>
902902
<!-- Coverage properties -->
903903
<jacoco.version>0.8.8</jacoco.version>
904904
<jacocoArgLine/>

0 commit comments

Comments
 (0)