From a930b1f457e3b7025c04a6cbe5ddc95d991d3ca0 Mon Sep 17 00:00:00 2001 From: tomas Date: Mon, 12 Nov 2018 16:37:03 -0800 Subject: [PATCH] Wrong pom scope (#11) * (auto) update dependency lock file, version=2.1.0-dev.0.uncommitted+wrong.pom.scope.7b4f7ab * (auto) update dependency lock file, version=2.1.0-dev.1.uncommitted+wrong.pom.scope.c3140e2 * minor cleanup, use correct configuration for runtime dependencies * (auto) update dependency lock file, version=2.1.0-dev.3.uncommitted+wrong.pom.scope.89c33c4 * (auto) update dependency lock file, version=2.1.0-dev.4.uncommitted+wrong.pom.scope.9dbcf5f * newer dependencies, fix runtime scope with runtimeOnly * remove unused plugin * extra property entry for test coverage * only run gradle lint once --- build.gradle | 18 +- dependencies_2.11.lock | 792 ++++++++++-------- dependencies_2.12.lock | 792 ++++++++++-------- gradle.properties | 2 +- .../warp/common/WarpPropertyManager.scala | 7 +- .../workday/warp/persistence/Connection.scala | 16 +- .../warp/persistence/PersistenceAware.scala | 5 +- .../persistence/influxdb/InfluxDBClient.scala | 6 +- .../warp/common/utils/FileUtilsSpec.scala | 3 +- .../warp/persistence/MigrationSpec.scala | 2 +- versionInfo.gradle | 16 +- warp.properties | 3 + 12 files changed, 925 insertions(+), 737 deletions(-) diff --git a/build.gradle b/build.gradle index 92b3079b..fff299e7 100644 --- a/build.gradle +++ b/build.gradle @@ -64,11 +64,12 @@ dependencies { compile "com.typesafe:config:${versions.typesafeConfig}" compile "com.typesafe.slick:slick_%%:${versions.slick}" compile "com.typesafe.slick:slick-hikaricp_%%:${versions.slick}" - compile "commons-configuration:commons-configuration:${versions.commonsConfiguration}" compile "commons-io:commons-io:${versions.commonsIo}" - compile "io.gatling:gatling-core:${versions.gatling}" - compile "io.gatling:gatling-http:${versions.gatling}" + // exclude concrete log bindings from gatling + compile "io.gatling:gatling-core:${versions.gatling}" exclude group: 'ch.qos.logback', module:'logback-classic' + compile "io.gatling:gatling-http:${versions.gatling}" exclude group: 'ch.qos.logback', module:'logback-classic' compile "junit:junit:${versions.junit}" + compile "org.apache.commons:commons-configuration2:${versions.commonsConfiguration2}" compile "org.apache.commons:commons-math3:${versions.math3}" compile "org.flywaydb:flyway-core:${versions.flyway}" compile "org.influxdb:influxdb-java:${versions.influxDbClient}" @@ -83,14 +84,9 @@ dependencies { scoverage "org.scoverage:scalac-scoverage-plugin_%%:${versions.scalacScoverage}" scoverage "org.scoverage:scalac-scoverage-runtime_%%:${versions.scalacScoverage}" - runtime "com.h2database:h2:${versions.h2}" - runtime "mysql:mysql-connector-java:${versions.mysqlConnector}" - runtime "org.tinylog:slf4j-binding:${versions.tinylogSlf4jBinding}" -} - -// exclude concrete log bindings from gatling -configurations { - all*.exclude group: 'ch.qos.logback', module:'logback-classic' + runtimeOnly "com.h2database:h2:${versions.h2}" + runtimeOnly "mysql:mysql-connector-java:${versions.mysqlConnector}" + runtimeOnly "org.tinylog:slf4j-binding:${versions.tinylogSlf4jBinding}" } sourceSets { diff --git a/dependencies_2.11.lock b/dependencies_2.11.lock index 4811f347..eaf05c89 100644 --- a/dependencies_2.11.lock +++ b/dependencies_2.11.lock @@ -135,22 +135,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -264,24 +276,14 @@ "com.typesafe.slick:slick-hikaricp_2.11" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -396,9 +398,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.29", @@ -432,20 +451,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -507,14 +526,14 @@ "locked": "1.0.4", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.11", - "org.scalatest:scalatest_2.11" + "io.gatling:jsonpath_2.11" ] }, "org.scala-lang.modules:scala-xml_2.11": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.11", "org.scalatest:scalatest_2.11" ] }, @@ -560,17 +579,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.11": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.11" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.11": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -652,22 +671,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -781,24 +812,14 @@ "com.typesafe.slick:slick-hikaricp_2.11" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -913,9 +934,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.29", @@ -949,20 +987,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -1024,14 +1062,14 @@ "locked": "1.0.4", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.11", - "org.scalatest:scalatest_2.11" + "io.gatling:jsonpath_2.11" ] }, "org.scala-lang.modules:scala-xml_2.11": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.11", "org.scalatest:scalatest_2.11" ] }, @@ -1077,17 +1115,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.11": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.11" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.11": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -1169,22 +1207,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -1196,8 +1246,8 @@ ] }, "com.h2database:h2": { - "locked": "1.4.191", - "requested": "1.4.191" + "locked": "1.4.197", + "requested": "1.4.197" }, "com.softwaremill.quicklens:quicklens_2.11": { "locked": "1.4.8", @@ -1302,24 +1352,14 @@ "com.typesafe.slick:slick-hikaricp_2.11" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -1438,9 +1478,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.29", @@ -1474,20 +1531,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -1549,14 +1606,14 @@ "locked": "1.0.4", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.11", - "org.scalatest:scalatest_2.11" + "io.gatling:jsonpath_2.11" ] }, "org.scala-lang.modules:scala-xml_2.11": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.11", "org.scalatest:scalatest_2.11" ] }, @@ -1602,17 +1659,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.11": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.11" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.11": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -1702,22 +1759,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -1728,10 +1797,6 @@ "com.google.guava:guava" ] }, - "com.h2database:h2": { - "locked": "1.4.191", - "requested": "1.4.191" - }, "com.softwaremill.quicklens:quicklens_2.11": { "locked": "1.4.8", "transitive": [ @@ -1835,24 +1900,14 @@ "com.typesafe.slick:slick-hikaricp_2.11" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -1961,19 +2016,32 @@ "io.gatling:gatling-core" ] }, - "mysql:mysql-connector-java": { - "locked": "5.1.47", - "requested": "5.1.47" - }, "net.sf.saxon:Saxon-HE": { "locked": "9.7.0-10", "transitive": [ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.29", @@ -2007,20 +2075,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -2082,14 +2150,14 @@ "locked": "1.0.4", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.11", - "org.scalatest:scalatest_2.11" + "io.gatling:jsonpath_2.11" ] }, "org.scala-lang.modules:scala-xml_2.11": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.11", "org.scalatest:scalatest_2.11" ] }, @@ -2135,17 +2203,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.11": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.11" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.11": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -2160,20 +2228,12 @@ "org.asynchttpclient:async-http-client-netty-utils", "org.asynchttpclient:netty-codec-dns", "org.asynchttpclient:netty-resolver", - "org.asynchttpclient:netty-resolver-dns", - "org.tinylog:slf4j-binding" + "org.asynchttpclient:netty-resolver-dns" ] }, - "org.tinylog:slf4j-binding": { - "locked": "1.3.5", - "requested": "1.3.5" - }, "org.tinylog:tinylog": { "locked": "1.3.5", - "requested": "1.3.5", - "transitive": [ - "org.tinylog:slf4j-binding" - ] + "requested": "1.3.5" } }, "runtimeClasspath": { @@ -2235,22 +2295,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -2262,8 +2334,8 @@ ] }, "com.h2database:h2": { - "locked": "1.4.191", - "requested": "1.4.191" + "locked": "1.4.197", + "requested": "1.4.197" }, "com.softwaremill.quicklens:quicklens_2.11": { "locked": "1.4.8", @@ -2368,24 +2440,14 @@ "com.typesafe.slick:slick-hikaricp_2.11" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -2504,9 +2566,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.29", @@ -2540,20 +2619,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -2615,14 +2694,14 @@ "locked": "1.0.4", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.11", - "org.scalatest:scalatest_2.11" + "io.gatling:jsonpath_2.11" ] }, "org.scala-lang.modules:scala-xml_2.11": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.11", "org.scalatest:scalatest_2.11" ] }, @@ -2668,17 +2747,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.11": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.11" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.11": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -2798,22 +2877,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -2927,24 +3018,14 @@ "com.typesafe.slick:slick-hikaricp_2.11" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -3059,9 +3140,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.29", @@ -3095,20 +3193,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -3170,14 +3268,14 @@ "locked": "1.0.4", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.11", - "org.scalatest:scalatest_2.11" + "io.gatling:jsonpath_2.11" ] }, "org.scala-lang.modules:scala-xml_2.11": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.11", "org.scalatest:scalatest_2.11" ] }, @@ -3223,17 +3321,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.11": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.11" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.11": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -3315,22 +3413,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -3444,24 +3554,14 @@ "com.typesafe.slick:slick-hikaricp_2.11" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -3576,9 +3676,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.29", @@ -3612,20 +3729,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -3687,14 +3804,14 @@ "locked": "1.0.4", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.11", - "org.scalatest:scalatest_2.11" + "io.gatling:jsonpath_2.11" ] }, "org.scala-lang.modules:scala-xml_2.11": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.11", "org.scalatest:scalatest_2.11" ] }, @@ -3740,17 +3857,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.11": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.11" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.11": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -3832,22 +3949,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -3858,10 +3987,6 @@ "com.google.guava:guava" ] }, - "com.h2database:h2": { - "locked": "1.4.191", - "requested": "1.4.191" - }, "com.softwaremill.quicklens:quicklens_2.11": { "locked": "1.4.8", "transitive": [ @@ -3965,24 +4090,14 @@ "com.typesafe.slick:slick-hikaricp_2.11" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -4091,19 +4206,32 @@ "io.gatling:gatling-core" ] }, - "mysql:mysql-connector-java": { - "locked": "5.1.47", - "requested": "5.1.47" - }, "net.sf.saxon:Saxon-HE": { "locked": "9.7.0-10", "transitive": [ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.29", @@ -4137,20 +4265,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -4212,14 +4340,14 @@ "locked": "1.0.4", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.11", - "org.scalatest:scalatest_2.11" + "io.gatling:jsonpath_2.11" ] }, "org.scala-lang.modules:scala-xml_2.11": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.11", "org.scalatest:scalatest_2.11" ] }, @@ -4265,17 +4393,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.11": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.11" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.11": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -4290,20 +4418,12 @@ "org.asynchttpclient:async-http-client-netty-utils", "org.asynchttpclient:netty-codec-dns", "org.asynchttpclient:netty-resolver", - "org.asynchttpclient:netty-resolver-dns", - "org.tinylog:slf4j-binding" + "org.asynchttpclient:netty-resolver-dns" ] }, - "org.tinylog:slf4j-binding": { - "locked": "1.3.5", - "requested": "1.3.5" - }, "org.tinylog:tinylog": { "locked": "1.3.5", - "requested": "1.3.5", - "transitive": [ - "org.tinylog:slf4j-binding" - ] + "requested": "1.3.5" } }, "testRuntimeClasspath": { @@ -4365,22 +4485,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -4392,8 +4524,8 @@ ] }, "com.h2database:h2": { - "locked": "1.4.191", - "requested": "1.4.191" + "locked": "1.4.197", + "requested": "1.4.197" }, "com.softwaremill.quicklens:quicklens_2.11": { "locked": "1.4.8", @@ -4498,24 +4630,14 @@ "com.typesafe.slick:slick-hikaricp_2.11" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -4634,9 +4756,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.29", @@ -4670,20 +4809,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -4745,14 +4884,14 @@ "locked": "1.0.4", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.11", - "org.scalatest:scalatest_2.11" + "io.gatling:jsonpath_2.11" ] }, "org.scala-lang.modules:scala-xml_2.11": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.11", "org.scalatest:scalatest_2.11" ] }, @@ -4798,17 +4937,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.11": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.11" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.11": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -4838,52 +4977,5 @@ "org.tinylog:slf4j-binding" ] } - }, - "zinc": { - "com.typesafe.sbt:compiler-interface": { - "locked": "0.13.15", - "transitive": [ - "com.typesafe.zinc:zinc" - ] - }, - "com.typesafe.sbt:incremental-compiler": { - "locked": "0.13.15", - "transitive": [ - "com.typesafe.zinc:zinc" - ] - }, - "com.typesafe.sbt:sbt-interface": { - "locked": "0.13.15", - "transitive": [ - "com.typesafe.sbt:incremental-compiler" - ] - }, - "com.typesafe.zinc:zinc": { - "locked": "0.3.15", - "requested": "0.3.15" - }, - "org.scala-lang:scala-compiler": { - "locked": "2.10.6", - "transitive": [ - "com.typesafe.sbt:incremental-compiler" - ] - }, - "org.scala-lang:scala-library": { - "locked": "2.10.6", - "transitive": [ - "com.typesafe.sbt:compiler-interface", - "com.typesafe.sbt:incremental-compiler", - "com.typesafe.sbt:sbt-interface", - "com.typesafe.zinc:zinc", - "org.scala-lang:scala-compiler", - "org.scala-lang:scala-reflect" - ] - }, - "org.scala-lang:scala-reflect": { - "locked": "2.10.6", - "transitive": [ - "org.scala-lang:scala-compiler" - ] - } } } \ No newline at end of file diff --git a/dependencies_2.12.lock b/dependencies_2.12.lock index d695756c..0a916957 100644 --- a/dependencies_2.12.lock +++ b/dependencies_2.12.lock @@ -136,22 +136,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -265,24 +277,14 @@ "com.typesafe.slick:slick-hikaricp_2.12" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -398,9 +400,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.39", @@ -434,20 +453,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -503,14 +522,14 @@ "locked": "1.0.6", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.12", - "org.scalatest:scalatest_2.12" + "io.gatling:jsonpath_2.12" ] }, "org.scala-lang.modules:scala-xml_2.12": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.12", "org.scalatest:scalatest_2.12" ] }, @@ -556,17 +575,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.12": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.12" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.12": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -648,22 +667,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -777,24 +808,14 @@ "com.typesafe.slick:slick-hikaricp_2.12" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -910,9 +931,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.39", @@ -946,20 +984,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -1015,14 +1053,14 @@ "locked": "1.0.6", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.12", - "org.scalatest:scalatest_2.12" + "io.gatling:jsonpath_2.12" ] }, "org.scala-lang.modules:scala-xml_2.12": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.12", "org.scalatest:scalatest_2.12" ] }, @@ -1068,17 +1106,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.12": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.12" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.12": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -1160,22 +1198,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -1187,8 +1237,8 @@ ] }, "com.h2database:h2": { - "locked": "1.4.191", - "requested": "1.4.191" + "locked": "1.4.197", + "requested": "1.4.197" }, "com.softwaremill.quicklens:quicklens_2.12": { "locked": "1.4.8", @@ -1293,24 +1343,14 @@ "com.typesafe.slick:slick-hikaricp_2.12" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -1430,9 +1470,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.39", @@ -1466,20 +1523,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -1535,14 +1592,14 @@ "locked": "1.0.6", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.12", - "org.scalatest:scalatest_2.12" + "io.gatling:jsonpath_2.12" ] }, "org.scala-lang.modules:scala-xml_2.12": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.12", "org.scalatest:scalatest_2.12" ] }, @@ -1588,17 +1645,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.12": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.12" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.12": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -1688,22 +1745,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -1714,10 +1783,6 @@ "com.google.guava:guava" ] }, - "com.h2database:h2": { - "locked": "1.4.191", - "requested": "1.4.191" - }, "com.softwaremill.quicklens:quicklens_2.12": { "locked": "1.4.8", "transitive": [ @@ -1821,24 +1886,14 @@ "com.typesafe.slick:slick-hikaricp_2.12" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -1948,19 +2003,32 @@ "locked": "4.12", "requested": "4.12" }, - "mysql:mysql-connector-java": { - "locked": "5.1.47", - "requested": "5.1.47" - }, "net.sf.saxon:Saxon-HE": { "locked": "9.8.0-4", "transitive": [ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.39", @@ -1994,20 +2062,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -2063,14 +2131,14 @@ "locked": "1.0.6", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.12", - "org.scalatest:scalatest_2.12" + "io.gatling:jsonpath_2.12" ] }, "org.scala-lang.modules:scala-xml_2.12": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.12", "org.scalatest:scalatest_2.12" ] }, @@ -2116,17 +2184,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.12": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.12" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.12": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -2140,20 +2208,12 @@ "org.asynchttpclient:async-http-client-netty-utils", "org.asynchttpclient:netty-codec-dns", "org.asynchttpclient:netty-resolver", - "org.asynchttpclient:netty-resolver-dns", - "org.tinylog:slf4j-binding" + "org.asynchttpclient:netty-resolver-dns" ] }, - "org.tinylog:slf4j-binding": { - "locked": "1.3.5", - "requested": "1.3.5" - }, "org.tinylog:tinylog": { "locked": "1.3.5", - "requested": "1.3.5", - "transitive": [ - "org.tinylog:slf4j-binding" - ] + "requested": "1.3.5" } }, "runtimeClasspath": { @@ -2216,22 +2276,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -2243,8 +2315,8 @@ ] }, "com.h2database:h2": { - "locked": "1.4.191", - "requested": "1.4.191" + "locked": "1.4.197", + "requested": "1.4.197" }, "com.softwaremill.quicklens:quicklens_2.12": { "locked": "1.4.8", @@ -2349,24 +2421,14 @@ "com.typesafe.slick:slick-hikaricp_2.12" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -2486,9 +2548,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.39", @@ -2522,20 +2601,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -2591,14 +2670,14 @@ "locked": "1.0.6", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.12", - "org.scalatest:scalatest_2.12" + "io.gatling:jsonpath_2.12" ] }, "org.scala-lang.modules:scala-xml_2.12": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.12", "org.scalatest:scalatest_2.12" ] }, @@ -2644,17 +2723,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.12": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.12" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.12": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -2774,22 +2853,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -2903,24 +2994,14 @@ "com.typesafe.slick:slick-hikaricp_2.12" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -3036,9 +3117,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.39", @@ -3072,20 +3170,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -3141,14 +3239,14 @@ "locked": "1.0.6", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.12", - "org.scalatest:scalatest_2.12" + "io.gatling:jsonpath_2.12" ] }, "org.scala-lang.modules:scala-xml_2.12": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.12", "org.scalatest:scalatest_2.12" ] }, @@ -3194,17 +3292,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.12": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.12" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.12": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -3286,22 +3384,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -3415,24 +3525,14 @@ "com.typesafe.slick:slick-hikaricp_2.12" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -3548,9 +3648,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.39", @@ -3584,20 +3701,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -3653,14 +3770,14 @@ "locked": "1.0.6", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.12", - "org.scalatest:scalatest_2.12" + "io.gatling:jsonpath_2.12" ] }, "org.scala-lang.modules:scala-xml_2.12": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.12", "org.scalatest:scalatest_2.12" ] }, @@ -3706,17 +3823,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.12": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.12" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.12": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -3798,22 +3915,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -3824,10 +3953,6 @@ "com.google.guava:guava" ] }, - "com.h2database:h2": { - "locked": "1.4.191", - "requested": "1.4.191" - }, "com.softwaremill.quicklens:quicklens_2.12": { "locked": "1.4.8", "transitive": [ @@ -3931,24 +4056,14 @@ "com.typesafe.slick:slick-hikaricp_2.12" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -4058,19 +4173,32 @@ "locked": "4.12", "requested": "4.12" }, - "mysql:mysql-connector-java": { - "locked": "5.1.47", - "requested": "5.1.47" - }, "net.sf.saxon:Saxon-HE": { "locked": "9.8.0-4", "transitive": [ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.39", @@ -4104,20 +4232,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -4173,14 +4301,14 @@ "locked": "1.0.6", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.12", - "org.scalatest:scalatest_2.12" + "io.gatling:jsonpath_2.12" ] }, "org.scala-lang.modules:scala-xml_2.12": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.12", "org.scalatest:scalatest_2.12" ] }, @@ -4226,17 +4354,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.12": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.12" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.12": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -4250,20 +4378,12 @@ "org.asynchttpclient:async-http-client-netty-utils", "org.asynchttpclient:netty-codec-dns", "org.asynchttpclient:netty-resolver", - "org.asynchttpclient:netty-resolver-dns", - "org.tinylog:slf4j-binding" + "org.asynchttpclient:netty-resolver-dns" ] }, - "org.tinylog:slf4j-binding": { - "locked": "1.3.5", - "requested": "1.3.5" - }, "org.tinylog:tinylog": { "locked": "1.3.5", - "requested": "1.3.5", - "transitive": [ - "org.tinylog:slf4j-binding" - ] + "requested": "1.3.5" } }, "testRuntimeClasspath": { @@ -4326,22 +4446,34 @@ ] }, "com.google.code.gson:gson": { - "locked": "2.8.0", - "requested": "2.8.0" + "locked": "2.8.5", + "requested": "2.8.5" }, "com.google.errorprone:error_prone_annotations": { - "locked": "2.1.3", + "locked": "2.2.0", + "transitive": [ + "com.google.guava:guava" + ] + }, + "com.google.guava:failureaccess": { + "locked": "1.0", "transitive": [ "com.google.guava:guava" ] }, "com.google.guava:guava": { - "locked": "25.1-jre", - "requested": "25.1-jre", + "locked": "27.0-jre", + "requested": "27.0-jre", "transitive": [ "com.google.inject:guice" ] }, + "com.google.guava:listenablefuture": { + "locked": "9999.0-empty-to-avoid-conflict-with-guava", + "transitive": [ + "com.google.guava:guava" + ] + }, "com.google.inject:guice": { "locked": "4.2.2", "requested": "4.2.2" @@ -4353,8 +4485,8 @@ ] }, "com.h2database:h2": { - "locked": "1.4.191", - "requested": "1.4.191" + "locked": "1.4.197", + "requested": "1.4.197" }, "com.softwaremill.quicklens:quicklens_2.12": { "locked": "1.4.8", @@ -4459,24 +4591,14 @@ "com.typesafe.slick:slick-hikaricp_2.12" ] }, - "commons-configuration:commons-configuration": { - "locked": "1.9", - "requested": "1.9" - }, "commons-io:commons-io": { - "locked": "2.4", - "requested": "2.4" - }, - "commons-lang:commons-lang": { "locked": "2.6", - "transitive": [ - "commons-configuration:commons-configuration" - ] + "requested": "2.6" }, "commons-logging:commons-logging": { - "locked": "1.1.1", + "locked": "1.2", "transitive": [ - "commons-configuration:commons-configuration" + "org.apache.commons:commons-configuration2" ] }, "io.advantageous.boon:boon-json": { @@ -4596,9 +4718,26 @@ "io.gatling:gatling-core" ] }, + "org.apache.commons:commons-configuration2": { + "locked": "2.4", + "requested": "2.4" + }, + "org.apache.commons:commons-lang3": { + "locked": "3.8.1", + "transitive": [ + "org.apache.commons:commons-configuration2", + "org.apache.commons:commons-text" + ] + }, "org.apache.commons:commons-math3": { - "locked": "3.5", - "requested": "3.5" + "locked": "3.6.1", + "requested": "3.6.1" + }, + "org.apache.commons:commons-text": { + "locked": "1.6", + "transitive": [ + "org.apache.commons:commons-configuration2" + ] }, "org.asynchttpclient:async-http-client": { "locked": "2.0.39", @@ -4632,20 +4771,20 @@ ] }, "org.checkerframework:checker-qual": { - "locked": "2.0.0", + "locked": "2.5.2", "transitive": [ "com.google.guava:guava" ] }, "org.codehaus.mojo:animal-sniffer-annotations": { - "locked": "1.14", + "locked": "1.17", "transitive": [ "com.google.guava:guava" ] }, "org.flywaydb:flyway-core": { - "locked": "5.1.1", - "requested": "5.1.1" + "locked": "5.2.1", + "requested": "5.2.1" }, "org.hamcrest:hamcrest-core": { "locked": "1.3", @@ -4701,14 +4840,14 @@ "locked": "1.0.6", "transitive": [ "io.gatling:gatling-core", - "io.gatling:jsonpath_2.12", - "org.scalatest:scalatest_2.12" + "io.gatling:jsonpath_2.12" ] }, "org.scala-lang.modules:scala-xml_2.12": { "locked": "1.1.0", "transitive": [ "io.gatling:gatling-http", + "org.scalactic:scalactic_2.12", "org.scalatest:scalatest_2.12" ] }, @@ -4754,17 +4893,17 @@ "requested": "3.0.+" }, "org.scalactic:scalactic_2.12": { - "locked": "3.0.0", + "locked": "3.0.6-SNAP5", "transitive": [ "org.scalatest:scalatest_2.12" ] }, "org.scalatest:scalatest_%%": { "project": true, - "requested": "3.0.0" + "requested": "3.0.+" }, "org.scalatest:scalatest_2.12": { - "locked": "3.0.0" + "locked": "3.0.6-SNAP5" }, "org.slf4j:slf4j-api": { "locked": "1.7.25", @@ -4793,52 +4932,5 @@ "org.tinylog:slf4j-binding" ] } - }, - "zinc": { - "com.typesafe.sbt:compiler-interface": { - "locked": "0.13.15", - "transitive": [ - "com.typesafe.zinc:zinc" - ] - }, - "com.typesafe.sbt:incremental-compiler": { - "locked": "0.13.15", - "transitive": [ - "com.typesafe.zinc:zinc" - ] - }, - "com.typesafe.sbt:sbt-interface": { - "locked": "0.13.15", - "transitive": [ - "com.typesafe.sbt:incremental-compiler" - ] - }, - "com.typesafe.zinc:zinc": { - "locked": "0.3.15", - "requested": "0.3.15" - }, - "org.scala-lang:scala-compiler": { - "locked": "2.10.6", - "transitive": [ - "com.typesafe.sbt:incremental-compiler" - ] - }, - "org.scala-lang:scala-library": { - "locked": "2.10.6", - "transitive": [ - "com.typesafe.sbt:compiler-interface", - "com.typesafe.sbt:incremental-compiler", - "com.typesafe.sbt:sbt-interface", - "com.typesafe.zinc:zinc", - "org.scala-lang:scala-compiler", - "org.scala-lang:scala-reflect" - ] - }, - "org.scala-lang:scala-reflect": { - "locked": "2.10.6", - "transitive": [ - "org.scala-lang:scala-compiler" - ] - } } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 72e15193..755646b5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,4 +8,4 @@ scalaVersions=2.11.12,2.12.7 # during releases, we only want to create 1 repo tag. # note that devSnapshot and snapshot tasks won't create repo tags # see https://github.com/ADTRAN/gradle-scala-multiversion-plugin#advanced-configuration -runOnceTasks=clean,candidate,final,release +runOnceTasks=clean,candidate,final,release,generateGradleLintReport diff --git a/src/main/scala/com/workday/warp/common/WarpPropertyManager.scala b/src/main/scala/com/workday/warp/common/WarpPropertyManager.scala index ba04d17f..12712323 100644 --- a/src/main/scala/com/workday/warp/common/WarpPropertyManager.scala +++ b/src/main/scala/com/workday/warp/common/WarpPropertyManager.scala @@ -1,12 +1,13 @@ package com.workday.warp.common -import java.io.File +import java.io.{File, FileReader} import java.util.Properties import com.workday.warp.common.exception.WarpConfigurationException import com.workday.warp.inject.WarpGuicer import com.workday.warp.logger.WarpLogUtils -import org.apache.commons.configuration.{ConfigurationException, PropertiesConfiguration} +import org.apache.commons.configuration2.PropertiesConfiguration +import org.apache.commons.configuration2.ex.ConfigurationException import org.pmw.tinylog.Logger import scala.collection.JavaConverters._ @@ -45,7 +46,7 @@ object WarpPropertyManager { val propertyFile: String = computePropertyFile // load the configuration file - Try(configuration.load(propertyFile)) recover { + Try(configuration.read(new FileReader(propertyFile))) recover { case exception: ConfigurationException => Logger.error(exception, s"Error loading WARP Configuration file: $propertyFile \n\n") } diff --git a/src/main/scala/com/workday/warp/persistence/Connection.scala b/src/main/scala/com/workday/warp/persistence/Connection.scala index 75765d6b..ad99a095 100644 --- a/src/main/scala/com/workday/warp/persistence/Connection.scala +++ b/src/main/scala/com/workday/warp/persistence/Connection.scala @@ -10,6 +10,7 @@ import Tables.profile.backend.DatabaseDef import com.typesafe.config.ConfigFactory import com.workday.warp.utils.SynchronousExecutor import org.flywaydb.core.Flyway +import org.flywaydb.core.api.configuration.FluentConfiguration import slick.dbio.DBIOAction import org.pmw.tinylog.Logger import slick.jdbc.{JdbcDataSource, TransactionIsolation} @@ -52,13 +53,16 @@ trait Connection { * * @return an [[Option]] containing a [[Flyway]] instance for database schema migration. */ - def maybeFlyway(): Option[Flyway] = { + def maybeFlyway(locations: Seq[String] = Seq.empty): Option[Flyway] = { this.getMySQLDbName map { _ => - val flyway: Flyway = new Flyway - // initialize the metadata table if we don't have it already - flyway.setBaselineOnMigrate(true) - flyway.setDataSource(Connection.url, Connection.user, Connection.password) - flyway + val config: FluentConfiguration = Flyway.configure + // initialize the metadata table if we don't have it already + .baselineOnMigrate(true) + .dataSource(Connection.url, Connection.user, Connection.password) + + // override migration search locations if specified + if (locations.isEmpty) config.load() + else config.locations(locations: _*).load() } } diff --git a/src/main/scala/com/workday/warp/persistence/PersistenceAware.scala b/src/main/scala/com/workday/warp/persistence/PersistenceAware.scala index f2eb12bb..e5bebe73 100644 --- a/src/main/scala/com/workday/warp/persistence/PersistenceAware.scala +++ b/src/main/scala/com/workday/warp/persistence/PersistenceAware.scala @@ -424,11 +424,8 @@ trait MigrateSchemaLike extends PersistenceAware { * @param locations locations we'll recursively scan for migration scripts. */ def migrate(locations: Seq[String] = Seq.empty): Unit = { - this.persistenceUtils.maybeFlyway() match { + this.persistenceUtils.maybeFlyway(locations) match { case Some(flyway) => - if (locations.nonEmpty) { - flyway.setLocations(locations: _*) - } this.retry({ val before: Long = System.currentTimeMillis() flyway.migrate() diff --git a/src/main/scala/com/workday/warp/persistence/influxdb/InfluxDBClient.scala b/src/main/scala/com/workday/warp/persistence/influxdb/InfluxDBClient.scala index 3a51c2fd..4c97337a 100644 --- a/src/main/scala/com/workday/warp/persistence/influxdb/InfluxDBClient.scala +++ b/src/main/scala/com/workday/warp/persistence/influxdb/InfluxDBClient.scala @@ -176,9 +176,10 @@ trait InfluxDBClient extends StackTraceFilter with CorePersistenceAware { /** - * Deletes the database specified by databaseName + * Deletes the database with the specified name. * - * @param database name of the database to delete + * @param database name of the database to delete. + * @return */ def dropDatabase(database: String): Try[Unit] = { val dropQuery: Query = new Query(s"""DROP DATABASE "$database"""", database) @@ -191,6 +192,7 @@ trait InfluxDBClient extends StackTraceFilter with CorePersistenceAware { /** + * Creates a database with the specified name. * * @param database * @return diff --git a/src/test/scala/com/workday/warp/common/utils/FileUtilsSpec.scala b/src/test/scala/com/workday/warp/common/utils/FileUtilsSpec.scala index 99e85ed8..89a82c46 100644 --- a/src/test/scala/com/workday/warp/common/utils/FileUtilsSpec.scala +++ b/src/test/scala/com/workday/warp/common/utils/FileUtilsSpec.scala @@ -1,6 +1,7 @@ package com.workday.warp.common.utils import java.io.InputStream +import java.nio.charset.Charset import java.util.zip.ZipException import com.workday.warp.common.category.UnitTest @@ -36,7 +37,7 @@ class FileUtilsSpec extends WarpJUnitSpec { val stream: InputStream = FileUtils.getStreamToLogFileInZip(filePath, "zipEntryFile.txt") - IOUtils.toString(stream) should include ("This is a zip entry") + IOUtils.toString(stream, Charset.defaultCharset) should include ("This is a zip entry") } /** diff --git a/src/test/scala/com/workday/warp/persistence/MigrationSpec.scala b/src/test/scala/com/workday/warp/persistence/MigrationSpec.scala index 8f0b2603..3e5ac317 100644 --- a/src/test/scala/com/workday/warp/persistence/MigrationSpec.scala +++ b/src/test/scala/com/workday/warp/persistence/MigrationSpec.scala @@ -15,7 +15,7 @@ import org.pmw.tinylog.Logger class MigrationSpec extends WarpJUnitSpec with Connection with CorePersistenceAware with MigrateSchemaLike { - override val maybeFlyway: Option[Flyway] = this.persistenceUtils.maybeFlyway() + val maybeFlyway: Option[Flyway] = this.persistenceUtils.maybeFlyway() /** Drops the schema once before we start our concurrent test. */ @BeforeOnce diff --git a/versionInfo.gradle b/versionInfo.gradle index 6b64f570..044da984 100644 --- a/versionInfo.gradle +++ b/versionInfo.gradle @@ -38,20 +38,20 @@ def gatlingVersion() { // compile group: 'com.h2database', name: 'h2', version: "${versions.h2}" project.ext.versions = [ checkstyle: '8.11' - , commonsConfiguration: '1.9' - , commonsIo: '2.4' + , commonsConfiguration2: '2.4' + , commonsIo: '2.6' , coveralls: '2.8.2' - , flyway: '5.1.1' + , flyway: '5.2.1' , gatling: gatlingVersion() , gradleGit: '1.7.2' , gradleScoverage: '2.3.0' - , guava: '25.1-jre' + , guava: '27.0-jre' , guice: '4.2.2' - , gson: '2.8.0' - , h2: '1.4.191' + , gson: '2.8.5' + , h2: '1.4.197' , influxDbClient: '2.14' , junit: '4.12' - , math3: '3.5' + , math3: '3.6.1' , mysqlConnector: '5.1.47' , nebulaDependencyLock: '5.0.0' , nebulaGit: '3.0.1' @@ -60,7 +60,7 @@ project.ext.versions = [ , nebulaPublish: '8.2.0' , scalactic: '3.0.+' , scalaMultiversion: '1.+' - , scalatest: '3.0.0' + , scalatest: '3.0.+' , scalaStyle: '1.0.1' , scalacScoverage: '1.3.1' , slick: '3.2.3' diff --git a/warp.properties b/warp.properties index 2c2c4474..81646e99 100644 --- a/warp.properties +++ b/warp.properties @@ -6,3 +6,6 @@ wd.warp.jdbc.driver=com.mysql.jdbc.Driver wd.warp.migrate.schema=true wd.warp.log.level=info + +# only for testing +systemProp.wd.warp.foo=bar