Skip to content

Commit dd595f4

Browse files
committed
HBASE-29971 Upgrade to hbase-thirdparty 4.1.13
1 parent 531f91c commit dd595f4

2 files changed

Lines changed: 23 additions & 20 deletions

File tree

hbase-server/src/main/java/org/apache/hadoop/hbase/ipc/ServerRpcConnection.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -849,9 +849,15 @@ public int read(int offset, ByteBuffer out) {
849849
return len;
850850
}
851851

852+
@Override
853+
public long readLong(int offset) {
854+
return this.buf.getLong(offset);
855+
}
856+
852857
@Override
853858
public int size() {
854859
return this.length;
855860
}
861+
856862
}
857863
}

pom.xml

Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -877,7 +877,7 @@
877877
in the dependencyManagement section as it could still lead to different versions of netty
878878
modules and cause trouble if we only rely on transitive dependencies.
879879
-->
880-
<netty4.version>4.1.123.Final</netty4.version>
880+
<netty4.version>4.1.131.Final</netty4.version>
881881
<!-- end HBASE-15925 default hadoop compatibility values -->
882882
<audience-annotations.version>0.15.0</audience-annotations.version>
883883
<javadoc.audience-annotations.version>0.15.0</javadoc.audience-annotations.version>
@@ -897,8 +897,7 @@
897897
Note that the version of jackson-[annotations,core,databind] must be kept in sync with the
898898
version of jackson-jaxrs-json-provider shipped in hbase-thirdparty.
899899
-->
900-
<jackson.version>2.19.2</jackson.version>
901-
<jackson.databind.version>2.19.2</jackson.databind.version>
900+
<jackson.version>2.21.1</jackson.version>
902901
<jaxb-api.version>2.3.1</jaxb-api.version>
903902
<servlet.api.version>4.0.1</servlet.api.version>
904903
<wx.rs.api.version>2.1.1</wx.rs.api.version>
@@ -918,7 +917,7 @@
918917
Version of protobuf that hbase uses internally (we shade our pb) Must match what is out
919918
in hbase-thirdparty include.
920919
-->
921-
<internal.protobuf.version>4.31.1</internal.protobuf.version>
920+
<internal.protobuf.version>4.34.0</internal.protobuf.version>
922921
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
923922
<thrift.path>thrift</thrift.path>
924923
<thrift.version>0.14.1</thrift.version>
@@ -975,7 +974,7 @@
975974
databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
976975
hbase-thirdparty.
977976
-->
978-
<hbase-thirdparty.version>4.1.12</hbase-thirdparty.version>
977+
<hbase-thirdparty.version>4.1.13</hbase-thirdparty.version>
979978
<!-- for.exclusion version are NOT for direct dependencies. To use the provided
980979
scope to transitively exclude some transitive dependencies, we need to specify
981980
some existing version to for maven. -->
@@ -1599,21 +1598,6 @@
15991598
<artifactId>joni</artifactId>
16001599
<version>${joni.version}</version>
16011600
</dependency>
1602-
<dependency>
1603-
<groupId>com.fasterxml.jackson.core</groupId>
1604-
<artifactId>jackson-annotations</artifactId>
1605-
<version>${jackson.version}</version>
1606-
</dependency>
1607-
<dependency>
1608-
<groupId>com.fasterxml.jackson.core</groupId>
1609-
<artifactId>jackson-core</artifactId>
1610-
<version>${jackson.version}</version>
1611-
</dependency>
1612-
<dependency>
1613-
<groupId>com.fasterxml.jackson.core</groupId>
1614-
<artifactId>jackson-databind</artifactId>
1615-
<version>${jackson.databind.version}</version>
1616-
</dependency>
16171601
<!-- REST dependencies -->
16181602
<dependency>
16191603
<groupId>javax.servlet</groupId>
@@ -1899,8 +1883,21 @@
18991883
<type>pom</type>
19001884
<scope>import</scope>
19011885
</dependency>
1886+
<dependency>
1887+
<groupId>com.fasterxml.jackson</groupId>
1888+
<artifactId>jackson-bom</artifactId>
1889+
<version>${jackson.version}</version>
1890+
<type>pom</type>
1891+
<scope>import</scope>
1892+
</dependency>
19021893
</dependencies>
19031894
</dependencyManagement>
1895+
<repositories>
1896+
<repository>
1897+
<id>thirdparty</id>
1898+
<url>https://repository.apache.org/content/repositories/orgapachehbase-1597/</url>
1899+
</repository>
1900+
</repositories>
19041901
<build>
19051902
<!-- Plugin versions are inherited from ASF parent pom: https://maven.apache.org/pom/asf/
19061903
For specific version use a property and define it in the parent pom.

0 commit comments

Comments
 (0)