Skip to content

Commit 782fb01

Browse files
committed
HBASE-28511 Update hbase-thirdparty to 4.1.7 (#5818)
Signed-off-by: Bryan Beaudreault <bbeaudreault@apache.org> (cherry picked from commit 3539581)
1 parent 505c550 commit 782fb01

6 files changed

Lines changed: 10 additions & 10 deletions

File tree

hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ public static byte[] wrapKey(Configuration conf, String subject, Key key) throws
120120
public static Key unwrapKey(Configuration conf, String subject, byte[] value)
121121
throws IOException, KeyException {
122122
EncryptionProtos.WrappedKey wrappedKey =
123-
EncryptionProtos.WrappedKey.PARSER.parseDelimitedFrom(new ByteArrayInputStream(value));
123+
EncryptionProtos.WrappedKey.parser().parseDelimitedFrom(new ByteArrayInputStream(value));
124124
String algorithm = conf.get(HConstants.CRYPTO_KEY_ALGORITHM_CONF_KEY, HConstants.CIPHER_AES);
125125
Cipher cipher = Encryption.getCipher(conf, algorithm);
126126
if (cipher == null) {
@@ -170,7 +170,7 @@ private static Key getUnwrapKey(Configuration conf, String subject,
170170
public static Key unwrapWALKey(Configuration conf, String subject, byte[] value)
171171
throws IOException, KeyException {
172172
EncryptionProtos.WrappedKey wrappedKey =
173-
EncryptionProtos.WrappedKey.PARSER.parseDelimitedFrom(new ByteArrayInputStream(value));
173+
EncryptionProtos.WrappedKey.parser().parseDelimitedFrom(new ByteArrayInputStream(value));
174174
String algorithm = conf.get(HConstants.CRYPTO_WAL_ALGORITHM_CONF_KEY, HConstants.CIPHER_AES);
175175
Cipher cipher = Encryption.getCipher(conf, algorithm);
176176
if (cipher == null) {

hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3181,7 +3181,7 @@ public static ServerName parseServerNameFrom(final byte[] data) throws Deseriali
31813181
int prefixLen = ProtobufMagic.lengthOfPBMagic();
31823182
try {
31833183
ZooKeeperProtos.Master rss =
3184-
ZooKeeperProtos.Master.PARSER.parseFrom(data, prefixLen, data.length - prefixLen);
3184+
ZooKeeperProtos.Master.parser().parseFrom(data, prefixLen, data.length - prefixLen);
31853185
org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ServerName sn =
31863186
rss.getMaster();
31873187
return ServerName.valueOf(sn.getHostName(), sn.getPort(), sn.getStartCode());

hbase-examples/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<!--Version of protobuf that hbase uses internally (we shade our pb)
3434
Must match what is out in hbase-thirdparty include.
3535
-->
36-
<internal.protobuf.version>3.25.2</internal.protobuf.version>
36+
<internal.protobuf.version>4.26.1</internal.protobuf.version>
3737
</properties>
3838
<dependencies>
3939
<dependency>

hbase-protocol-shaded/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<!--Version of protobuf that hbase uses internally (we shade our pb)
3535
Must match what is out in hbase-thirdparty include.
3636
-->
37-
<internal.protobuf.version>3.25.2</internal.protobuf.version>
37+
<internal.protobuf.version>4.26.1</internal.protobuf.version>
3838
</properties>
3939
<dependencies>
4040
<!--BE CAREFUL! Any dependency added here needs to be

hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ void deserializeFromPB(DataInputStream inputStream) throws IOException {
266266
// read PB and skip padding
267267
int start = inputStream.available();
268268
HFileProtos.FileTrailerProto trailerProto =
269-
HFileProtos.FileTrailerProto.PARSER.parseDelimitedFrom(inputStream);
269+
HFileProtos.FileTrailerProto.parser().parseDelimitedFrom(inputStream);
270270
int size = start - inputStream.available();
271271
inputStream.skip(getTrailerSize() - NOT_PB_SIZE - size);
272272

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,7 @@
814814
modules and cause trouble if we only rely on transitive dependencies.
815815
-->
816816
<netty3.version>3.10.6.Final</netty3.version>
817-
<netty4.version>4.1.100.Final</netty4.version>
817+
<netty4.version>4.1.108.Final</netty4.version>
818818
<!-- end HBASE-15925 default hadoop compatibility values -->
819819
<audience-annotations.version>0.13.0</audience-annotations.version>
820820
<!--
@@ -838,8 +838,8 @@
838838
Note that the version of jackson-[annotations,core,databind] must be kept in sync with the
839839
version of jackson-jaxrs-json-provider shipped in hbase-thirdparty.
840840
-->
841-
<jackson.version>2.16.1</jackson.version>
842-
<jackson.databind.version>2.16.1</jackson.databind.version>
841+
<jackson.version>2.17.0</jackson.version>
842+
<jackson.databind.version>2.17.0</jackson.databind.version>
843843
<jaxb-api.version>2.3.1</jaxb-api.version>
844844
<servlet.api.version>3.1.0</servlet.api.version>
845845
<wx.rs.api.version>2.1.1</wx.rs.api.version>
@@ -912,7 +912,7 @@
912912
databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
913913
hbase-thirdparty.
914914
-->
915-
<hbase-thirdparty.version>4.1.6</hbase-thirdparty.version>
915+
<hbase-thirdparty.version>4.1.7</hbase-thirdparty.version>
916916
<!-- Coverage properties -->
917917
<jacoco.version>0.8.8</jacoco.version>
918918
<jacocoArgLine/>

0 commit comments

Comments
 (0)