This is an automated email from the ASF dual-hosted git repository. zhangduo pushed a commit to branch branch-2 in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2 by this push: new f9fb9645ba8 HBASE-28511 Update hbase-thirdparty to 4.1.7 (#5818) (#5840) f9fb9645ba8 is described below commit f9fb9645ba86f3acd34f9bb3c4f230e5217e1e1c Author: Duo Zhang <zhang...@apache.org> AuthorDate: Sun Apr 21 19:37:21 2024 +0800 HBASE-28511 Update hbase-thirdparty to 4.1.7 (#5818) (#5840) Signed-off-by: Bryan Beaudreault <bbeaudrea...@apache.org> (cherry picked from commit 3539581268f2063184044e96518267a9b19b642e) --- .../java/org/apache/hadoop/hbase/security/EncryptionUtil.java | 4 ++-- .../org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 2 +- .../hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.java | 2 +- hbase-protocol-shaded/pom.xml | 2 +- .../java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java | 2 +- pom.xml | 8 ++++---- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java index 6c755f9a94c..04fc5201cc1 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/security/EncryptionUtil.java @@ -120,7 +120,7 @@ public final class EncryptionUtil { public static Key unwrapKey(Configuration conf, String subject, byte[] value) throws IOException, KeyException { EncryptionProtos.WrappedKey wrappedKey = - EncryptionProtos.WrappedKey.PARSER.parseDelimitedFrom(new ByteArrayInputStream(value)); + EncryptionProtos.WrappedKey.parser().parseDelimitedFrom(new ByteArrayInputStream(value)); String algorithm = conf.get(HConstants.CRYPTO_KEY_ALGORITHM_CONF_KEY, HConstants.CIPHER_AES); Cipher cipher = Encryption.getCipher(conf, algorithm); if (cipher == null) { @@ -170,7 +170,7 @@ public final class EncryptionUtil { public static Key unwrapWALKey(Configuration conf, String subject, byte[] value) throws IOException, KeyException { EncryptionProtos.WrappedKey wrappedKey = - EncryptionProtos.WrappedKey.PARSER.parseDelimitedFrom(new ByteArrayInputStream(value)); + EncryptionProtos.WrappedKey.parser().parseDelimitedFrom(new ByteArrayInputStream(value)); String algorithm = conf.get(HConstants.CRYPTO_WAL_ALGORITHM_CONF_KEY, HConstants.CIPHER_AES); Cipher cipher = Encryption.getCipher(conf, algorithm); if (cipher == null) { diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java index b17a18e4346..7c33e123231 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java @@ -3140,7 +3140,7 @@ public final class ProtobufUtil { int prefixLen = ProtobufMagic.lengthOfPBMagic(); try { ZooKeeperProtos.Master rss = - ZooKeeperProtos.Master.PARSER.parseFrom(data, prefixLen, data.length - prefixLen); + ZooKeeperProtos.Master.parser().parseFrom(data, prefixLen, data.length - prefixLen); org.apache.hadoop.hbase.shaded.protobuf.generated.HBaseProtos.ServerName sn = rss.getMaster(); return ServerName.valueOf(sn.getHostName(), sn.getPort(), sn.getStartCode()); diff --git a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.java b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.java index 43cb69bd8c0..f8fa1f6294c 100644 --- a/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.java +++ b/hbase-mapreduce/src/main/java/org/apache/hadoop/hbase/mapreduce/TableSnapshotInputFormatImpl.java @@ -227,7 +227,7 @@ public class TableSnapshotInputFormatImpl { int len = in.readInt(); byte[] buf = new byte[len]; in.readFully(buf); - TableSnapshotRegionSplit split = TableSnapshotRegionSplit.PARSER.parseFrom(buf); + TableSnapshotRegionSplit split = TableSnapshotRegionSplit.parser().parseFrom(buf); this.htd = ProtobufUtil.toTableDescriptor(split.getTable()); this.regionInfo = HRegionInfo.convert(split.getRegion()); List<String> locationsList = split.getLocationsList(); diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml index a1cb280df76..f7ee8668bf5 100644 --- a/hbase-protocol-shaded/pom.xml +++ b/hbase-protocol-shaded/pom.xml @@ -34,7 +34,7 @@ <!--Version of protobuf that hbase uses internally (we shade our pb) Must match what is out in hbase-thirdparty include. --> - <internal.protobuf.version>3.25.2</internal.protobuf.version> + <internal.protobuf.version>4.26.1</internal.protobuf.version> </properties> <dependencies> <!--BE CAREFUL! Any dependency added here needs to be diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java index 2a405197a48..f2071d21abf 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/hfile/FixedFileTrailer.java @@ -269,7 +269,7 @@ public class FixedFileTrailer { // read PB and skip padding int start = inputStream.available(); HFileProtos.FileTrailerProto trailerProto = - HFileProtos.FileTrailerProto.PARSER.parseDelimitedFrom(inputStream); + HFileProtos.FileTrailerProto.parser().parseDelimitedFrom(inputStream); int size = start - inputStream.available(); inputStream.skip(getTrailerSize() - NOT_PB_SIZE - size); diff --git a/pom.xml b/pom.xml index 61f3a228faf..e0e838eec04 100644 --- a/pom.xml +++ b/pom.xml @@ -567,7 +567,7 @@ modules and cause trouble if we only rely on transitive dependencies. --> <netty3.version>3.10.6.Final</netty3.version> - <netty4.version>4.1.100.Final</netty4.version> + <netty4.version>4.1.108.Final</netty4.version> <!-- end HBASE-15925 default hadoop compatibility values --> <audience-annotations.version>0.13.0</audience-annotations.version> <!-- @@ -590,8 +590,8 @@ Note that the version of jackson-[annotations,core,databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in hbase-thirdparty. --> - <jackson.version>2.16.1</jackson.version> - <jackson.databind.version>2.16.1</jackson.databind.version> + <jackson.version>2.17.0</jackson.version> + <jackson.databind.version>2.17.0</jackson.databind.version> <jaxb-api.version>2.3.1</jaxb-api.version> <servlet.api.version>3.1.0</servlet.api.version> <wx.rs.api.version>2.1.1</wx.rs.api.version> @@ -666,7 +666,7 @@ databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in hbase-thirdparty. --> - <hbase-thirdparty.version>4.1.6</hbase-thirdparty.version> + <hbase-thirdparty.version>4.1.7</hbase-thirdparty.version> <!-- Coverage properties --> <jacoco.version>0.8.8</jacoco.version> <jacocoArgLine/>