diff --git hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java index a956746..6743e57 100644 --- hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java +++ hbase-handler/src/test/org/apache/hadoop/hive/hbase/HBaseTestSetup.java @@ -28,9 +28,9 @@ import junit.framework.Test; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.MiniHBaseCluster; -import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster; import org.apache.hadoop.hbase.client.HConnectionManager; import org.apache.hadoop.hbase.client.HTable; +import org.apache.hadoop.hbase.zookeeper.MiniZooKeeperCluster; import org.apache.hadoop.hive.conf.HiveConf; import org.apache.hadoop.mapred.JobConf; import org.apache.zookeeper.Watcher; @@ -61,7 +61,7 @@ public class HBaseTestSetup extends TestSetup { setUpFixtures(conf); } conf.set("hbase.rootdir", hbaseRoot); - conf.set("hbase.master", hbaseCluster.getHMasterAddress().toString()); + conf.set("hbase.master", hbaseCluster.getMaster().toString()); conf.set("hbase.zookeeper.property.clientPort", Integer.toString(zooKeeperPort)); String auxJars = conf.getAuxJars(); @@ -88,7 +88,7 @@ public class HBaseTestSetup extends TestSetup { hbaseConf.setInt("hbase.regionserver.port", findFreePort()); hbaseConf.setInt("hbase.regionserver.info.port", -1); hbaseCluster = new MiniHBaseCluster(hbaseConf, NUM_REGIONSERVERS); - conf.set("hbase.master", hbaseCluster.getHMasterAddress().toString()); + conf.set("hbase.master", hbaseCluster.getMaster().toString()); // opening the META table ensures that cluster is running new HTable(new HBaseConfiguration(conf), HConstants.META_TABLE_NAME); } diff --git ivy/libraries.properties ivy/libraries.properties index 3554267..6851bdf 100644 --- ivy/libraries.properties +++ ivy/libraries.properties @@ -38,8 +38,8 @@ commons-logging-api.version=1.0.4 commons-pool.version=1.5.4 derby.version=10.4.2.0 guava.version=r06 -hbase.version=0.89.0-SNAPSHOT -hbase-test.version=0.89.0-SNAPSHOT +hbase.version=0.92.1-SNAPSHOT +hbase-test.version=0.92.1-SNAPSHOT javaewah.version=0.3 jdo-api.version=2.3-ec jdom.version=1.1 @@ -54,5 +54,5 @@ mockito-all.version=1.8.2 slf4j-api.version=1.6.1 slf4j-log4j12.version=1.6.1 velocity.version=1.5 -zookeeper.version=3.3.1 +zookeeper.version=3.4.2