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 c8ddbc7a28f HBASE-29971 Upgrade to hbase-thirdparty 4.1.13 (#7903)
c8ddbc7a28f is described below
commit c8ddbc7a28f9f8f959154465dbb9b24a4a6da50a
Author: Duo Zhang <[email protected]>
AuthorDate: Fri Mar 13 09:42:41 2026 +0800
HBASE-29971 Upgrade to hbase-thirdparty 4.1.13 (#7903)
Signed-off-by: Andrew Purtell <[email protected]>
Signed-off-by: Nihal Jain <[email protected]>
Signed-off-by: Pankaj Kumar <[email protected]>
Signed-off-by: Xiao Liu <[email protected]>
---
.../hadoop/hbase/ipc/ServerRpcConnection.java | 6 +++++
pom.xml | 31 ++++++++--------------
2 files changed, 17 insertions(+), 20 deletions(-)
diff --git
a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcConnection.java
b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcConnection.java
index 468c0a62e7d..104c5486951 100644
---
a/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcConnection.java
+++
b/hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcConnection.java
@@ -846,9 +846,15 @@ abstract class ServerRpcConnection implements Closeable {
return len;
}
+ @Override
+ public long readLong(int offset) {
+ return this.buf.getLong(offset);
+ }
+
@Override
public int size() {
return this.length;
}
+
}
}
diff --git a/pom.xml b/pom.xml
index 3f993203bd5..01770d62f08 100644
--- a/pom.xml
+++ b/pom.xml
@@ -566,7 +566,7 @@
in the dependencyManagement section as it could still lead to different
versions of netty
modules and cause trouble if we only rely on transitive dependencies.
-->
- <netty4.version>4.1.123.Final</netty4.version>
+ <netty4.version>4.1.131.Final</netty4.version>
<!-- end HBASE-15925 default hadoop compatibility values -->
<audience-annotations.version>0.13.0</audience-annotations.version>
<!--
@@ -589,8 +589,7 @@
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.19.2</jackson.version>
- <jackson.databind.version>2.19.2</jackson.databind.version>
+ <jackson.version>2.21.1</jackson.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>
@@ -614,7 +613,7 @@
Version of protobuf that hbase uses internally (we shade our pb) Must
match what is out
in hbase-thirdparty include.
-->
- <internal.protobuf.version>4.31.1</internal.protobuf.version>
+ <internal.protobuf.version>4.34.0</internal.protobuf.version>
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
<thrift.path>thrift</thrift.path>
<thrift.version>0.14.1</thrift.version>
@@ -676,7 +675,7 @@
databind] must be kept in sync with the version of
jackson-jaxrs-json-provider shipped in
hbase-thirdparty.
-->
- <hbase-thirdparty.version>4.1.12</hbase-thirdparty.version>
+ <hbase-thirdparty.version>4.1.13</hbase-thirdparty.version>
<!-- Coverage properties -->
<jacoco.version>0.8.8</jacoco.version>
<jacocoArgLine/>
@@ -1302,21 +1301,6 @@
<artifactId>joni</artifactId>
<version>${joni.version}</version>
</dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
- </dependency>
<!-- REST dependencies -->
<dependency>
<groupId>javax.servlet</groupId>
@@ -1643,6 +1627,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson</groupId>
+ <artifactId>jackson-bom</artifactId>
+ <version>${jackson.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
