From d343a5fa70536e1b790410a026192a2899888a8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nils=20K=C3=BCbler?= <nils.kuebler@ymc.ch>
Date: Mon, 8 Sep 2014 17:14:26 +0200
Subject: [PATCH] add hbase-0.98 support

---
 Vagrantfile                | 12 ++++++++++++
 build                      |  2 +-
 create_packages            |  5 +++++
 project/Build.scala        |  4 ++--
 vagrant/manifests/nodes.pp | 10 ++++++++++
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 5c1f773..474f133 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -54,6 +54,18 @@ Vagrant.configure("2") do |config|
     end
   end
 
+  config.vm.define :hbase098 do |vm_conf|
+    vm_conf.vm.box = "spantree/ubuntu-precise-64"
+    vm_conf.vm.hostname = "hbase098.hannibal.dev"
+    vm_conf.vm.network :private_network, ip: "192.168.80.98"
+    vm_conf.vm.provision :puppet do |puppet|
+      puppet.manifests_path = "vagrant/manifests"
+      puppet.manifest_file = "nodes.pp"
+      puppet.module_path = "vagrant/modules"
+      puppet.options = "--verbose"
+    end
+  end
+
   config.vm.provider :virtualbox do |vb|
       vb.customize ["modifyvm", :id, "--memory", 3072]
   end
diff --git a/build b/build
index 5f492ef..46b95bc 100755
--- a/build
+++ b/build
@@ -8,7 +8,7 @@ dir=`dirname $script`
 
 if [ "" = "$HANNIBAL_HBASE_VERSION" ]; then
     HANNIBAL_HBASE_VERSION="0.90"
-    echo "building Hannibal for HBase $HANNIBAL_HBASE_VERSION (may be altered by assigning 0.90, 0.92 or 0.94 to HANNIBAL_HBASE_VERSION)"
+    echo "building Hannibal for HBase $HANNIBAL_HBASE_VERSION (may be altered by assigning 0.90, 0.92, 0.94, 0.96 or 0.98 to HANNIBAL_HBASE_VERSION)"
 else
     echo "building Hannibal for HBase $HANNIBAL_HBASE_VERSION (as defined by HANNIBAL_HBASE_VERSION)"
 fi
diff --git a/create_packages b/create_packages
index 5c4cba8..e70533d 100755
--- a/create_packages
+++ b/create_packages
@@ -27,3 +27,8 @@ cp target/hannibal-hbase*.tgz deploy/hbase094
 HANNIBAL_HBASE_VERSION=0.96 ./create_package
 mkdir -p deploy/hbase096
 cp target/hannibal-hbase*.tgz deploy/hbase096
+
+./sbt clean
+HANNIBAL_HBASE_VERSION=0.98 ./create_package
+mkdir -p deploy/hbase098
+cp target/hannibal-hbase*.tgz deploy/hbase098
diff --git a/project/Build.scala b/project/Build.scala
index c29a00a..257eeb9 100755
--- a/project/Build.scala
+++ b/project/Build.scala
@@ -38,8 +38,8 @@ object ApplicationBuild extends Build {
       )
       case "0.98" => Seq(
         "org.apache.hadoop" % "hadoop-common" % "2.4.0",
-        "org.apache.hbase" % "hbase-common" % "0.98.1",
-        "org.apache.hbase" % "hbase-client" % "0.98.1"
+        "org.apache.hbase" % "hbase-common" % "0.98.1-hadoop2",
+        "org.apache.hbase" % "hbase-client" % "0.98.1-hadoop2"
       )
     })
 
diff --git a/vagrant/manifests/nodes.pp b/vagrant/manifests/nodes.pp
index bf00071..a36e935 100644
--- a/vagrant/manifests/nodes.pp
+++ b/vagrant/manifests/nodes.pp
@@ -37,3 +37,13 @@
     hbaseVersion => "0.96"
   }
 }
+
+node "hbase098" {
+  class { "apache::hbase::standalone":
+    archiveUrl => "http://archive.apache.org/dist/hbase/hbase-0.98.5/hbase-0.98.5-hadoop1-bin.tar.gz"
+  }
+
+  class { "hannibal":
+    hbaseVersion => "0.98"
+  }
+}
\ No newline at end of file