diff --git a/.travis.yml b/.travis.yml index aa5e49edc..83d95a53b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,7 @@ scala: - 2.12.6 jdk: - oraclejdk8 -- oraclejdk9 -- oraclejdk10 -- oraclejdk11 +- openjdk11 env: matrix: - SCRIPT=scripts/test-sbt @@ -29,11 +27,7 @@ before_cache: matrix: exclude: - scala: 2.11.12 - jdk: oraclejdk9 - - scala: 2.11.12 - jdk: oraclejdk10 - - scala: 2.11.12 - jdk: oraclejdk11 + jdk: openjdk11 allow_failures: # We should allow failures here since Java 11 removed some modules including # java.xml.bind which we are adding when running with Java 9+. For more details @@ -41,7 +35,7 @@ matrix: # # Play already has a fix for that, but it needs to be backported and released # for 2.6.x: https://github.com/playframework/playframework/pull/8382 - - jdk: oraclejdk11 + - jdk: openjdk11 # See https://blog.travis-ci.com/2014-03-13-slack-notifications/ # created with travis encrypt command line tool diff --git a/build.gradle b/build.gradle index 1b3ce62de..ac630598f 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { id "com.github.lkishalmi.gatling" version "0.7.1" } -def playVersion = "2.6.19" +def playVersion = "2.6.20" def scalaVersion = System.getProperty("scala.binary.version", /* default = */ "2.12") def gatlingVersion = getGlatlingVersion(scalaVersion) diff --git a/build.sbt b/build.sbt index dd1fdc477..f8f99a0b5 100644 --- a/build.sbt +++ b/build.sbt @@ -9,8 +9,8 @@ def gatlingVersion(scalaBinVer: String): String = scalaBinVer match { inThisBuild( List( - scalaVersion := "2.12.6", - crossScalaVersions := Seq("2.11.12", "2.12.6"), + scalaVersion := "2.12.7", + crossScalaVersions := Seq("2.11.12", "2.12.7"), dependencyOverrides := Seq( "org.codehaus.plexus" % "plexus-utils" % "3.0.18", "com.google.code.findbugs" % "jsr305" % "3.0.1", diff --git a/project/plugins.sbt b/project/plugins.sbt index e90ed6090..184947994 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,5 +1,5 @@ // The Play plugin -addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.19") +addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.6.20") // Load testing tool: // http://gatling.io/docs/2.2.2/extensions/sbt_plugin.html