Skip to content

Commit

Permalink
Update some deps; add Scala 2.11 build
Browse files Browse the repository at this point in the history
  • Loading branch information
srowen committed Mar 28, 2015
1 parent 2d0d62b commit 943c811
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 12 deletions.
13 changes: 8 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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
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
4 changes: 2 additions & 2 deletions ch08-geotime/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions ch09-risk/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@
<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>
<artifactId>commons-math3</artifactId>
</dependency>
<dependency>
<groupId>com.github.nscala-time</groupId>
<artifactId>nscala-time_2.10</artifactId>
<artifactId>nscala-time_${scala.minor.version}</artifactId>
</dependency>
</dependencies>

Expand Down
14 changes: 12 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -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>

0 comments on commit 943c811

Please sign in to comment.