Skip to content

Commit

Permalink
Dependency updates, use different docker image for testing (#226)
Browse files Browse the repository at this point in the history
  • Loading branch information
WellingR authored and octonato committed Apr 18, 2019
1 parent db2b9ed commit ae55bad
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 12 deletions.
2 changes: 0 additions & 2 deletions .sbtopts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
-J-Xms512M
-J-Xmx4096M
-J-XX:-UseConcMarkSweepGC
-J-XX:+UseG1GC
-J-XX:MaxGCPauseMillis=200
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions project/ProjectAutoPlugin.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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._
Expand Down Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion scripts/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion scripts/oracle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit ae55bad

Please sign in to comment.