Merge pull request #163 from MITLibraries/162_ci_crashes

162 ci crashes

.travis.yml

@@ -1,13 +1,14 @@
 language: scala
 scala:
- - "2.11.1"
+ - "2.11.6"
 jdk:
  - oraclejdk8
 sudo: false
 env:
   - MAILGUN_API_KEY=notarealkey DATABASE_URL=jdbc:postgresql://localhost/travis_ci_test
 addons:
   postgresql: "9.3"
-script: "sbt clean test"
+script: "sbt clean coverage test"
+after_success: "sbt coveralls"
 before_script:
   - psql -c 'create database travis_ci_test;' -U postgres

build.sbt

@@ -4,7 +4,7 @@ version := "0.1.0-SNAPSHOT"
 
 lazy val root = (project in file(".")).enablePlugins(PlayScala)
 
-scalaVersion := "2.11.1"
+scalaVersion := "2.11.6"
 
 libraryDependencies ++= Seq(
   jdbc,
@@ -17,6 +17,9 @@ libraryDependencies ++= Seq(
   "org.scalesxml" %% "scales-xml" % "0.6.0-M3",
   "org.scalesxml" %% "scales-jaxen" % "0.6.0-M3" intransitive(),
   "jaxen" % "jaxen" % "1.1.6" intransitive(),
-  "org.postgresql" % "postgresql" % "9.4-1200-jdbc41",
+  "org.postgresql" % "postgresql" % "9.4-1201-jdbc41",
   "org.mockito" % "mockito-core" % "1.10.19" % "test"
 )
+
+parallelExecution in Test := false
+fork in Test := false

project/build.properties

@@ -1,4 +1,4 @@
 #Activator-generated Properties
 #Wed Dec 31 14:58:34 EST 2014
 template.uuid=59b33e52-e2cf-4bb9-9028-4e0fce1b8ea7
-sbt.version=0.13.5
+sbt.version=0.13.8

project/plugins.sbt

@@ -1,7 +1,7 @@
 resolvers += "Typesafe repository" at "https://repo.typesafe.com/typesafe/releases/"
 
 // The Play plugin
-addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.7")
+addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.3.8")
 
 // web plugins