From 57a2c00ccf7ea2960456cb6d0a49022a722a1158 Mon Sep 17 00:00:00 2001
From: John Blakeney <blakeney@alum.mit.edu>
Date: Tue, 1 Sep 2015 22:00:58 -0400
Subject: Fix various CDH5 integration problems.

---
 pom.xml | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 861a61d..90261ac 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,6 +35,8 @@
         <hadoop.core.version>2.5.0-mr1-${cdh.version}</hadoop.core.version>
         <hbase.version>0.98.6-${cdh.version}</hbase.version>
 
+        <joda-time.version>2.8.2</joda-time.version>
+
         <!-- Scala/Scalding/Cascading properties -->
         <!-- can be 2.9.3 and 2.10.2 -->
         <scala.version>2.10.3</scala.version>
@@ -153,7 +155,12 @@
         <!-- HBase -->
         <dependency>
             <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase</artifactId>
+            <artifactId>hbase-client</artifactId>
+            <version>${hbase.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.hbase</groupId>
+            <artifactId>hbase-server</artifactId>
             <version>${hbase.version}</version>
         </dependency>
 
@@ -169,6 +176,12 @@
             <version>${typesafe.config.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>joda-time</groupId>
+            <artifactId>joda-time</artifactId>
+            <version>${joda-time.version}</version>
+        </dependency>
+
         <dependency>
             <groupId>com.twitter.elephantbird</groupId>
             <artifactId>elephant-bird-core</artifactId>
-- 
cgit v1.2.3


From ead7e97dca4023fa7a7a3337a2ac1d238f6e64c4 Mon Sep 17 00:00:00 2001
From: John Blakeney <blakeney@alum.mit.edu>
Date: Thu, 3 Sep 2015 20:12:21 -0400
Subject: Increment version.  Fix Maven plugin versions.

---
 pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 90261ac..d22d4c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
     <name>Cascading and Scalding wrapper for HBase with advanced features</name>
     <groupId>parallelai</groupId>
     <artifactId>parallelai.spyglass</artifactId>
-    <version>2.10_0.12.0_5.3.0</version>
+    <version>2.10_0.12.1_5.3.0</version>
     <packaging>jar</packaging>
 
     <properties>
@@ -27,6 +27,7 @@
         <!-- Maven -->
         <maven-compiler-plugin.version>3.0</maven-compiler-plugin.version>
         <maven-scala-plugin.version>2.15.2</maven-scala-plugin.version>
+        <maven-source-plugin.version>2.4</maven-source-plugin.version>
         <maven.surefire.plugin.version>2.12.3</maven.surefire.plugin.version>
 
         <cdh.version>cdh5.3.0</cdh.version>
@@ -233,6 +234,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
+                <version>${maven-source-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>
@@ -246,6 +248,7 @@
             <plugin>
                 <groupId>org.scala-tools</groupId>
                 <artifactId>maven-scala-plugin</artifactId>
+                <version>${maven-scala-plugin.version}</version>
                 <executions>
 
                     <execution>
-- 
cgit v1.2.3