aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@archive.org>2018-05-21 17:12:43 -0700
committerBryan Newbold <bnewbold@archive.org>2018-05-21 17:12:43 -0700
commit77bfa94c539ea861befa91c1d0479bccd5febc71 (patch)
treeb9e42e1a56928569282c14bd3a6c63378142bd4a
parent7cdf994f8dd2dff609d6a9eae520adf3200d927e (diff)
downloadSpyGlass-77bfa94c539ea861befa91c1d0479bccd5febc71.tar.gz
SpyGlass-77bfa94c539ea861befa91c1d0479bccd5febc71.zip
try to build for scala 2.11 et al
-rw-r--r--pom.xml32
-rw-r--r--src/main/resources/pom.xml11
2 files changed, 30 insertions, 13 deletions
diff --git a/pom.xml b/pom.xml
index d471ffb..d4db857 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.11_0.17.2_5.3.0</version>
<packaging>jar</packaging>
<properties>
@@ -39,15 +39,15 @@
<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>
- <!-- 2.10 for Scala 2.10.2 and 2.9.3 for Scala version 2.9.3 -->
- <scalding.scala.version>2.10</scalding.scala.version>
- <scalding.version>0.12.0</scalding.version>
+ <!-- can be 2.9.3 and 2.10.2 and 2.11.6 -->
+ <scala.version>2.11.6</scala.version>
+ <!-- 2.11 for Scala 2.11.6 or 2.10 for Scala 2.10.2 or 2.9.3 for Scala version 2.9.3 -->
+ <scalding.scala.version>2.11</scalding.scala.version>
+ <scalding.version>0.17.2</scalding.version>
<scalatest.version>2.2.5</scalatest.version>
<!-- 2.1.1 for Scala 2.10.2 and 1.12.4.1 for Scala 2.9.3-->
- <specs2.version>2.1.1</specs2.version>
+ <specs2.version>2.5</specs2.version>
<typesafe.config.version>1.0.0</typesafe.config.version>
<!-- Other libraries properties -->
@@ -64,9 +64,9 @@
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
</repository>
<repository>
- <id>cloudera-cdh4</id>
- <name>Cloudera CDH4</name>
- <url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
+ <id>cloudera-cdh5</id>
+ <name>Cloudera CDH5</name>
+ <url>https://repository.cloudera.com/content/repositories/releases/</url>
</repository>
<repository>
<id>conjars</id>
@@ -78,6 +78,11 @@
<name>Clojars</name>
<url>http://conjars.org/repo</url>
</repository>
+ <repository>
+ <id>mystery-meat</id>
+ <name>Internet Mystery Meat</name>
+ <url>https://mvnrepository.com/artifact/org.scalaz.stream/scalaz-stream</url>
+ </repository>
</repositories>
<!-- Profiles
@@ -194,6 +199,13 @@
<version>4.1</version>
</dependency>
+ <!-- other -->
+ <dependency>
+ <groupId>org.scalaz.stream</groupId>
+ <artifactId>scalaz-stream_2.11</artifactId>
+ <version>0.7.2</version>
+ </dependency>
+
<!-- Testing dependencies (ScalaSpec / ScalaTest / JUnit) -->
<dependency>
<groupId>org.specs2</groupId>
diff --git a/src/main/resources/pom.xml b/src/main/resources/pom.xml
index ea2bf65..1ded4c5 100644
--- a/src/main/resources/pom.xml
+++ b/src/main/resources/pom.xml
@@ -8,7 +8,7 @@
<description>Cascading and Scalding wrapper for HBase with advanced features</description>
<groupId>parallelai</groupId>
<artifactId>parallelai.spyglass</artifactId>
- <version>2.10_0.12.0_5.3.0</version>
+ <version>2.11_0.17.2_5.3.0</version>
<packaging>jar</packaging>
<organization>
@@ -60,6 +60,11 @@
<name>Cloudera CDH</name>
<url>https://repository.cloudera.com/artifactory/cloudera-repos/</url>
</repository>
+ <repository>
+ <id>mystery-meat</id>
+ <name>Internet Mystery Meat</name>
+ <url>https://mvnrepository.com/artifact/org.scalaz.stream/scalaz-stream</url>
+ </repository>
</repositories>
<dependencies>
@@ -67,8 +72,8 @@
<!-- Scalding -->
<dependency>
<groupId>com.twitter</groupId>
- <artifactId>scalding-core_2.10</artifactId>
- <version>0.12.0</version>
+ <artifactId>scalding-core_2.11</artifactId>
+ <version>0.17.2</version>
</dependency>
<!-- Hadoop -->