wip

Author: rfecher

extensions/cli/hbase-embed/src/main/java/org/locationtech/geowave/datastore/hbase/cli/ZookeeperMiniCluster.java

@@ -54,30 +54,32 @@ public void setup() throws Exception {
         System.setProperty(
             "test.build.data.basedirectory",
             conf.get("zookeeper.temp.dir", zkDataDir));
-        zookeeperLocalCluster =
-            Class.forName(
-                "org.apache.hadoop.hbase.HBaseTestingUtility",
-                true,
-                hbaseMiniClusterCl).getConstructor(Configuration.class).newInstance(conf);
-        zookeeperLocalCluster.getClass().getMethod("startMiniZKCluster").invoke(
-            zookeeperLocalCluster);
+        final Class<?> htuClass =
+            Class.forName("org.apache.hadoop.hbase.HBaseTestingUtility", true, hbaseMiniClusterCl);
+        final Object instance = htuClass.getConstructor(Configuration.class).newInstance(conf);
+        if (instance == null) {
+          throw new IllegalStateException(
+              "Mini Zookeeper cluster failed to instantiate HBaseTestingUtility");
+        }
+        zookeeperLocalCluster = instance;
+        htuClass.getMethod("startMiniZKCluster").invoke(zookeeperLocalCluster);
       } catch (final Exception e) {
         LOGGER.error("Exception starting zookeeperLocalCluster: " + e, e);
         throw e;
       } finally {
         Thread.currentThread().setContextClassLoader(prevCl);
       }
-      if (zookeeperLocalCluster == null) {
-        throw new IllegalStateException(
-            "Mini Zookeeper cluster failed to start; see logs for details");
-      }
       final Object zkCluster =
           zookeeperLocalCluster.getClass().getMethod("getZkCluster").invoke(zookeeperLocalCluster);
       zookeeper = "127.0.0.1:" + zkCluster.getClass().getMethod("getClientPort").invoke(zkCluster);
     }
   }
 
   public void tearDown() throws Exception {
+    if (zookeeperLocalCluster == null) {
+      zookeeper = null;
+      return;
+    }
     try {
       zookeeperLocalCluster.getClass().getMethod("shutdownMiniZKCluster").invoke(
           zookeeperLocalCluster);

pom.xml

@@ -83,8 +83,8 @@
 		<skipITs>true</skipITs>
 		<vfs2.version>2.9.0</vfs2.version>
 		<configuration2.version>2.9.0</configuration2.version>
-		<hbase.version>2.5.12</hbase.version>
-		<hadoop.version>3.3.6</hadoop.version>
+		<hbase.version>2.6.3</hbase.version>
+		<hadoop.version>3.4.1</hadoop.version>
 		<avro.version>1.7.6</avro.version>
 		<awssdk.version>1.11.1015</awssdk.version>
 		<httpclient.version>4.5.13</httpclient.version>
@@ -96,7 +96,7 @@
 		<jetty.version>11.0.17</jetty.version>
 		<bouncycastle.version>1.70</bouncycastle.version>
 		<lz4.version>1.8.0</lz4.version>
-		<zookeeper.version>3.5.7</zookeeper.version>
+		<zookeeper.version>3.8.4</zookeeper.version>
 		<jersey.version>3.1.3</jersey.version>
 		<scala.version>2.12.18</scala.version>
 		<kafka.artifact>kafka_2.12</kafka.artifact>

python/src/main/python/requirements.txt

@@ -1,5 +1,5 @@
 py4j==0.10.8.1
 shapely==2.0.4
-pytest==4.3.1
-pytest-cov==2.7.1
+pytest==8.3.3
+pytest-cov==5.0.0
 pdoc3==0.6.3