From bd73d44d7205983d7927e92691507fcae2e2eac8 Mon Sep 17 00:00:00 2001
From: Marcos Pereira <marcos.silva@gmail.com>
Date: Fri, 4 Jan 2019 15:49:03 -0500
Subject: [PATCH] Upgrade branch 2.6.x using TemplateControl (#65)

* Updated with template-control on 2019-01-04T17:13:23.850Z
  /.travis.yml:
    wrote /.travis.yml
  **build.sbt:
    scalaVersion := "2.12.8"
  **/build.properties:
    sbt.version=1.2.8

* Fix scalaVersion update
---
 .travis.yml              | 74 ++++++++++++++++++++++------------------
 build.sbt                |  2 +-
 project/build.properties |  2 +-
 3 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 83d95a53b..1e8c0e7c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,44 +1,50 @@
 language: scala
 scala:
-# When updating Scala versions, also check the excludes
-# in build matrix below.
-- 2.11.12
-- 2.12.6
-jdk:
-- oraclejdk8
-- openjdk11
+  - 2.12.8
+
+before_install:
+  - curl -sL https://github.com/shyiko/jabba/raw/master/install.sh | bash && . ~/.jabba/jabba.sh
+
 env:
+  global:
+    - JABBA_HOME=$HOME/.jabba
   matrix:
-    - SCRIPT=scripts/test-sbt
-    - SCRIPT=scripts/test-gradle
-script:
-- $SCRIPT
-cache:
-  directories:
-  - "$HOME/.ivy2/cache"
-  - "$HOME/.gradle/caches"
-before_cache:
-- rm -rf $HOME/.ivy2/cache/com.typesafe.play/*
-- rm -rf $HOME/.ivy2/cache/scala_*/sbt_*/com.typesafe.play/*
-- find $HOME/.ivy2/cache -name "ivydata-*.properties" -print0 | xargs -n10 -0 rm
+    # There is no concise way to specify multi-dimensional build matrix:
+    # https://github.com/travis-ci/travis-ci/issues/1519
+    - SCRIPT=scripts/test-sbt     TRAVIS_JDK=adopt@1.8.192-12
+    - SCRIPT=scripts/test-sbt     TRAVIS_JDK=adopt@1.11.0-1
+    - SCRIPT=scripts/test-gradle  TRAVIS_JDK=adopt@1.8.192-12
+    - SCRIPT=scripts/test-gradle  TRAVIS_JDK=adopt@1.11.0-1
 
 # Exclude some combinations from build matrix. See:
 # https://docs.travis-ci.com/user/customizing-the-build/#Build-Matrix
 matrix:
-  exclude:
-    - scala: 2.11.12
-      jdk: openjdk11
+  fast_finish: true
   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
-    # see http://openjdk.java.net/jeps/320
-    #
-    # 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: openjdk11
+    # Current release of Gradle still does not supports Play 2.7.x releases
+    # As soon as there is a release of Gradle that fixes that, we can then
+    # remove this allowed failure.
+    - env: SCRIPT=scripts/test-gradle  TRAVIS_JDK=adopt@1.8.192-12
+    - env: SCRIPT=scripts/test-gradle  TRAVIS_JDK=adopt@1.11.0-1
+    # Java 11 is still not fully supported. It is good that we are already
+    # testing our sample applications to better discover possible problems
+    # but we can allow failures here too.
+    - env: SCRIPT=scripts/test-sbt     TRAVIS_JDK=adopt@1.11.0-1
+
+install:
+  - $JABBA_HOME/bin/jabba install $TRAVIS_JDK
+  - unset _JAVA_OPTIONS
+  - export JAVA_HOME="$JABBA_HOME/jdk/$TRAVIS_JDK" && export PATH="$JAVA_HOME/bin:$PATH" && java -Xmx32m -version
 
-# See https://blog.travis-ci.com/2014-03-13-slack-notifications/
-# created with travis encrypt command line tool
-notifications:
-  slack:
-    secure: XYhzPxvvw2QxwR238NJ7pb6KSUArMwn+LzLLt12xS3QQj+NN4sMcK5yDU7ZMvZ6qgZmiEB/AgmF2Ws4jibr1rB4k469+PEFBwFk2zuPMqM46UeK3KBPmlRQlRWxTuJcO+WUpkt29cbZBJ8+e1y3as+15UfOC/2CQ6579tOUjvJ8KzbFvI4RrreQZuKYmpCQRcfOw6ChCrpHW5rQlvoJpM4LHSl8Ib+DMZyfsc3WDhEGmzvm0TfLJ3fQiD2xYByiNcVUqUu06QLeciniwi7PBl4Cx9xwvJoF7Klms7j1zeatWknJ2tagX5mRuleoGQRCud73/aaGV85NoQQRUUtblXkNBHXjBXEpPL6lf9S+4GxjvC+LXK/Z+WWAdIYvwDpiqspJ6SWIfW5PQK9okZFhLaaDvqsGnEntXffccTTlzyuTTmyn7Y9U6U6ZB9Blq3U5GJd+ncPX99XpACxumV+Xz8NgtlkIG86qLgNKl1qm6GItkaSRYGvdWgtslAgh1I7cbQD8tZ73m60Z7Yk3ZWxNY0I+I27SKocwyyRENHi/n2zA2WycTswUzxXEJ72+23mpWrMhnOY4VczviqPRgdpKEYncLqcv9yLDNLM4V1uDi16xywxqqE9coew6PWw0gUQWBi2/x3ZPNnnEg/cC++LR2oHKmGpahGgQGqGCJYyH5Ylw=
+script:
+  - $SCRIPT
+
+before_cache:
+  - find $HOME/.ivy2 -name "ivydata-*.properties" -delete
+  - find $HOME/.sbt -name "*.lock" -delete
+
+cache:
+  directories:
+    - "$HOME/.ivy2/cache"
+    - "$HOME/.gradle/caches"
+    - "$HOME/.jabba/jdk"
diff --git a/build.sbt b/build.sbt
index f8f99a0b5..1f7405622 100644
--- a/build.sbt
+++ b/build.sbt
@@ -9,7 +9,7 @@ def gatlingVersion(scalaBinVer: String): String = scalaBinVer match {
 
 inThisBuild(
   List(
-    scalaVersion := "2.12.7",
+    scalaVersion := "2.12.8",
     crossScalaVersions := Seq("2.11.12", "2.12.7"),
     dependencyOverrides := Seq(
        "org.codehaus.plexus" % "plexus-utils" % "3.0.18",
diff --git a/project/build.properties b/project/build.properties
index 7c58a83ab..c0bab0494 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.6
+sbt.version=1.2.8