This is an automated email from the ASF dual-hosted git repository. stoty pushed a commit to branch branch-2.5 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit f852eb46bb5e8fbb92b1d78fb6646b730064d999 Author: Pankaj <[email protected]> AuthorDate: Tue Sep 3 10:14:02 2024 +0530 HBASE-28793 Update hbase-thirdparty to 4.1.8 (#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 4c7bb575b3b2e271a0bfe2752895de66f00e37b8) (cherry picked from commit 351fb08990e2b570a060cceb978ebd0ac887d8d6) --- .../java/org/apache/hadoop/hbase/IntegrationTestsDriver.java | 2 +- .../apache/hadoop/hbase/util/compaction/MajorCompactor.java | 2 +- .../hadoop/hbase/quotas/TestSpaceQuotasWithSnapshots.java | 4 ++-- pom.xml | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestsDriver.java b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestsDriver.java index 3b590493a9f..dcc2e3234da 100644 --- a/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestsDriver.java +++ b/hbase-it/src/test/java/org/apache/hadoop/hbase/IntegrationTestsDriver.java @@ -77,7 +77,7 @@ public class IntegrationTestsDriver extends AbstractHBaseTool { @Override protected void processOptions(CommandLine cmd) { - String testFilterString = cmd.getOptionValue(SHORT_REGEX_ARG, null); + String testFilterString = cmd.getOptionValue(SHORT_REGEX_ARG); if (testFilterString != null) { intTestFilter.setPattern(testFilterString); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/compaction/MajorCompactor.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/compaction/MajorCompactor.java index a987bef3340..9f78edd3d87 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/compaction/MajorCompactor.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/compaction/MajorCompactor.java @@ -420,7 +420,7 @@ public class MajorCompactor extends Configured implements Tool { return -1; } String tableName = commandLine.getOptionValue("table"); - String cf = commandLine.getOptionValue("cf", null); + String cf = commandLine.getOptionValue("cf"); Set<String> families = Sets.newHashSet(); if (cf != null) { Iterables.addAll(families, Splitter.on(",").split(cf)); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestSpaceQuotasWithSnapshots.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestSpaceQuotasWithSnapshots.java index 82d2ed6c274..851ae2edb56 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestSpaceQuotasWithSnapshots.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/quotas/TestSpaceQuotasWithSnapshots.java @@ -164,7 +164,7 @@ public class TestSpaceQuotasWithSnapshots { // Make sure we see the "final" new size for the table, not some intermediate waitForStableRegionSizeReport(conn, tn); final long finalSize = getRegionSizeReportForTable(conn, tn); - assertNotNull("Did not expect to see a null size", finalSize); + assertTrue("Table data size must be greater than zero", finalSize > 0); LOG.info("Last seen size: " + finalSize); // Make sure the QuotaObserverChore has time to reflect the new region size reports @@ -263,7 +263,7 @@ public class TestSpaceQuotasWithSnapshots { // Make sure we see the "final" new size for the table, not some intermediate waitForStableRegionSizeReport(conn, tn); final long finalSize = getRegionSizeReportForTable(conn, tn); - assertNotNull("Did not expect to see a null size", finalSize); + assertTrue("Table data size must be greater than zero", finalSize > 0); LOG.info("Final observed size of table: " + finalSize); // Make sure the QuotaObserverChore has time to reflect the new region size reports diff --git a/pom.xml b/pom.xml index fdfc56ff663..7116c279cce 100644 --- a/pom.xml +++ b/pom.xml @@ -587,8 +587,8 @@ 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.17.0</jackson.version> - <jackson.databind.version>2.17.0</jackson.databind.version> + <jackson.version>2.17.2</jackson.version> + <jackson.databind.version>2.17.2</jackson.databind.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> @@ -606,7 +606,7 @@ <external.protoc.version>${external.protobuf.version}</external.protoc.version> <!--Version of protobuf that hbase uses internally (we shade our pb) Must match what is out in hbase-thirdparty include. --> - <internal.protobuf.version>4.26.1</internal.protobuf.version> + <internal.protobuf.version>4.27.3</internal.protobuf.version> <protobuf.plugin.version>0.6.1</protobuf.plugin.version> <thrift.path>thrift</thrift.path> <thrift.version>0.14.1</thrift.version> @@ -633,7 +633,7 @@ --> <checkstyle.version>8.29</checkstyle.version> <exec.maven.version>3.1.0</exec.maven.version> - <error-prone.version>2.26.1</error-prone.version> + <error-prone.version>2.28.0</error-prone.version> <jamon.plugin.version>2.4.2</jamon.plugin.version> <lifecycle.mapping.version>1.0.0</lifecycle.mapping.version> <maven.antrun.version>1.8</maven.antrun.version> @@ -667,7 +667,7 @@ databind] must be kept in sync with the version of jackson-jaxrs-json-provider shipped in hbase-thirdparty. --> - <hbase-thirdparty.version>4.1.7</hbase-thirdparty.version> + <hbase-thirdparty.version>4.1.8</hbase-thirdparty.version> <!-- Coverage properties --> <jacoco.version>0.8.8</jacoco.version> <jacocoArgLine/>
