Skip to content

Commit 351fb08

Browse files
committed
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)
1 parent 77eed85 commit 351fb08

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

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
@@ -567,7 +567,7 @@
567567
modules and cause trouble if we only rely on transitive dependencies.
568568
-->
569569
<netty3.version>3.10.6.Final</netty3.version>
570-
<netty4.version>4.1.108.Final</netty4.version>
570+
<netty4.version>4.1.112.Final</netty4.version>
571571
<!-- end HBASE-15925 default hadoop compatibility values -->
572572
<audience-annotations.version>0.13.0</audience-annotations.version>
573573
<!--
@@ -590,8 +590,8 @@
590590
Note that the version of jackson-[annotations,core,databind] must be kept in sync with the
591591
version of jackson-jaxrs-json-provider shipped in hbase-thirdparty.
592592
-->
593-
<jackson.version>2.17.0</jackson.version>
594-
<jackson.databind.version>2.17.0</jackson.databind.version>
593+
<jackson.version>2.17.2</jackson.version>
594+
<jackson.databind.version>2.17.2</jackson.databind.version>
595595
<jaxb-api.version>2.3.1</jaxb-api.version>
596596
<servlet.api.version>3.1.0</servlet.api.version>
597597
<wx.rs.api.version>2.1.1</wx.rs.api.version>
@@ -634,7 +634,7 @@
634634
-->
635635
<checkstyle.version>8.29</checkstyle.version>
636636
<exec.maven.version>3.1.0</exec.maven.version>
637-
<error-prone.version>2.26.1</error-prone.version>
637+
<error-prone.version>2.28.0</error-prone.version>
638638
<jamon.plugin.version>2.4.2</jamon.plugin.version>
639639
<lifecycle.mapping.version>1.0.0</lifecycle.mapping.version>
640640
<maven.antrun.version>1.8</maven.antrun.version>
@@ -666,7 +666,7 @@
666666
databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in
667667
hbase-thirdparty.
668668
-->
669-
<hbase-thirdparty.version>4.1.7</hbase-thirdparty.version>
669+
<hbase-thirdparty.version>4.1.8</hbase-thirdparty.version>
670670
<!-- Coverage properties -->
671671
<jacoco.version>0.8.8</jacoco.version>
672672
<jacocoArgLine/>

0 commit comments

Comments
 (0)