HBASE-28793 Update hbase-thirdparty to 4.1.8

apache · Aug 18, 2024 · ea8b217 · ea8b217
1 parent 41dd87c
commit ea8b217
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
@@ -33,7 +33,7 @@
     <!--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>
   </properties>
   <dependencies>
     <dependency>

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
@@ -77,7 +77,7 @@ protected void addOptions() {
 
   @Override
   protected void processOptions(CommandLine cmd) {
-    String testFilterString = cmd.getOptionValue(SHORT_REGEX_ARG, null);
+    String testFilterString = cmd.getOptionValue(SHORT_REGEX_ARG, (String) null);
     if (testFilterString != null) {
       intTestFilter.setPattern(testFilterString);
     }

diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
@@ -34,7 +34,7 @@
     <!--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>
   </properties>
   <dependencies>
     <!--BE CAREFUL! Any dependency added here needs to be

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
@@ -420,7 +420,7 @@ public int run(String[] args) throws Exception {
       return -1;
     }
     String tableName = commandLine.getOptionValue("table");
-    String cf = commandLine.getOptionValue("cf", null);
+    String cf = commandLine.getOptionValue("cf", (String) null);
     Set<String> families = Sets.newHashSet();
     if (cf != null) {
       Iterables.addAll(families, Splitter.on(",").split(cf));

diff --git a/pom.xml b/pom.xml
@@ -926,7 +926,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/>
@@ -1844,6 +1844,13 @@
       <scope>test</scope>
     </dependency>
   </dependencies>
+  <repositories>
+    <repository>
+      <id>staging</id>
+      <name>staging</name>
+      <url>https://repository.apache.org/content/repositories/orgapachehbase-1555</url>
+    </repository>
+  </repositories>
   <build>
     <!-- Plugin versions are inherited from ASF parent pom: https://maven.apache.org/pom/asf/
          For specific version use a property and define it in the parent pom.