From ae55bad8bd2adaec3007487c6f4f8c80d59acba1 Mon Sep 17 00:00:00 2001
From: Ruud Welling <WellingR@users.noreply.github.com>
Date: Thu, 18 Apr 2019 22:58:33 +0200
Subject: [PATCH] Dependency updates, use different docker image for testing
 (#226)

---
 .sbtopts                        |  2 --
 .travis.yml                     |  4 ++--
 project/ProjectAutoPlugin.scala | 10 +++++-----
 project/build.properties        |  2 +-
 scripts/docker-compose.yml      |  2 +-
 scripts/oracle.yml              |  2 +-
 6 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/.sbtopts b/.sbtopts
index baa77afe..9ce3a0bb 100644
--- a/.sbtopts
+++ b/.sbtopts
@@ -1,5 +1,3 @@
 -J-Xms512M
 -J-Xmx4096M
--J-XX:-UseConcMarkSweepGC
--J-XX:+UseG1GC
 -J-XX:MaxGCPauseMillis=200
diff --git a/.travis.yml b/.travis.yml
index a9502a73..e679502e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,9 +5,9 @@ services:
   - postgresql
   - docker
 before_install:
-  - docker pull wnameless/oracle-xe-11g
+  - docker pull oracleinanutshell/oracle-xe-11g
   - docker pull topaztechnology/mssql-server-linux
-  - docker run --name oracle -d -p 127.0.0.1:1521:1521 -e ORACLE_ALLOW_REMOTE=true wnameless/oracle-xe-11g
+  - docker run --name oracle -d -p 127.0.0.1:1521:1521 -e ORACLE_ALLOW_REMOTE=true oracleinanutshell/oracle-xe-11g
   - docker run --name sqlserver -d -p 127.0.0.1:1433:1433 -e DBCA_TOTAL_MEMORY=1024 -e ACCEPT_EULA=Y -e SQL_USER=docker -e SQL_PASSWORD=docker -e SQL_DB=docker topaztechnology/mssql-server-linux
   - docker inspect oracle
   - docker inspect sqlserver
diff --git a/project/ProjectAutoPlugin.scala b/project/ProjectAutoPlugin.scala
index f10b5c03..d93d18fe 100644
--- a/project/ProjectAutoPlugin.scala
+++ b/project/ProjectAutoPlugin.scala
@@ -10,9 +10,9 @@ import scalariform.formatter.preferences.FormattingPreferences
 
 object ProjectAutoPlugin extends AutoPlugin {
   final val ScalaVersion = "2.12.8"
-  final val AkkaVersion = "2.5.20"
+  final val AkkaVersion = "2.5.22"
   final val SlickVersion = "3.3.0"
-  final val ScalaTestVersion = "3.0.5"
+  final val ScalaTestVersion = "3.0.7"
 
   final val formattingPreferences: FormattingPreferences = {
     import scalariform.formatter.preferences._
@@ -83,9 +83,9 @@ object ProjectAutoPlugin extends AutoPlugin {
    libraryDependencies += "com.typesafe.slick" %% "slick" % SlickVersion,
    libraryDependencies += "com.typesafe.slick" %% "slick-hikaricp" % SlickVersion,
    libraryDependencies += "org.postgresql" % "postgresql" % "42.2.5" % Test,
-   libraryDependencies += "com.h2database" % "h2" % "1.4.196" % Test,
-   libraryDependencies += "mysql" % "mysql-connector-java" % "8.0.12" % Test,
-   libraryDependencies += "com.microsoft.sqlserver" % "mssql-jdbc" % "7.0.0.jre8" % Test,
+   libraryDependencies += "com.h2database" % "h2" % "1.4.199" % Test,
+   libraryDependencies += "mysql" % "mysql-connector-java" % "8.0.15" % Test,
+   libraryDependencies += "com.microsoft.sqlserver" % "mssql-jdbc" % "7.2.1.jre8" % Test,
    libraryDependencies += "ch.qos.logback" % "logback-classic" % "1.2.3" % Test,
    libraryDependencies += "com.typesafe.akka" %% "akka-slf4j" % AkkaVersion % Test,
    libraryDependencies += "com.typesafe.akka" %% "akka-persistence-tck" % AkkaVersion % Test,
diff --git a/project/build.properties b/project/build.properties
index 0f9cdf03..57d4d469 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-sbt.version=1.2.3
+sbt.version=1.2.8
diff --git a/scripts/docker-compose.yml b/scripts/docker-compose.yml
index b6a3549e..5f5983f6 100644
--- a/scripts/docker-compose.yml
+++ b/scripts/docker-compose.yml
@@ -18,7 +18,7 @@ mysql:
     - "3306:3306" # credentials (root:root)
 
 oracle:
-  image: wnameless/oracle-xe-11g
+  image: oracleinanutshell/oracle-xe-11g
   container_name: oracle-test
   environment:
     - "TZ=Europe/Amsterdam"
diff --git a/scripts/oracle.yml b/scripts/oracle.yml
index 6c8663f3..ee3911ff 100644
--- a/scripts/oracle.yml
+++ b/scripts/oracle.yml
@@ -14,7 +14,7 @@
 #    - "1521:1521" # DB_CONN: credentials (system:oracle)
 
 oracle:
-  image: wnameless/oracle-xe-11g
+  image: oracleinanutshell/oracle-xe-11g
   container_name: oracle-test
   environment:
     - "TZ=Europe/Amsterdam"