Merge branch 'development' into db-refactoring

This commit is contained in:
Risto Lahtela 2019-02-19 17:45:24 +02:00 committed by GitHub
commit 82fbbb5209
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -63,7 +63,7 @@ subprojects {
ext.caffeineVersion = "2.6.2" ext.caffeineVersion = "2.6.2"
ext.h2Version = "1.4.196" ext.h2Version = "1.4.196"
ext.hikariVersion = "3.3.1" ext.hikariVersion = "3.3.1"
ext.slf4jVersion = "1.7.25" ext.slf4jVersion = "1.7.26"
ext.geoIpVersion = "2.12.0" ext.geoIpVersion = "2.12.0"
ext.guavaVersion = "26.0-jre" ext.guavaVersion = "26.0-jre"
ext.bstatsVersion = "1.2" ext.bstatsVersion = "1.2"
@ -107,8 +107,8 @@ subprojects {
testCompile "org.junit.platform:junit-platform-runner:1.4.0" // JUnit 4 runner for JUnit 5 tests testCompile "org.junit.platform:junit-platform-runner:1.4.0" // JUnit 4 runner for JUnit 5 tests
testCompile "org.junit.vintage:junit-vintage-engine:5.4.0" // JUnit 4 compatibility for JUnit 5 testCompile "org.junit.vintage:junit-vintage-engine:5.4.0" // JUnit 4 compatibility for JUnit 5
testCompile "org.junit.jupiter:junit-jupiter-params:5.4.0" // JUnit 5, parameterized tests testCompile "org.junit.jupiter:junit-jupiter-params:5.4.0" // JUnit 5, parameterized tests
testCompile "org.mockito:mockito-core:2.24.0" // Mockito Core testCompile "org.mockito:mockito-core:2.24.5" // Mockito Core
testCompile "org.mockito:mockito-junit-jupiter:2.24.0" // Mockito JUnit 5 Extension testCompile "org.mockito:mockito-junit-jupiter:2.24.5" // Mockito JUnit 5 Extension
testCompile "org.seleniumhq.selenium:selenium-java:3.141.59" // Selenium (Browser tests) testCompile "org.seleniumhq.selenium:selenium-java:3.141.59" // Selenium (Browser tests)
testCompile "com.jayway.awaitility:awaitility:1.7.0" // Awaitility (Concurrent wait conditions) testCompile "com.jayway.awaitility:awaitility:1.7.0" // Awaitility (Concurrent wait conditions)