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 3539581268f HBASE-28511 Update hbase-thirdparty to 4.1.7 (#5818) 3539581268f is described below commit 3539581268f2063184044e96518267a9b19b642e Author: Duo Zhang <zhang...@apache.org> AuthorDate: Sat Apr 20 20:14:38 2024 +0800 HBASE-28511 Update hbase-thirdparty to 4.1.7 (#5818) Signed-off-by: Bryan Beaudreault <bbeaudrea...@apache.org> --- .../java/org/apache/hadoop/hbase/security/EncryptionUtil.java | 4 ++-- .../org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java | 2 +- hbase-examples/pom.xml | 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 e50b54e8eb0..d48b8b73a31 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 @@ -3181,7 +3181,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-examples/pom.xml b/hbase-examples/pom.xml index 731d9ae1df6..4b4a8f3b55b 100644 --- a/hbase-examples/pom.xml +++ b/hbase-examples/pom.xml @@ -33,7 +33,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> <dependency> diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml index 39ecccc0015..2c73844b7c0 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 eaf79f31103..861a6897057 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 @@ -266,7 +266,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 fc76a7ff0f5..635afe9b78e 100644 --- a/pom.xml +++ b/pom.xml @@ -826,7 +826,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> <!-- @@ -850,8 +850,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> @@ -924,7 +924,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/>