Skip to content

Commit c2f37b7

Browse files
committed
HBASE-28793 Update hbase-thirdparty to 4.1.8 (#6166)
HBASE-28793 Update hbase-thirdparty to 4.1.8 Signed-off-by: Nihal Jain <nihaljain@apache.org> Signed-off-by: Duo Zhang <zhangduo@apache.org> Reviewed-by: Vineet Kumar Maheshwari <vineet.4008@gmail.com> (cherry picked from commit 2785a3e)
1 parent 1fa1f13 commit c2f37b7

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

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>4.26.1</internal.protobuf.version>
36+
<internal.protobuf.version>4.27.3</internal.protobuf.version>
3737
</properties>
3838
<dependencies>
3939
<dependency>

hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestsDriver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ protected void addOptions() {
7777

7878
@Override
7979
protected void processOptions(CommandLine cmd) {
80-
String testFilterString = cmd.getOptionValue(SHORT_REGEX_ARG, null);
80+
String testFilterString = cmd.getOptionValue(SHORT_REGEX_ARG);
8181
if (testFilterString != null) {
8282
intTestFilter.setPattern(testFilterString);
8383
}

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>4.26.1</internal.protobuf.version>
37+
<internal.protobuf.version>4.27.3</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/util/compaction/MajorCompactor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ public int run(String[] args) throws Exception {
420420
return -1;
421421
}
422422
String tableName = commandLine.getOptionValue("table");
423-
String cf = commandLine.getOptionValue("cf", null);
423+
String cf = commandLine.getOptionValue("cf");
424424
Set<String> families = Sets.newHashSet();
425425
if (cf != null) {
426426
Iterables.addAll(families, Splitter.on(",").split(cf));

hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestSpaceQuotasWithSnapshots.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public boolean evaluate() throws Exception {
164164
// Make sure we see the "final" new size for the table, not some intermediate
165165
waitForStableRegionSizeReport(conn, tn);
166166
final long finalSize = getRegionSizeReportForTable(conn, tn);
167-
assertNotNull("Did not expect to see a null size", finalSize);
167+
assertTrue("Table data size must be greater than zero", finalSize > 0);
168168
LOG.info("Last seen size: " + finalSize);
169169

170170
// Make sure the QuotaObserverChore has time to reflect the new region size reports
@@ -263,7 +263,7 @@ public boolean evaluate() throws Exception {
263263
// Make sure we see the "final" new size for the table, not some intermediate
264264
waitForStableRegionSizeReport(conn, tn);
265265
final long finalSize = getRegionSizeReportForTable(conn, tn);
266-
assertNotNull("Did not expect to see a null size", finalSize);
266+
assertTrue("Table data size must be greater than zero", finalSize > 0);
267267
LOG.info("Final observed size of table: " + finalSize);
268268

269269
// Make sure the QuotaObserverChore has time to reflect the new region size reports

pom.xml

Lines changed: 5 additions & 5 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.108.Final</netty4.version>
817+
<netty4.version>4.1.112.Final</netty4.version>
818818
<!-- end HBASE-15925 default hadoop compatibility values -->
819819
<audience-annotations.version>0.15.0</audience-annotations.version>
820820
<javadoc.audience-annotations.version>0.15.0</javadoc.audience-annotations.version>
@@ -834,8 +834,8 @@
834834
Note that the version of jackson-[annotations,core,databind] must be kept in sync with the
835835
version of jackson-jaxrs-json-provider shipped in hbase-thirdparty.
836836
-->
837-
<jackson.version>2.17.0</jackson.version>
838-
<jackson.databind.version>2.17.0</jackson.databind.version>
837+
<jackson.version>2.17.2</jackson.version>
838+
<jackson.databind.version>2.17.2</jackson.databind.version>
839839
<jaxb-api.version>2.3.1</jaxb-api.version>
840840
<servlet.api.version>3.1.0</servlet.api.version>
841841
<wx.rs.api.version>2.1.1</wx.rs.api.version>
@@ -876,7 +876,7 @@
876876
-->
877877
<checkstyle.version>8.29</checkstyle.version>
878878
<exec.maven.version>3.1.0</exec.maven.version>
879-
<error-prone.version>2.26.1</error-prone.version>
879+
<error-prone.version>2.28.0</error-prone.version>
880880
<jamon.plugin.version>2.4.2</jamon.plugin.version>
881881
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
882882
<maven.antrun.version>1.8</maven.antrun.version>
@@ -908,7 +908,7 @@
908908
databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
909909
hbase-thirdparty.
910910
-->
911-
<hbase-thirdparty.version>4.1.7</hbase-thirdparty.version>
911+
<hbase-thirdparty.version>4.1.8</hbase-thirdparty.version>
912912
<!-- Coverage properties -->
913913
<jacoco.version>0.8.8</jacoco.version>
914914
<jacocoArgLine/>

0 commit comments

Comments
 (0)