From 943c811e4956131be2cc426483205394090da9fe Mon Sep 17 00:00:00 2001
From: Sean Owen <srowen@gmail.com>
Date: Sat, 28 Mar 2015 20:18:25 +0000
Subject: [PATCH] Update some deps; add Scala 2.11 build

---
 .travis.yml          | 13 ++++++++-----
 ch08-geotime/pom.xml |  4 ++--
 ch09-risk/pom.xml    |  6 +++---
 pom.xml              | 14 ++++++++++++--
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6f6e188d..1cedc370 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,10 +1,13 @@
 language: java
-install: mvn ${SPARK_VERSION} -DskipTests=true -Dmaven.javadoc.skip=true -B -V install
-script: mvn ${SPARK_VERSION} -Dmaven.javadoc.skip=true -q -B verify
+install: mvn ${SPARK_VERSION} ${JAVA_VERSION} ${SCALA_PROFILE} -Dmaven.javadoc.skip=true -DskipTests=true -B -V install
+script: mvn ${SPARK_VERSION} ${JAVA_VERSION} ${SCALA_PROFILE} -Dmaven.javadoc.skip=true -q -B verify
 matrix:
  include:
-   # Covers Java 7, Open JDK, and Spark 1.2
+   # Covers Java 7, Open JDK, and Spark 1.2.1
    - jdk: openjdk7
-   # Covert Java 8, Oracle JDK, and Spark 1.3 (for now)
+   # Covers Java 8, Oracle JDK, and Spark 1.3 (for now)
    - jdk: oraclejdk8
-     env: SPARK_VERSION=-Dspark.version=1.3.0
\ No newline at end of file
+     env: SPARK_VERSION=-Dspark.version=1.3.0 JAVA_VERSION=-Djava.version=1.8
+   # Covers Scala 2.11
+   - jdk: oraclejdk7
+     env: SCALA_PROFILE=-Pscala-2.11
\ No newline at end of file
diff --git a/ch08-geotime/pom.xml b/ch08-geotime/pom.xml
index e9c15c75..767feb72 100644
--- a/ch08-geotime/pom.xml
+++ b/ch08-geotime/pom.xml
@@ -25,12 +25,12 @@
     </dependency>
     <dependency>
       <groupId>com.github.nscala-time</groupId>
-      <artifactId>nscala-time_2.10</artifactId>
+      <artifactId>nscala-time_${scala.minor.version}</artifactId>
     </dependency>
     <dependency>
       <groupId>com.esri.geometry</groupId>
       <artifactId>esri-geometry-api</artifactId>
-      <version>1.2</version>
+      <version>1.2.1</version>
     </dependency>
     <dependency>
       <groupId>io.spray</groupId>
diff --git a/ch09-risk/pom.xml b/ch09-risk/pom.xml
index ea356624..6094caac 100644
--- a/ch09-risk/pom.xml
+++ b/ch09-risk/pom.xml
@@ -21,8 +21,8 @@
   <dependencies>
     <dependency>
       <groupId>org.scalanlp</groupId>
-      <artifactId>breeze-viz_2.10</artifactId>
-      <version>0.9</version>
+      <artifactId>breeze-viz_${scala.minor.version}</artifactId>
+      <version>0.11.2</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -30,7 +30,7 @@
     </dependency>
     <dependency>
       <groupId>com.github.nscala-time</groupId>
-      <artifactId>nscala-time_2.10</artifactId>
+      <artifactId>nscala-time_${scala.minor.version}</artifactId>
     </dependency>
   </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 1199621d..c3a0feaa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -118,7 +118,7 @@
       </dependency>
       <dependency>
         <groupId>com.github.nscala-time</groupId>
-        <artifactId>nscala-time_2.10</artifactId>
+        <artifactId>nscala-time_${scala.minor.version}</artifactId>
         <version>1.8.0</version>
       </dependency>
     </dependencies>
@@ -269,7 +269,7 @@
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-compiler-plugin</artifactId>
-          <version>3.2</version>
+          <version>3.3</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
@@ -357,4 +357,14 @@
     </plugins>
   </build>
 
+  <profiles>
+    <profile>
+      <id>scala-2.11</id>
+      <properties>
+        <scala.minor.version>2.11</scala.minor.version>
+        <scala.complete.version>${scala.minor.version}.6</scala.complete.version>
+      </properties>
+    </profile>
+  </profiles>
+
 </project>