Skip to content

Commit f9e5843

Browse files
pankaj72981stoty
authored andcommitted
HBASE-28793 Update hbase-thirdparty to 4.1.8 (apache#6188)
Signed-off-by: Nihal Jain <[email protected]> Signed-off-by: Duo Zhang <[email protected]> Reviewed-by: Vineet Kumar Maheshwari <[email protected]> (cherry picked from commit 4c7bb57) (cherry picked from commit 351fb08)
1 parent 5d39ad8 commit f9e5843

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

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

+1-1
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-server/src/main/java/org/apache/hadoop/hbase/util/compaction/MajorCompactor.java

+1-1
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

+2-2
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

+6-6
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@
564564
in the dependencyManagement section as it could still lead to different versions of netty
565565
modules and cause trouble if we only rely on transitive dependencies.
566566
-->
567-
<netty4.version>4.1.108.Final</netty4.version>
567+
<netty4.version>4.1.112.Final</netty4.version>
568568
<!-- end HBASE-15925 default hadoop compatibility values -->
569569
<audience-annotations.version>0.13.0</audience-annotations.version>
570570
<!--
@@ -587,8 +587,8 @@
587587
Note that the version of jackson-[annotations,core,databind] must be kept in sync with the
588588
version of jackson-jaxrs-json-provider shipped in hbase-thirdparty.
589589
-->
590-
<jackson.version>2.17.0</jackson.version>
591-
<jackson.databind.version>2.17.0</jackson.databind.version>
590+
<jackson.version>2.17.2</jackson.version>
591+
<jackson.databind.version>2.17.2</jackson.databind.version>
592592
<jaxb-api.version>2.3.1</jaxb-api.version>
593593
<servlet.api.version>3.1.0</servlet.api.version>
594594
<wx.rs.api.version>2.1.1</wx.rs.api.version>
@@ -606,7 +606,7 @@
606606
<external.protoc.version>${external.protobuf.version}</external.protoc.version>
607607
<!--Version of protobuf that hbase uses internally (we shade our pb)
608608
Must match what is out in hbase-thirdparty include. -->
609-
<internal.protobuf.version>4.26.1</internal.protobuf.version>
609+
<internal.protobuf.version>4.27.3</internal.protobuf.version>
610610
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
611611
<thrift.path>thrift</thrift.path>
612612
<thrift.version>0.14.1</thrift.version>
@@ -633,7 +633,7 @@
633633
-->
634634
<checkstyle.version>8.29</checkstyle.version>
635635
<exec.maven.version>3.1.0</exec.maven.version>
636-
<error-prone.version>2.26.1</error-prone.version>
636+
<error-prone.version>2.28.0</error-prone.version>
637637
<jamon.plugin.version>2.4.2</jamon.plugin.version>
638638
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
639639
<maven.antrun.version>1.8</maven.antrun.version>
@@ -667,7 +667,7 @@
667667
databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
668668
hbase-thirdparty.
669669
-->
670-
<hbase-thirdparty.version>4.1.7</hbase-thirdparty.version>
670+
<hbase-thirdparty.version>4.1.8</hbase-thirdparty.version>
671671
<!-- Coverage properties -->
672672
<jacoco.version>0.8.8</jacoco.version>
673673
<jacocoArgLine/>

0 commit comments

Comments
 (0)