diff --git a/build.gradle b/build.gradle index 28987cba986..026f4455484 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ buildscript { classpath 'com.bmuschko:gradle-docker-plugin:3.2.1' classpath 'gradle.plugin.org.openrepose:gradle-linkchecker-plugin:1.0.0' classpath 'gradle.plugin.io.github.http-builder-ng:http-plugin:0.1.1' - classpath 'org.owasp:dependency-check-gradle:5.1.0' + classpath 'org.owasp:dependency-check-gradle:5.2.0' } } @@ -37,8 +37,8 @@ apply plugin: 'io.github.http-builder-ng.http-plugin' ext { reposeCodename = "Falco" scalaMajor = '2' - scalaMinor = '11' - scalaPatch = '12' + scalaMinor = '12' + scalaPatch = '8' scalaMajDotMin = "$scalaMajor.$scalaMinor" } @@ -173,8 +173,8 @@ subprojects { jaxb "javax.xml.bind:jaxb-api" jaxb "org.jvnet.jaxb2_commons:jaxb2-basics-ant" - scoverage "org.scoverage:scalac-scoverage-plugin_$scalaMajDotMin:1.1.0" - scoverage "org.scoverage:scalac-scoverage-runtime_$scalaMajDotMin:1.1.0" + scoverage "org.scoverage:scalac-scoverage-plugin_$scalaMajDotMin:1.4.0" + scoverage "org.scoverage:scalac-scoverage-runtime_$scalaMajDotMin:1.4.0" } diff --git a/repose-aggregator/artifacts/cli-utils/src/config/docs/DEPENDENCIES.txt b/repose-aggregator/artifacts/cli-utils/src/config/docs/DEPENDENCIES.txt index 1ee4851fccd..450f97fd4b2 100644 --- a/repose-aggregator/artifacts/cli-utils/src/config/docs/DEPENDENCIES.txt +++ b/repose-aggregator/artifacts/cli-utils/src/config/docs/DEPENDENCIES.txt @@ -22,11 +22,11 @@ com.fasterxml.jackson.core jackson-databind 2. commons-codec commons-codec 1.10 Apache License Version 2.0 http://commons.apache.org/proper/commons-codec/ commons-io commons-io 2.4 Apache License Version 2.0 http://commons.apache.org/proper/commons-io/ commons-pool commons-pool 1.6 Apache License Version 2.0 http://commons.apache.org/proper/commons-pool/ -com.typesafe.scala-logging scala-logging-slf4j_2.11 2.1.2 Apache License Version 2.0 https://github.com/typesafehub/scala-logging +com.typesafe.scala-logging scala-logging_2.12 3.9.2 Apache License Version 2.0 https://github.com/typesafehub/scala-logging io.dropwizard.metrics metrics-core 3.2.0 Apache License Version 2.0 https://github.com/dropwizard/metrics/blob/v3.2.0/LICENSE org.apache.commons commons-lang3 3.8.1 Apache License Version 2.0 http://projects.apache.org/projects/commons_lang.html org.apache.httpcomponents httpclient 4.4.1 Apache License Version 2.0 http://hc.apache.org/httpcomponents-client-4.4.x/index.html org.jvnet.jaxb2_commons jaxb2-basics-runtime 0.6.5 CDDL v1.1 and GPL v2 https://jaxb.java.net/ -org.scala-lang scala-library 2.11.12 Scala Specific License http://www.scala-lang.org/license.html -org.scala-lang scala-reflect 2.11.12 Scala Specific License http://www.scala-lang.org/license.html +org.scala-lang scala-library 2.12.8 Scala Specific License http://www.scala-lang.org/license.html +org.scala-lang scala-reflect 2.12.8 Scala Specific License http://www.scala-lang.org/license.html org.slf4j slf4j-api 1.7.22 MIT License http://slf4j.org/license.html diff --git a/repose-aggregator/artifacts/experimental-filter-bundle/src/config/docs/DEPENDENCIES.txt b/repose-aggregator/artifacts/experimental-filter-bundle/src/config/docs/DEPENDENCIES.txt index 1ee4851fccd..f4a89b5f28e 100644 --- a/repose-aggregator/artifacts/experimental-filter-bundle/src/config/docs/DEPENDENCIES.txt +++ b/repose-aggregator/artifacts/experimental-filter-bundle/src/config/docs/DEPENDENCIES.txt @@ -22,11 +22,11 @@ com.fasterxml.jackson.core jackson-databind 2. commons-codec commons-codec 1.10 Apache License Version 2.0 http://commons.apache.org/proper/commons-codec/ commons-io commons-io 2.4 Apache License Version 2.0 http://commons.apache.org/proper/commons-io/ commons-pool commons-pool 1.6 Apache License Version 2.0 http://commons.apache.org/proper/commons-pool/ -com.typesafe.scala-logging scala-logging-slf4j_2.11 2.1.2 Apache License Version 2.0 https://github.com/typesafehub/scala-logging +com.typesafe.scala-logging scala-logging_2.12 3.9.2 Apache License Version 2.0 https://github.com/typesafehub/scala-logging io.dropwizard.metrics metrics-core 3.2.0 Apache License Version 2.0 https://github.com/dropwizard/metrics/blob/v3.2.0/LICENSE org.apache.commons commons-lang3 3.8.1 Apache License Version 2.0 http://projects.apache.org/projects/commons_lang.html org.apache.httpcomponents httpclient 4.4.1 Apache License Version 2.0 http://hc.apache.org/httpcomponents-client-4.4.x/index.html org.jvnet.jaxb2_commons jaxb2-basics-runtime 0.6.5 CDDL v1.1 and GPL v2 https://jaxb.java.net/ -org.scala-lang scala-library 2.11.12 Scala Specific License http://www.scala-lang.org/license.html -org.scala-lang scala-reflect 2.11.12 Scala Specific License http://www.scala-lang.org/license.html +org.scala-lang scala-library 2.12.8 Scala Specific License http://www.scala-lang.org/license.html +org.scala-lang scala-reflect 2.12.8 Scala Specific License http://www.scala-lang.org/license.html org.slf4j slf4j-api 1.7.22 MIT License http://slf4j.org/license.html diff --git a/repose-aggregator/artifacts/extensions-filter-bundle/src/config/docs/DEPENDENCIES.txt b/repose-aggregator/artifacts/extensions-filter-bundle/src/config/docs/DEPENDENCIES.txt index 3233d13fdd1..c686b02f1a5 100644 --- a/repose-aggregator/artifacts/extensions-filter-bundle/src/config/docs/DEPENDENCIES.txt +++ b/repose-aggregator/artifacts/extensions-filter-bundle/src/config/docs/DEPENDENCIES.txt @@ -25,12 +25,12 @@ commons-codec commons-codec 1. commons-io commons-io 2.4 Apache License Version 2.0 http://commons.apache.org/proper/commons-io/ commons-pool commons-pool 1.6 Apache License Version 2.0 http://commons.apache.org/proper/commons-pool/ com.rackspace.identity.components.attribute-mapper mapper-core 2.2.1 Apache License Version 2.0 https://github.com/rackerlabs/attributeMapping -com.rackspace.papi.components.api-checker checker-core 2.7.0 Apache License Version 2.0 https://github.com/rackerlabs/api-checker/blob/api-checker-2.7.0/LICENSE.txt -com.rackspace.papi.components.api-checker checker-util 2.7.0 Apache License Version 2.0 https://github.com/rackerlabs/api-checker/blob/api-checker-2.7.0/LICENSE.txt -com.typesafe.akka akka-actor_2.11 2.4.20 Apache License Version 2.0 https://github.com/akka/akka +com.rackspace.papi.components.api-checker checker-core 2.8.0 Apache License Version 2.0 https://github.com/rackerlabs/api-checker/blob/api-checker-2.7.0/LICENSE.txt +com.rackspace.papi.components.api-checker checker-util 2.8.0 Apache License Version 2.0 https://github.com/rackerlabs/api-checker/blob/api-checker-2.7.0/LICENSE.txt +com.typesafe.akka akka-actor_2.12 2.5.23 Apache License Version 2.0 https://github.com/akka/akka com.typesafe config 1.3.0 Apache License Version 2.0 https://github.com/typesafehub/config -com.typesafe.play play-json_2.11 2.5.2 Apache License Version 2.0 https://github.com/playframework/playframework -com.typesafe.scala-logging scala-logging-slf4j_2.11 2.1.2 Apache License Version 2.0 https://github.com/typesafehub/scala-logging +com.typesafe.play play-json_2.12 2.7.4 Apache License Version 2.0 https://github.com/playframework/playframework +com.typesafe.scala-logging scala-logging-_2.12 3.9.2 Apache License Version 2.0 https://github.com/typesafehub/scala-logging io.dropwizard.metrics metrics-core 3.2.0 Apache License Version 2.0 https://github.com/dropwizard/metrics/blob/v3.2.0/LICENSE io.dropwizard.metrics metrics-graphite 3.2.0 Apache License Version 2.0 https://github.com/dropwizard/metrics/blob/v3.2.0/LICENSE javax.inject javax.inject 1 Apache License Version 2.0 https://jcp.org/en/jsr/detail?id=330 @@ -53,8 +53,8 @@ org.eclipse.jetty jetty-server 9. org.eclipse.jetty jetty-servlet 9.4.14.v20181114 Apache License Version 2.0 http://www.eclipse.org/jetty/licenses.php org.jtwig jtwig-core 5.86.1.RELEASE Apache License Version 2.0 https://github.com/jtwig/jtwig-core/blob/5.86.1.RELEASE/LICENSE org.jvnet.jaxb2_commons jaxb2-basics-runtime 0.6.5 CDDL v1.1 and GPL v2 https://jaxb.java.net/ -org.scala-lang scala-library 2.11.12 Scala Specific License http://www.scala-lang.org/license.html -org.scala-lang scala-reflect 2.11.12 Scala Specific License http://www.scala-lang.org/license.html +org.scala-lang scala-library 2.12.8 Scala Specific License http://www.scala-lang.org/license.html +org.scala-lang scala-reflect 2.12.8 Scala Specific License http://www.scala-lang.org/license.html org.slf4j jcl-over-slf4j 1.7.7 MIT License http://slf4j.org/license.html org.slf4j slf4j-api 1.7.22 MIT License http://slf4j.org/license.html org.springframework spring-beans 4.3.21.RELEASE Apache License Version 2.0 https://github.com/spring-projects/spring-framework diff --git a/repose-aggregator/artifacts/filter-bundle/src/config/docs/DEPENDENCIES.txt b/repose-aggregator/artifacts/filter-bundle/src/config/docs/DEPENDENCIES.txt index 6c437e9d498..168e0a674bd 100644 --- a/repose-aggregator/artifacts/filter-bundle/src/config/docs/DEPENDENCIES.txt +++ b/repose-aggregator/artifacts/filter-bundle/src/config/docs/DEPENDENCIES.txt @@ -23,18 +23,16 @@ com.fasterxml.jackson.core jackson-core com.fasterxml.jackson.core jackson-databind 2.9.8 Apache License Version 2.0 http://wiki.fasterxml.com/JacksonDownload com.github.jknack handlebars 2.0.0 Apache License Version 2.0 https://github.com/jknack/handlebars.java com.google.guava guava 27.0.1-jre Apache License Version 2.0 https://github.com/google/guava -com.jayway.jsonpath json-path 2.4.0 Apache License Version 2.0 https://github.com/jayway/JsonPath commons-codec commons-codec 1.10 Apache License Version 2.0 http://commons.apache.org/proper/commons-codec/ commons-io commons-io 2.4 Apache License Version 2.0 http://commons.apache.org/proper/commons-io/ commons-pool commons-pool 1.6 Apache License Version 2.0 http://commons.apache.org/proper/commons-pool/ -com.rackspace.cloud.api wadl-tools_2.11 1.0.32 Apache License Version 2.0 https://github.com/rackerlabs/wadl-tools/blob/wadl-tools-aggregator-1.0.32/LICENSE -com.typesafe.akka akka-actor_2.11 2.4.20 Apache License Version 2.0 https://github.com/akka/akka +com.typesafe.akka akka-actor_2.12 2.5.23 Apache License Version 2.0 https://github.com/akka/akka com.typesafe config 1.3.0 Apache License Version 2.0 https://github.com/typesafehub/config -com.typesafe.play play-json_2.11 2.5.2 Apache License Version 2.0 https://github.com/playframework/playframework -com.typesafe.scala-logging scala-logging-slf4j_2.11 2.1.2 Apache License Version 2.0 https://github.com/typesafehub/scala-logging +com.typesafe.play play-json_2.12 2.7.4 Apache License Version 2.0 https://github.com/playframework/playframework +com.typesafe.scala-logging scala-logging_2.12 3.9.2 Apache License Version 2.0 https://github.com/typesafehub/scala-logging io.dropwizard.metrics metrics-core 3.2.0 Apache License Version 2.0 https://github.com/dropwizard/metrics/blob/v3.2.0/LICENSE io.dropwizard.metrics metrics-graphite 3.2.0 Apache License Version 2.0 https://github.com/dropwizard/metrics/blob/v3.2.0/LICENSE -io.gatling jsonpath_2.11 0.6.4 Apache License Version 2.0 https://github.com/gatling/jsonpath +io.gatling jsonpath_2.12 0.6.10 Apache License Version 2.0 https://github.com/gatling/jsonpath javax.inject javax.inject 1 Apache License Version 2.0 https://jcp.org/en/jsr/detail?id=330 javax.ws.rs javax.ws.rs-api 2.0.1 CDDL v1.1 https://jax-rs-spec.java.net/ joda-time joda-time 2.9.2 Apache License Version 2.0 http://joda-time.sourceforge.net/license.html @@ -55,16 +53,16 @@ org.apache.logging.log4j log4j-slf4j-impl org.codehaus.groovy groovy-all 2.4.15 Apache License Version 2.0 https://github.com/apache/groovy org.eclipse.jetty jetty-server 9.4.14.v20181114 Apache License Version 2.0 http://www.eclipse.org/jetty/licenses.php org.eclipse.jetty jetty-servlet 9.4.14.v20181114 Apache License Version 2.0 http://www.eclipse.org/jetty/licenses.php -org.gnieh diffson_2.11 2.0.1 Apache License Version 2.0 https://github.com/gnieh/diffson +org.gnieh diffson-play-json_2.12 2.2.6 Apache License Version 2.0 https://github.com/gnieh/diffson org.joda joda-convert 1.8.1 Apache License Version 2.0 http://www.joda.org/joda-convert/ org.jtwig jtwig-core 5.86.1.RELEASE Apache License Version 2.0 https://github.com/jtwig/jtwig-core/blob/5.86.1.RELEASE/LICENSE org.jvnet.jaxb2_commons jaxb2-basics-runtime 0.6.5 CDDL v1.1 and GPL v2 https://jaxb.java.net/ org.luaj luaj-jse 3.0.1 MIT License http://luaj.sourceforge.net/ -org.openrepose http-delegation 4.0.0 Apache License Version 2.0 https://github.com/rackerlabs/repose +org.openrepose http-delegation 5.0.0 Apache License Version 2.0 https://github.com/rackerlabs/repose org.python jython-standalone 2.7.1 Jython Specific License http://www.jython.org/license.html -org.scala-lang.modules scala-xml_2.11 1.0.5 Scala Specific License http://www.scala-lang.org/license.html -org.scala-lang scala-library 2.11.12 Scala Specific License http://www.scala-lang.org/license.html -org.scala-lang scala-reflect 2.11.12 Scala Specific License http://www.scala-lang.org/license.html +org.scala-lang.modules scala-xml_2.12 1.0.5 Scala Specific License http://www.scala-lang.org/license.html +org.scala-lang scala-library 2.12.8 Scala Specific License http://www.scala-lang.org/license.html +org.scala-lang scala-reflect 2.12.8 Scala Specific License http://www.scala-lang.org/license.html org.slf4j jcl-over-slf4j 1.7.7 MIT License http://slf4j.org/license.html org.slf4j slf4j-api 1.7.22 MIT License http://slf4j.org/license.html org.springframework spring-beans 4.3.21.RELEASE Apache License Version 2.0 https://github.com/spring-projects/spring-framework diff --git a/repose-aggregator/artifacts/valve/build.gradle b/repose-aggregator/artifacts/valve/build.gradle index baf247d02ba..9e47f3bad4a 100644 --- a/repose-aggregator/artifacts/valve/build.gradle +++ b/repose-aggregator/artifacts/valve/build.gradle @@ -17,7 +17,7 @@ dependencies { compile project(":repose-aggregator:core:repose-core") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "org.slf4j:jcl-over-slf4j" compile "com.github.scopt:scopt_$scalaMajDotMin" compile "com.typesafe:config" diff --git a/repose-aggregator/artifacts/valve/src/config/docs/DEPENDENCIES.txt b/repose-aggregator/artifacts/valve/src/config/docs/DEPENDENCIES.txt index 9128147a0f2..4683a992742 100644 --- a/repose-aggregator/artifacts/valve/src/config/docs/DEPENDENCIES.txt +++ b/repose-aggregator/artifacts/valve/src/config/docs/DEPENDENCIES.txt @@ -20,15 +20,15 @@ Group Name Ve com.fasterxml.jackson.core jackson-annotations 2.9.8 Apache License Version 2.0 http://wiki.fasterxml.com/JacksonDownload com.fasterxml.jackson.core jackson-core 2.9.8 Apache License Version 2.0 http://wiki.fasterxml.com/JacksonDownload com.fasterxml.jackson.core jackson-databind 2.9.8 Apache License Version 2.0 http://wiki.fasterxml.com/JacksonDownload -com.github.scopt scopt_2.11 3.2.0 MIT License https://github.com/scopt/scopt +com.github.scopt scopt_2.12 3.7.1 MIT License https://github.com/scopt/scopt com.google.guava guava 27.0.1-jre Apache License Version 2.0 https://github.com/google/guava commons-codec commons-codec 1.10 Apache License Version 2.0 http://commons.apache.org/proper/commons-codec/ commons-io commons-io 2.4 Apache License Version 2.0 http://commons.apache.org/proper/commons-io/ commons-pool commons-pool 1.6 Apache License Version 2.0 http://commons.apache.org/proper/commons-pool/ -com.typesafe.akka akka-actor_2.11 2.4.20 Apache License Version 2.0 https://github.com/akka/akka +com.typesafe.akka akka-actor_2.12 2.5.23 Apache License Version 2.0 https://github.com/akka/akka com.typesafe config 1.3.0 Apache License Version 2.0 https://github.com/typesafehub/config -com.typesafe.play play-json_2.11 2.5.2 Apache License Version 2.0 https://github.com/playframework/playframework -com.typesafe.scala-logging scala-logging-slf4j_2.11 2.1.2 Apache License Version 2.0 https://github.com/typesafehub/scala-logging +com.typesafe.play play-json_2.12 2.7.4 Apache License Version 2.0 https://github.com/playframework/playframework +com.typesafe.scala-logging scala-logging_2.121 3.9.2 Apache License Version 2.0 https://github.com/typesafehub/scala-logging io.dropwizard.metrics metrics-core 3.2.0 Apache License Version 2.0 https://github.com/dropwizard/metrics/blob/v3.2.0/LICENSE io.dropwizard.metrics metrics-graphite 3.2.0 Apache License Version 2.0 https://github.com/dropwizard/metrics/blob/v3.2.0/LICENSE io.dropwizard.metrics metrics-httpclient 3.2.0 Apache License Version 2.0 https://github.com/dropwizard/metrics/blob/v3.2.0/LICENSE @@ -56,8 +56,8 @@ org.eclipse.jetty jetty-servlet 9. org.eclipse.jetty jetty-util 9.4.14.v20181114 Apache License Version 2.0 http://www.eclipse.org/jetty/licenses.php org.jtwig jtwig-core 5.86.1.RELEASE Apache License Version 2.0 https://github.com/jtwig/jtwig-core/blob/5.86.1.RELEASE/LICENSE org.jvnet.jaxb2_commons jaxb2-basics-runtime 0.6.5 CDDL v1.1 and GPL v2 https://jaxb.java.net/ -org.scala-lang scala-library 2.11.12 Scala Specific License http://www.scala-lang.org/license.html -org.scala-lang scala-reflect 2.11.12 Scala Specific License http://www.scala-lang.org/license.html +org.scala-lang scala-library 2.12.8 Scala Specific License http://www.scala-lang.org/license.html +org.scala-lang scala-reflect 2.12.8 Scala Specific License http://www.scala-lang.org/license.html org.slf4j jcl-over-slf4j 1.7.7 MIT License http://slf4j.org/license.html org.slf4j slf4j-api 1.7.22 MIT License http://slf4j.org/license.html org.springframework spring-beans 4.3.21.RELEASE Apache License Version 2.0 https://github.com/spring-projects/spring-framework diff --git a/repose-aggregator/artifacts/valve/src/main/scala/org/openrepose/valve/jetty/HttpLoggingServiceChannelListener.scala b/repose-aggregator/artifacts/valve/src/main/scala/org/openrepose/valve/jetty/HttpLoggingServiceChannelListener.scala index 733da5ec254..7f32aab40a8 100644 --- a/repose-aggregator/artifacts/valve/src/main/scala/org/openrepose/valve/jetty/HttpLoggingServiceChannelListener.scala +++ b/repose-aggregator/artifacts/valve/src/main/scala/org/openrepose/valve/jetty/HttpLoggingServiceChannelListener.scala @@ -21,7 +21,7 @@ package org.openrepose.valve.jetty import java.time.Instant -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, Named} import org.eclipse.jetty.server.{HttpChannel, Request} import org.openrepose.commons.utils.http.CommonRequestAttributes diff --git a/repose-aggregator/artifacts/valve/src/main/scala/org/openrepose/valve/jetty/HttpLoggingServiceRequestLog.scala b/repose-aggregator/artifacts/valve/src/main/scala/org/openrepose/valve/jetty/HttpLoggingServiceRequestLog.scala index 193c8e0c017..5d3bf0dd7c8 100644 --- a/repose-aggregator/artifacts/valve/src/main/scala/org/openrepose/valve/jetty/HttpLoggingServiceRequestLog.scala +++ b/repose-aggregator/artifacts/valve/src/main/scala/org/openrepose/valve/jetty/HttpLoggingServiceRequestLog.scala @@ -21,7 +21,7 @@ package org.openrepose.valve.jetty import java.time.Instant -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, Named} import org.eclipse.jetty.server.{Request, RequestLog, Response} import org.openrepose.commons.utils.logging.HttpLoggingContextHelper diff --git a/repose-aggregator/artifacts/valve/src/main/scala/org/openrepose/valve/spring/ValveRunner.scala b/repose-aggregator/artifacts/valve/src/main/scala/org/openrepose/valve/spring/ValveRunner.scala index 439f9bd44ce..5a2afc66b06 100644 --- a/repose-aggregator/artifacts/valve/src/main/scala/org/openrepose/valve/spring/ValveRunner.scala +++ b/repose-aggregator/artifacts/valve/src/main/scala/org/openrepose/valve/spring/ValveRunner.scala @@ -24,7 +24,7 @@ import java.net.{InetAddress, NetworkInterface, UnknownHostException} import java.util.concurrent.CountDownLatch import java.util.concurrent.atomic.AtomicReference -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, Named} import javax.management.{InstanceNotFoundException, ObjectName} import org.openrepose.commons.config.manager.UpdateListener diff --git a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/ValveTest.scala b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/ValveTest.scala index d5496fb7af9..b8a29c9fe9b 100644 --- a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/ValveTest.scala +++ b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/ValveTest.scala @@ -27,7 +27,7 @@ import org.apache.http.HttpResponse import org.apache.http.client.methods.HttpGet import org.apache.http.impl.client.HttpClients import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{BeforeAndAfterAll, FunSpec, Matchers} import org.slf4j.LoggerFactory diff --git a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/HttpLoggingServiceChannelListenerTest.scala b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/HttpLoggingServiceChannelListenerTest.scala index 57665e6e5f8..fc66154be3d 100644 --- a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/HttpLoggingServiceChannelListenerTest.scala +++ b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/HttpLoggingServiceChannelListenerTest.scala @@ -26,8 +26,8 @@ import org.junit.runner.RunWith import org.mockito.Mockito.{verify, when} import org.openrepose.commons.utils.http.CommonRequestAttributes import org.openrepose.core.services.httplogging.{HttpLoggingContext, HttpLoggingService} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/HttpLoggingServiceRequestLogTest.scala b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/HttpLoggingServiceRequestLogTest.scala index 19b487ec60c..8a1434ba5be 100644 --- a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/HttpLoggingServiceRequestLogTest.scala +++ b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/HttpLoggingServiceRequestLogTest.scala @@ -28,8 +28,8 @@ import org.mockito.Matchers.{any, anyLong} import org.mockito.Mockito.{never, verify, when} import org.openrepose.commons.utils.http.CommonRequestAttributes import org.openrepose.core.services.httplogging.{HttpLoggingContext, HttpLoggingService} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/ReposeJettySSLTest.scala b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/ReposeJettySSLTest.scala index 1bfdc739e3c..7de555d420e 100644 --- a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/ReposeJettySSLTest.scala +++ b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/ReposeJettySSLTest.scala @@ -32,7 +32,7 @@ import org.junit.runner.RunWith import org.openrepose.core.container.config.{SslCipherConfiguration, SslConfiguration, SslProtocolConfiguration} import org.openrepose.core.spring.CoreSpringProvider import org.openrepose.valve.SpringContextResetter -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{BeforeAndAfterAll, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/ReposeJettyServerTest.scala b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/ReposeJettyServerTest.scala index ae22938aef7..ac57ee9970f 100644 --- a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/ReposeJettyServerTest.scala +++ b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/jetty/ReposeJettyServerTest.scala @@ -28,8 +28,8 @@ import org.openrepose.core.container.config.SslConfiguration import org.openrepose.core.spring.{CoreSpringProvider, ReposeSpringProperties} import org.openrepose.valve.SpringContextResetter import org.openrepose.valve.jetty.ReposeJettyServer.ServerInitializationException -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/spring/ValveRunnerTest.scala b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/spring/ValveRunnerTest.scala index 467ff2b7a7a..a9a74ef42ac 100644 --- a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/spring/ValveRunnerTest.scala +++ b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/spring/ValveRunnerTest.scala @@ -25,7 +25,7 @@ import org.openrepose.core.container.config.ContainerConfiguration import org.openrepose.core.spring.CoreSpringProvider import org.openrepose.core.systemmodel.config.SystemModel import org.openrepose.nodeservice.test.FakeContainerConfigurationService -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} import org.slf4j.LoggerFactory diff --git a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/spring/ValveTestModeRunnerTest.scala b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/spring/ValveTestModeRunnerTest.scala index 617d00f17fe..76087fe5fd7 100644 --- a/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/spring/ValveTestModeRunnerTest.scala +++ b/repose-aggregator/artifacts/valve/src/test/scala/org/openrepose/valve/spring/ValveTestModeRunnerTest.scala @@ -22,7 +22,7 @@ package org.openrepose.valve.spring import java.lang.management.ManagementFactory import javax.management.{JMX, ObjectName} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.junit.runner.RunWith import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.core.container.config.ContainerConfiguration @@ -30,7 +30,7 @@ import org.openrepose.core.spring.CoreSpringProvider import org.openrepose.core.systemmodel.config.SystemModel import org.openrepose.nodeservice.test.FakeContainerConfigurationService import org.openrepose.valve.jmx.ValvePortMXBean -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} import org.slf4j.LoggerFactory diff --git a/repose-aggregator/commons/commons-configuration/build.gradle b/repose-aggregator/commons/commons-configuration/build.gradle index 9d13127e40b..20f12a3f41f 100644 --- a/repose-aggregator/commons/commons-configuration/build.gradle +++ b/repose-aggregator/commons/commons-configuration/build.gradle @@ -16,7 +16,7 @@ dependencies { testCompile "org.scala-lang:scala-library" testCompile "org.scalatest:scalatest_$scalaMajDotMin" testCompile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - testCompile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + testCompile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" testCompile "org.codehaus.groovy:groovy-all" testCompile "org.spockframework:spock-core" testCompile "org.apache.logging.log4j:log4j-slf4j-impl" diff --git a/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/ConfigValidatorTest.scala b/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/ConfigValidatorTest.scala index ec639d551c0..403a132e99e 100644 --- a/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/ConfigValidatorTest.scala +++ b/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/ConfigValidatorTest.scala @@ -23,7 +23,7 @@ import java.io.InputStream import java.net.URL import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} import org.xml.sax.SAXParseException diff --git a/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/ConfigurationTestTest.scala b/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/ConfigurationTestTest.scala index ecb3b1ad582..9d0bab7fd16 100644 --- a/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/ConfigurationTestTest.scala +++ b/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/ConfigurationTestTest.scala @@ -22,7 +22,7 @@ package org.openrepose.commons.test import java.net.URL import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/HttpContextMatchersTest.scala b/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/HttpContextMatchersTest.scala index 101d3ce6ff9..0717223979c 100644 --- a/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/HttpContextMatchersTest.scala +++ b/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/HttpContextMatchersTest.scala @@ -26,8 +26,8 @@ import org.hamcrest.{Description, Matcher, SelfDescribing} import org.junit.runner.RunWith import org.mockito.Matchers.{any, anyObject, anyString} import org.mockito.Mockito.{verify, when} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} import scala.Function.tupled diff --git a/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/HttpUriRequestMatchersTest.scala b/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/HttpUriRequestMatchersTest.scala index df07ded0d2d..ffb3fe0acf4 100644 --- a/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/HttpUriRequestMatchersTest.scala +++ b/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/HttpUriRequestMatchersTest.scala @@ -29,8 +29,8 @@ import org.hamcrest.{Description, Matcher, SelfDescribing} import org.junit.runner.RunWith import org.mockito.Matchers.{any, anyObject, anyString} import org.mockito.Mockito.{verify, when} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/MockitoAnswersTest.scala b/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/MockitoAnswersTest.scala index c8e80cb3f54..bd8c5f72fc4 100644 --- a/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/MockitoAnswersTest.scala +++ b/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/MockitoAnswersTest.scala @@ -22,8 +22,8 @@ package org.openrepose.commons.test import org.junit.runner.RunWith import org.mockito.invocation.InvocationOnMock import org.scalatest.{FunSpec, Matchers} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar /** * Created by adrian on 12/6/16. diff --git a/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/RegexMatcherTest.scala b/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/RegexMatcherTest.scala index 77182553382..86d35aa032a 100644 --- a/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/RegexMatcherTest.scala +++ b/repose-aggregator/commons/commons-test/src/test/scala/org/openrepose/commons/test/RegexMatcherTest.scala @@ -22,8 +22,8 @@ package org.openrepose.commons.test import org.hamcrest.Description import org.junit.runner.RunWith import org.mockito.Mockito -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/commons/commons-utilities/build.gradle b/repose-aggregator/commons/commons-utilities/build.gradle index 8d2e65d6c37..e9649a9f585 100644 --- a/repose-aggregator/commons/commons-utilities/build.gradle +++ b/repose-aggregator/commons/commons-utilities/build.gradle @@ -6,7 +6,7 @@ dependencies { compile "org.slf4j:slf4j-api" compile "commons-pool:commons-pool" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "commons-io:commons-io" compile "commons-codec:commons-codec" compile "org.apache.commons:commons-lang3" diff --git a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/jmx/JmxObjectNameFactory.scala b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/jmx/JmxObjectNameFactory.scala index 4cf48e36207..0cf96438717 100644 --- a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/jmx/JmxObjectNameFactory.scala +++ b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/jmx/JmxObjectNameFactory.scala @@ -22,7 +22,7 @@ package org.openrepose.commons.utils.jmx import java.util import javax.management.{MalformedObjectNameException, ObjectName} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import scala.util.Try diff --git a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/logging/HttpLoggingContextHelper.scala b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/logging/HttpLoggingContextHelper.scala index 19ec6b6f50d..98b25b15a82 100644 --- a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/logging/HttpLoggingContextHelper.scala +++ b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/logging/HttpLoggingContextHelper.scala @@ -19,7 +19,7 @@ */ package org.openrepose.commons.utils.logging -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.servlet.http.HttpServletRequest import org.openrepose.commons.utils.http.CommonRequestAttributes import org.openrepose.core.services.httplogging.HttpLoggingContext diff --git a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/logging/TracingHeaderHelper.scala b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/logging/TracingHeaderHelper.scala index 6aaa2f5a35f..72076ca75a1 100644 --- a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/logging/TracingHeaderHelper.scala +++ b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/logging/TracingHeaderHelper.scala @@ -26,7 +26,7 @@ import java.util import com.fasterxml.jackson.core.JsonFactory import com.fasterxml.jackson.core.`type`.TypeReference import com.fasterxml.jackson.databind.ObjectMapper -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.apache.commons.codec.binary.Base64 import org.slf4j.MDC diff --git a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingRequestInterceptor.scala b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingRequestInterceptor.scala index 6e0073d9a9b..884a7c18d18 100644 --- a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingRequestInterceptor.scala +++ b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingRequestInterceptor.scala @@ -21,7 +21,7 @@ package org.openrepose.commons.utils.opentracing.httpclient import java.io.IOException -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import io.opentracing.Tracer import io.opentracing.propagation.Format.Builtin.HTTP_HEADERS import io.opentracing.propagation.TextMap diff --git a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingResponseInterceptor.scala b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingResponseInterceptor.scala index 782d1466f69..fa3009dcb3f 100644 --- a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingResponseInterceptor.scala +++ b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingResponseInterceptor.scala @@ -21,7 +21,7 @@ package org.openrepose.commons.utils.opentracing.httpclient import java.io.IOException -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import io.opentracing.Span import io.opentracing.tag.Tags._ import org.apache.http._ diff --git a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/HttpServletResponseWrapper.scala b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/HttpServletResponseWrapper.scala index ac9d4d2854f..75243456c10 100644 --- a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/HttpServletResponseWrapper.scala +++ b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/HttpServletResponseWrapper.scala @@ -24,7 +24,7 @@ import java.nio.charset.{Charset, StandardCharsets} import java.util import java.util.Date -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.servlet.http.HttpServletResponse import javax.servlet.{ServletOutputStream, ServletResponse} import javax.ws.rs.core.HttpHeaders diff --git a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/MutableServletOutputStream.scala b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/MutableServletOutputStream.scala index 4dd34c9fb40..73bc34f7916 100644 --- a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/MutableServletOutputStream.scala +++ b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/MutableServletOutputStream.scala @@ -21,7 +21,7 @@ package org.openrepose.commons.utils.servlet.http import java.io.{ByteArrayInputStream, ByteArrayOutputStream, InputStream} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.servlet.ServletOutputStream import org.apache.commons.io.IOUtils diff --git a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/PassthroughServletOutputStream.scala b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/PassthroughServletOutputStream.scala index c0c078ffaaf..7b762c4adad 100644 --- a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/PassthroughServletOutputStream.scala +++ b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/PassthroughServletOutputStream.scala @@ -21,7 +21,7 @@ package org.openrepose.commons.utils.servlet.http import java.io.InputStream -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.servlet.ServletOutputStream class PassthroughServletOutputStream(servletOutputStream: ServletOutputStream) diff --git a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/ReadOnlyServletOutputStream.scala b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/ReadOnlyServletOutputStream.scala index a44f05c192a..f4aed3b2701 100644 --- a/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/ReadOnlyServletOutputStream.scala +++ b/repose-aggregator/commons/commons-utilities/src/main/scala/org/openrepose/commons/utils/servlet/http/ReadOnlyServletOutputStream.scala @@ -21,7 +21,7 @@ package org.openrepose.commons.utils.servlet.http import java.io.{ByteArrayInputStream, ByteArrayOutputStream, InputStream} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.servlet.ServletOutputStream class ReadOnlyServletOutputStream(servletOutputStream: ServletOutputStream) diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/io/FileUtilitiesTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/io/FileUtilitiesTest.scala index f05ad01e82e..2dd4bd2bfaf 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/io/FileUtilitiesTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/io/FileUtilitiesTest.scala @@ -20,7 +20,7 @@ package org.openrepose.commons.utils.io import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/jmx/JmxObjectNameFactoryTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/jmx/JmxObjectNameFactoryTest.scala index 1b350452a32..92c26aea586 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/jmx/JmxObjectNameFactoryTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/jmx/JmxObjectNameFactoryTest.scala @@ -23,7 +23,7 @@ import javax.management.ObjectName import org.junit.runner.RunWith import org.scalatest.{FunSpec, Matchers} -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class JmxObjectNameFactoryTest extends FunSpec with Matchers { diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/json/JsonHeaderHelperTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/json/JsonHeaderHelperTest.scala index 58a2f428487..2d847bcc370 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/json/JsonHeaderHelperTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/json/JsonHeaderHelperTest.scala @@ -21,7 +21,7 @@ package org.openrepose.commons.utils.json import org.junit.runner.RunWith import org.openrepose.commons.utils.string.Base64Helper -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/logging/apache/format/stock/ResponseMessageHandlerTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/logging/apache/format/stock/ResponseMessageHandlerTest.scala index a2b33985780..ca966b6221a 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/logging/apache/format/stock/ResponseMessageHandlerTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/logging/apache/format/stock/ResponseMessageHandlerTest.scala @@ -26,8 +26,8 @@ import org.junit.runner.RunWith import org.openrepose.commons.utils.logging.apache.HttpLogFormatterState import org.openrepose.commons.utils.servlet.http.{HttpServletResponseWrapper, ResponseMode} import org.scalatest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar @RunWith(classOf[JUnitRunner]) class ResponseMessageHandlerTest extends FunSpec with BeforeAndAfterEach with GivenWhenThen with Matchers with MockitoSugar { diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/logging/apache/format/stock/TraceGuidHandlerTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/logging/apache/format/stock/TraceGuidHandlerTest.scala index 0181a9e2d68..2ad8e254908 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/logging/apache/format/stock/TraceGuidHandlerTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/logging/apache/format/stock/TraceGuidHandlerTest.scala @@ -25,8 +25,8 @@ import javax.servlet.http.HttpServletRequest import org.junit.runner.RunWith import org.openrepose.commons.utils.http.CommonHttpHeader -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/HttpRequestCarrierTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/HttpRequestCarrierTest.scala index e3327f50483..c4ea959d9d2 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/HttpRequestCarrierTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/HttpRequestCarrierTest.scala @@ -21,8 +21,8 @@ package org.openrepose.commons.utils.opentracing import org.junit.runner.RunWith import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfter, FunSpec, Matchers} import org.springframework.mock.web.MockHttpServletRequest diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/ScopeHelperTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/ScopeHelperTest.scala index 5fd768a5489..8408a546121 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/ScopeHelperTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/ScopeHelperTest.scala @@ -28,8 +28,8 @@ import org.junit.runner.RunWith import org.mockito.Matchers.{any, anyBoolean, anyString, isNull, eq => eql} import org.mockito.Mockito.{verify, when} import org.openrepose.core.services.uriredaction.UriRedactionService -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.slf4j.Logger import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingRequestInterceptorTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingRequestInterceptorTest.scala index 7999bc8c540..2079f101e21 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingRequestInterceptorTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingRequestInterceptorTest.scala @@ -31,8 +31,8 @@ import org.mockito.Mockito.{verify, when} import org.openrepose.commons.utils.http.CommonHttpHeader.{REQUEST_ID, VIA} import org.openrepose.commons.utils.opentracing.ReposeTags.ReposeVersion import org.openrepose.core.services.uriredaction.UriRedactionService -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingResponseInterceptorTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingResponseInterceptorTest.scala index 26cb52b1842..358c1639ce2 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingResponseInterceptorTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/opentracing/httpclient/ReposeTracingResponseInterceptorTest.scala @@ -28,8 +28,8 @@ import org.junit.runner.RunWith import org.mockito.Matchers.{anyInt, eq => isEq} import org.mockito.Mockito.{never, verify, when} import org.openrepose.commons.utils.opentracing.httpclient.ReposeTracingInterceptorConstants.OpenTracingSpan -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/scala/TryWithTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/scala/TryWithTest.scala index b23cc0e01cc..d5c3841e79b 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/scala/TryWithTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/scala/TryWithTest.scala @@ -20,7 +20,7 @@ package org.openrepose.commons.utils.scala import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{Matchers, WordSpec} import scala.util.{Failure, Success} diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/HttpServletRequestWrapperTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/HttpServletRequestWrapperTest.scala index 0e473e2228c..c754aa1346c 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/HttpServletRequestWrapperTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/HttpServletRequestWrapperTest.scala @@ -27,7 +27,7 @@ import javax.servlet.ServletInputStream import javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED import org.junit.runner.RunWith import org.openrepose.commons.utils.io.stream.ServletInputStreamWrapper -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.MockHttpServletRequest diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/HttpServletResponseWrapperTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/HttpServletResponseWrapperTest.scala index 537248efaed..96ecd39f9fc 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/HttpServletResponseWrapperTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/HttpServletResponseWrapperTest.scala @@ -32,8 +32,8 @@ import org.apache.logging.log4j.test.appender.ListAppender import org.junit.runner.RunWith import org.mockito.Matchers.{eq => mEq, _} import org.mockito.Mockito._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.MockHttpServletResponse diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/MutableServletOutputStreamTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/MutableServletOutputStreamTest.scala index e640786c9ca..75fe4ca7d71 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/MutableServletOutputStreamTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/MutableServletOutputStreamTest.scala @@ -25,8 +25,8 @@ import javax.servlet.ServletOutputStream import org.junit.runner.RunWith import org.mockito.Mockito._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} import scala.io.Source diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/PassthroughServletOutputStreamTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/PassthroughServletOutputStreamTest.scala index 34b6ef025a8..8358d16ee70 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/PassthroughServletOutputStreamTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/PassthroughServletOutputStreamTest.scala @@ -26,8 +26,8 @@ import org.junit.runner.RunWith import org.mockito.AdditionalMatchers._ import org.mockito.Matchers.{eq => mEq} import org.mockito.Mockito._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/ReadOnlyServletOutputStreamTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/ReadOnlyServletOutputStreamTest.scala index 8c54fc4cbf7..22342ec282e 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/ReadOnlyServletOutputStreamTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/servlet/http/ReadOnlyServletOutputStreamTest.scala @@ -26,8 +26,8 @@ import org.junit.runner.RunWith import org.mockito.AdditionalMatchers._ import org.mockito.Matchers.{eq => mEq} import org.mockito.Mockito._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} import scala.io.Source diff --git a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/string/RegexStringOperatorsTest.scala b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/string/RegexStringOperatorsTest.scala index dbed8af37d3..fdb5efccb8e 100644 --- a/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/string/RegexStringOperatorsTest.scala +++ b/repose-aggregator/commons/commons-utilities/src/test/scala/org/openrepose/commons/utils/string/RegexStringOperatorsTest.scala @@ -22,7 +22,7 @@ package org.openrepose.commons.utils.string import java.util.regex.Matcher import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/add-header-filter/build.gradle b/repose-aggregator/components/filters/add-header-filter/build.gradle index 4f59ef7983a..896ac85d46d 100644 --- a/repose-aggregator/components/filters/add-header-filter/build.gradle +++ b/repose-aggregator/components/filters/add-header-filter/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" compileOnly "javax.inject:javax.inject" diff --git a/repose-aggregator/components/filters/add-header-filter/src/main/scala/org/openrepose/filters/addheader/AddHeaderFilter.scala b/repose-aggregator/components/filters/add-header-filter/src/main/scala/org/openrepose/filters/addheader/AddHeaderFilter.scala index 7431a910b67..5694718fde0 100644 --- a/repose-aggregator/components/filters/add-header-filter/src/main/scala/org/openrepose/filters/addheader/AddHeaderFilter.scala +++ b/repose-aggregator/components/filters/add-header-filter/src/main/scala/org/openrepose/filters/addheader/AddHeaderFilter.scala @@ -23,7 +23,7 @@ import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.{HttpServletResponse, HttpServletRequest} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.servlet.http.ResponseMode._ import org.openrepose.commons.utils.servlet.http.{HeaderInteractor, HttpServletResponseWrapper, HttpServletRequestWrapper} diff --git a/repose-aggregator/components/filters/add-header-filter/src/test/scala/org/openrepose/filters/addheader/AddHeaderFilterTest.scala b/repose-aggregator/components/filters/add-header-filter/src/test/scala/org/openrepose/filters/addheader/AddHeaderFilterTest.scala index 567c7c93c24..97e68103046 100644 --- a/repose-aggregator/components/filters/add-header-filter/src/test/scala/org/openrepose/filters/addheader/AddHeaderFilterTest.scala +++ b/repose-aggregator/components/filters/add-header-filter/src/test/scala/org/openrepose/filters/addheader/AddHeaderFilterTest.scala @@ -30,8 +30,8 @@ import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.Answer import org.openrepose.commons.utils.servlet.http.{HttpServletRequestWrapper, HttpServletResponseWrapper} import org.openrepose.filters.addheader.config.{AddHeadersConfig, Header, HttpMessage} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} @@ -220,4 +220,4 @@ class AddHeaderFilterTest extends FunSpec with BeforeAndAfterEach with Matchers object AddHeaderFilterTest { case class SimpleHeader(name: String, value: String) -} \ No newline at end of file +} diff --git a/repose-aggregator/components/filters/add-header-filter/src/test/scala/org/openrepose/filters/addheader/config/AddHeaderSchemaTest.scala b/repose-aggregator/components/filters/add-header-filter/src/test/scala/org/openrepose/filters/addheader/config/AddHeaderSchemaTest.scala index d2c80b68cac..887b75234b4 100644 --- a/repose-aggregator/components/filters/add-header-filter/src/test/scala/org/openrepose/filters/addheader/config/AddHeaderSchemaTest.scala +++ b/repose-aggregator/components/filters/add-header-filter/src/test/scala/org/openrepose/filters/addheader/config/AddHeaderSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/api-validator-filter/build.gradle b/repose-aggregator/components/filters/api-validator-filter/build.gradle index 466b17a1c8d..23710d14f82 100644 --- a/repose-aggregator/components/filters/api-validator-filter/build.gradle +++ b/repose-aggregator/components/filters/api-validator-filter/build.gradle @@ -4,6 +4,7 @@ dependencies { compile project(":repose-aggregator:core:repose-core") compile "xalan:xalan" // Forces the version used by api-checker. compile "com.google.guava:guava" // Forces the version used by api-checker. + compile "io.spray:spray-json_2.12" // Forces the version used by api-checker. compile "com.rackspace.papi.components.api-checker:checker-core" compile "io.dropwizard.metrics:metrics-core" compile "org.slf4j:slf4j-api" diff --git a/repose-aggregator/components/filters/api-validator-filter/src/test/scala/org/openrepose/filters/apivalidator/ValidatorConfigurationTest.scala b/repose-aggregator/components/filters/api-validator-filter/src/test/scala/org/openrepose/filters/apivalidator/ValidatorConfigurationTest.scala index 2e0e1236993..282812ef554 100644 --- a/repose-aggregator/components/filters/api-validator-filter/src/test/scala/org/openrepose/filters/apivalidator/ValidatorConfigurationTest.scala +++ b/repose-aggregator/components/filters/api-validator-filter/src/test/scala/org/openrepose/filters/apivalidator/ValidatorConfigurationTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest import org.openrepose.filters.apivalidator.config.ObjectFactory -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/api-validator-filter/src/test/scala/org/openrepose/filters/apivalidator/config/ApiValidatorSchemaTest.scala b/repose-aggregator/components/filters/api-validator-filter/src/test/scala/org/openrepose/filters/apivalidator/config/ApiValidatorSchemaTest.scala index 7cfbfe67be9..868cd303b01 100644 --- a/repose-aggregator/components/filters/api-validator-filter/src/test/scala/org/openrepose/filters/apivalidator/config/ApiValidatorSchemaTest.scala +++ b/repose-aggregator/components/filters/api-validator-filter/src/test/scala/org/openrepose/filters/apivalidator/config/ApiValidatorSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/body-extractor-to-header-filter/build.gradle b/repose-aggregator/components/filters/body-extractor-to-header-filter/build.gradle index 82562f49d15..0ff28648098 100644 --- a/repose-aggregator/components/filters/body-extractor-to-header-filter/build.gradle +++ b/repose-aggregator/components/filters/body-extractor-to-header-filter/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "com.jayway.jsonpath:json-path" compileOnly "javax.servlet:javax.servlet-api" diff --git a/repose-aggregator/components/filters/body-extractor-to-header-filter/src/test/scala/org/openrepose/filters/bodyextractortoheader/BodyExtractorToHeaderFilterTest.scala b/repose-aggregator/components/filters/body-extractor-to-header-filter/src/test/scala/org/openrepose/filters/bodyextractortoheader/BodyExtractorToHeaderFilterTest.scala index 181d84381e8..0561b01a5ac 100644 --- a/repose-aggregator/components/filters/body-extractor-to-header-filter/src/test/scala/org/openrepose/filters/bodyextractortoheader/BodyExtractorToHeaderFilterTest.scala +++ b/repose-aggregator/components/filters/body-extractor-to-header-filter/src/test/scala/org/openrepose/filters/bodyextractortoheader/BodyExtractorToHeaderFilterTest.scala @@ -30,8 +30,8 @@ import org.mockito.Matchers._ import org.mockito.Mockito._ import org.openrepose.core.services.config.ConfigurationService import org.openrepose.filters.bodyextractortoheader.config.{BodyExtractorToHeaderConfig, Extractor} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockFilterChain, MockHttpServletRequest} diff --git a/repose-aggregator/components/filters/body-extractor-to-header-filter/src/test/scala/org/openrepose/filters/bodyextractortoheader/config/BodyExtractorToHeaderSchemaTest.scala b/repose-aggregator/components/filters/body-extractor-to-header-filter/src/test/scala/org/openrepose/filters/bodyextractortoheader/config/BodyExtractorToHeaderSchemaTest.scala index 6e9f7f0a2d6..0ac286424f0 100644 --- a/repose-aggregator/components/filters/body-extractor-to-header-filter/src/test/scala/org/openrepose/filters/bodyextractortoheader/config/BodyExtractorToHeaderSchemaTest.scala +++ b/repose-aggregator/components/filters/body-extractor-to-header-filter/src/test/scala/org/openrepose/filters/bodyextractortoheader/config/BodyExtractorToHeaderSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class BodyExtractorToHeaderSchemaTest extends ConfigurationTest { diff --git a/repose-aggregator/components/filters/body-patcher-filter/build.gradle b/repose-aggregator/components/filters/body-patcher-filter/build.gradle index 573d1a926c5..2cf2f79ad18 100644 --- a/repose-aggregator/components/filters/body-patcher-filter/build.gradle +++ b/repose-aggregator/components/filters/body-patcher-filter/build.gradle @@ -7,9 +7,9 @@ dependencies { compile project(":repose-aggregator:core:repose-core-api") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "com.typesafe.play:play-json_$scalaMajDotMin" - compile "org.gnieh:diffson_$scalaMajDotMin" + compile "org.gnieh:diffson-play-json_$scalaMajDotMin" compile "com.fasterxml.jackson.core:jackson-core" compileOnly "javax.servlet:javax.servlet-api" diff --git a/repose-aggregator/components/filters/body-patcher-filter/src/main/scala/org/openrepose/filters/bodypatcher/BodyPatcherFilter.scala b/repose-aggregator/components/filters/body-patcher-filter/src/main/scala/org/openrepose/filters/bodypatcher/BodyPatcherFilter.scala index da5e28f5cd2..23e6601d2a6 100644 --- a/repose-aggregator/components/filters/body-patcher-filter/src/main/scala/org/openrepose/filters/bodypatcher/BodyPatcherFilter.scala +++ b/repose-aggregator/components/filters/body-patcher-filter/src/main/scala/org/openrepose/filters/bodypatcher/BodyPatcherFilter.scala @@ -28,7 +28,7 @@ import javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import com.fasterxml.jackson.core.JsonParseException -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import gnieh.diffson.playJson._ import org.openrepose.commons.utils.io.stream.ServletInputStreamWrapper import org.openrepose.commons.utils.servlet.http.ResponseMode.{MUTABLE, PASSTHROUGH} diff --git a/repose-aggregator/components/filters/body-patcher-filter/src/test/scala/org/openrepose/filters/bodypatcher/BodyPatcherFilterTest.scala b/repose-aggregator/components/filters/body-patcher-filter/src/test/scala/org/openrepose/filters/bodypatcher/BodyPatcherFilterTest.scala index b9d5cb70d21..763d953b707 100644 --- a/repose-aggregator/components/filters/body-patcher-filter/src/test/scala/org/openrepose/filters/bodypatcher/BodyPatcherFilterTest.scala +++ b/repose-aggregator/components/filters/body-patcher-filter/src/test/scala/org/openrepose/filters/bodypatcher/BodyPatcherFilterTest.scala @@ -32,8 +32,8 @@ import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.core.services.config.ConfigurationService import org.openrepose.filters.bodypatcher.BodyPatcherFilter._ import org.openrepose.filters.bodypatcher.config.{BodyPatcherConfig, ChangeDetails, Patch} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfter, FunSpec, Matchers} import org.springframework.mock.web.{MockFilterChain, MockHttpServletRequest, MockHttpServletResponse} import play.api.libs.json.{JsResultException, JsValue, Json => PJson} diff --git a/repose-aggregator/components/filters/body-patcher-filter/src/test/scala/org/openrepose/filters/bodypatcher/config/BodyPatcherSchemaTest.scala b/repose-aggregator/components/filters/body-patcher-filter/src/test/scala/org/openrepose/filters/bodypatcher/config/BodyPatcherSchemaTest.scala index 50bc532c0ab..4a1d7516db0 100644 --- a/repose-aggregator/components/filters/body-patcher-filter/src/test/scala/org/openrepose/filters/bodypatcher/config/BodyPatcherSchemaTest.scala +++ b/repose-aggregator/components/filters/body-patcher-filter/src/test/scala/org/openrepose/filters/bodypatcher/config/BodyPatcherSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException /** diff --git a/repose-aggregator/components/filters/compression-filter/build.gradle b/repose-aggregator/components/filters/compression-filter/build.gradle index 9569be0f2c6..db90a76f2ec 100644 --- a/repose-aggregator/components/filters/compression-filter/build.gradle +++ b/repose-aggregator/components/filters/compression-filter/build.gradle @@ -5,7 +5,7 @@ dependencies { compile "org.springframework:spring-beans" compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" compileOnly "javax.inject:javax.inject" diff --git a/repose-aggregator/components/filters/compression-filter/src/main/scala/org/openrepose/filters/compression/CompressionFilter.scala b/repose-aggregator/components/filters/compression-filter/src/main/scala/org/openrepose/filters/compression/CompressionFilter.scala index 23bfb425d32..e21d64605d9 100644 --- a/repose-aggregator/components/filters/compression-filter/src/main/scala/org/openrepose/filters/compression/CompressionFilter.scala +++ b/repose-aggregator/components/filters/compression-filter/src/main/scala/org/openrepose/filters/compression/CompressionFilter.scala @@ -26,7 +26,7 @@ import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.HttpServletResponse -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.core.filter.FilterConfigHelper import org.openrepose.core.services.config.ConfigurationService diff --git a/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/CompressingFilterFactoryTest.scala b/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/CompressingFilterFactoryTest.scala index 567ec209841..9470dad0c1b 100644 --- a/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/CompressingFilterFactoryTest.scala +++ b/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/CompressingFilterFactoryTest.scala @@ -24,9 +24,9 @@ import javax.servlet.{ServletContext, FilterConfig} import org.junit.runner.RunWith import org.mockito.Mockito._ -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{Matchers, FunSpec} -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class CompressingFilterFactoryTest extends FunSpec with Matchers with MockitoSugar { diff --git a/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/CompressionFilterCompleteTest.scala b/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/CompressionFilterCompleteTest.scala index 350a2bc5599..794e455693a 100644 --- a/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/CompressionFilterCompleteTest.scala +++ b/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/CompressionFilterCompleteTest.scala @@ -33,8 +33,8 @@ import org.mockito.stubbing.Answer import org.openrepose.core.services.config.ConfigurationService import org.openrepose.external.pjlcompression.CompressingFilter import org.openrepose.filters.compression.config.{Compression, ContentCompressionConfig} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/CompressionFilterTest.scala b/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/CompressionFilterTest.scala index 28a4061d348..fca03d62af6 100644 --- a/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/CompressionFilterTest.scala +++ b/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/CompressionFilterTest.scala @@ -31,8 +31,8 @@ import org.mockito.Mockito.{doThrow, verify, when} import org.openrepose.core.services.config.ConfigurationService import org.openrepose.external.pjlcompression.CompressingFilter import org.openrepose.filters.compression.config.{Compression, ContentCompressionConfig} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/config/ContentCompressionSchemaTest.scala b/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/config/ContentCompressionSchemaTest.scala index 3ddec6ec9d8..a77bdc8c15c 100644 --- a/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/config/ContentCompressionSchemaTest.scala +++ b/repose-aggregator/components/filters/compression-filter/src/test/scala/org/openrepose/filters/compression/config/ContentCompressionSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/content-type-stripper-filter/src/test/scala/org/openrepose/filters/contenttypestripper/ContentTypeStripperFilterTest.scala b/repose-aggregator/components/filters/content-type-stripper-filter/src/test/scala/org/openrepose/filters/contenttypestripper/ContentTypeStripperFilterTest.scala index b08233f1682..47ee09ad8a5 100644 --- a/repose-aggregator/components/filters/content-type-stripper-filter/src/test/scala/org/openrepose/filters/contenttypestripper/ContentTypeStripperFilterTest.scala +++ b/repose-aggregator/components/filters/content-type-stripper-filter/src/test/scala/org/openrepose/filters/contenttypestripper/ContentTypeStripperFilterTest.scala @@ -26,8 +26,8 @@ import org.apache.commons.io.IOUtils import org.junit.runner.RunWith import org.mockito.Matchers.any import org.mockito.{ArgumentCaptor, Mockito} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} import org.springframework.mock.web.MockHttpServletRequest diff --git a/repose-aggregator/components/filters/cors-filter/build.gradle b/repose-aggregator/components/filters/cors-filter/build.gradle index 6b98ddf0e2b..c54ca9999d6 100644 --- a/repose-aggregator/components/filters/cors-filter/build.gradle +++ b/repose-aggregator/components/filters/cors-filter/build.gradle @@ -4,7 +4,7 @@ dependencies { compile "org.scala-lang:scala-library" compile "com.google.guava:guava" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" compileOnly "javax.inject:javax.inject" diff --git a/repose-aggregator/components/filters/cors-filter/src/main/scala/org/openrepose/filters/cors/CorsFilter.scala b/repose-aggregator/components/filters/cors-filter/src/main/scala/org/openrepose/filters/cors/CorsFilter.scala index 38dc3486e8f..ec54d5591f0 100644 --- a/repose-aggregator/components/filters/cors-filter/src/main/scala/org/openrepose/filters/cors/CorsFilter.scala +++ b/repose-aggregator/components/filters/cors-filter/src/main/scala/org/openrepose/filters/cors/CorsFilter.scala @@ -28,7 +28,7 @@ import javax.ws.rs.HttpMethod import javax.ws.rs.core.{HttpHeaders, MediaType} import com.google.common.net.InetAddresses -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.apache.http.client.utils.URIBuilder import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.http.{CommonHttpHeader, CorsHttpHeader} diff --git a/repose-aggregator/components/filters/cors-filter/src/test/scala/org/openrepose/filters/cors/CorsFilterTest.scala b/repose-aggregator/components/filters/cors-filter/src/test/scala/org/openrepose/filters/cors/CorsFilterTest.scala index 26bf32a8b30..e9fc6ba17d4 100644 --- a/repose-aggregator/components/filters/cors-filter/src/test/scala/org/openrepose/filters/cors/CorsFilterTest.scala +++ b/repose-aggregator/components/filters/cors-filter/src/test/scala/org/openrepose/filters/cors/CorsFilterTest.scala @@ -32,8 +32,8 @@ import org.openrepose.commons.utils.http.{CommonHttpHeader, CorsHttpHeader} import org.openrepose.commons.utils.servlet.http.{HttpServletRequestWrapper, HttpServletResponseWrapper} import org.openrepose.filters.cors.config.Origins.Origin import org.openrepose.filters.cors.config._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/derp-filter/build.gradle b/repose-aggregator/components/filters/derp-filter/build.gradle index 2f441e0f24b..53249d9526b 100644 --- a/repose-aggregator/components/filters/derp-filter/build.gradle +++ b/repose-aggregator/components/filters/derp-filter/build.gradle @@ -2,7 +2,7 @@ dependencies { compile "org.scala-lang:scala-library" compile "org.openrepose:http-delegation" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" compileOnly "javax.ws.rs:javax.ws.rs-api" diff --git a/repose-aggregator/components/filters/derp-filter/src/main/scala/org/openrepose/filters/derp/DerpFilter.scala b/repose-aggregator/components/filters/derp-filter/src/main/scala/org/openrepose/filters/derp/DerpFilter.scala index 828f1494d73..4e5399fc0f2 100644 --- a/repose-aggregator/components/filters/derp-filter/src/main/scala/org/openrepose/filters/derp/DerpFilter.scala +++ b/repose-aggregator/components/filters/derp-filter/src/main/scala/org/openrepose/filters/derp/DerpFilter.scala @@ -24,7 +24,7 @@ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import javax.ws.rs.core.MediaType import com.rackspace.httpdelegation._ -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import scala.collection.JavaConverters._ import scala.util.{Failure, Success} diff --git a/repose-aggregator/components/filters/derp-filter/src/test/scala/org/openrepose/filters/derp/DerpFilterTest.scala b/repose-aggregator/components/filters/derp-filter/src/test/scala/org/openrepose/filters/derp/DerpFilterTest.scala index 05d5e91783a..69f91d1fd46 100644 --- a/repose-aggregator/components/filters/derp-filter/src/test/scala/org/openrepose/filters/derp/DerpFilterTest.scala +++ b/repose-aggregator/components/filters/derp-filter/src/test/scala/org/openrepose/filters/derp/DerpFilterTest.scala @@ -30,8 +30,8 @@ import org.mockito.Mockito._ import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.Answer import org.scalatest.FunSpec -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import scala.collection.JavaConverters.asJavaEnumerationConverter diff --git a/repose-aggregator/components/filters/destination-router-filter/build.gradle b/repose-aggregator/components/filters/destination-router-filter/build.gradle index b9a49cba5d7..8ac2ba3264a 100644 --- a/repose-aggregator/components/filters/destination-router-filter/build.gradle +++ b/repose-aggregator/components/filters/destination-router-filter/build.gradle @@ -4,7 +4,7 @@ dependencies { compile "org.slf4j:slf4j-api" compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "io.dropwizard.metrics:metrics-core" compileOnly "javax.servlet:javax.servlet-api" diff --git a/repose-aggregator/components/filters/destination-router-filter/src/main/scala/org/openrepose/filters/destinationrouter/DestinationRouterFilter.scala b/repose-aggregator/components/filters/destination-router-filter/src/main/scala/org/openrepose/filters/destinationrouter/DestinationRouterFilter.scala index e4a1790cda0..72925b6c3c0 100644 --- a/repose-aggregator/components/filters/destination-router-filter/src/main/scala/org/openrepose/filters/destinationrouter/DestinationRouterFilter.scala +++ b/repose-aggregator/components/filters/destination-router-filter/src/main/scala/org/openrepose/filters/destinationrouter/DestinationRouterFilter.scala @@ -26,7 +26,7 @@ import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import com.codahale.metrics.MetricRegistry -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.http.CommonRequestAttributes import org.openrepose.commons.utils.servlet.http.RouteDestination diff --git a/repose-aggregator/components/filters/destination-router-filter/src/test/scala/org/openrepose/filters/destinationrouter/DestinationRouterFilterTest.scala b/repose-aggregator/components/filters/destination-router-filter/src/test/scala/org/openrepose/filters/destinationrouter/DestinationRouterFilterTest.scala index ff608894f08..00c207d7f21 100644 --- a/repose-aggregator/components/filters/destination-router-filter/src/test/scala/org/openrepose/filters/destinationrouter/DestinationRouterFilterTest.scala +++ b/repose-aggregator/components/filters/destination-router-filter/src/test/scala/org/openrepose/filters/destinationrouter/DestinationRouterFilterTest.scala @@ -31,8 +31,8 @@ import org.openrepose.commons.utils.servlet.http.RouteDestination import org.openrepose.core.services.config.ConfigurationService import org.openrepose.core.services.reporting.metrics.{MetricsService, AggregateMeterFactory} import org.openrepose.filters.routing.servlet.config.{DestinationRouterConfiguration, Target} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockFilterChain, MockFilterConfig, MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/forwarded-proto-filter/build.gradle b/repose-aggregator/components/filters/forwarded-proto-filter/build.gradle index 440c02d87b2..e9937ad0fbf 100644 --- a/repose-aggregator/components/filters/forwarded-proto-filter/build.gradle +++ b/repose-aggregator/components/filters/forwarded-proto-filter/build.gradle @@ -2,7 +2,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" diff --git a/repose-aggregator/components/filters/forwarded-proto-filter/src/main/scala/org/openrepose/filters/forwardedproto/ForwardedProtoFilter.scala b/repose-aggregator/components/filters/forwarded-proto-filter/src/main/scala/org/openrepose/filters/forwardedproto/ForwardedProtoFilter.scala index 60f9bcc13ed..754585ec416 100644 --- a/repose-aggregator/components/filters/forwarded-proto-filter/src/main/scala/org/openrepose/filters/forwardedproto/ForwardedProtoFilter.scala +++ b/repose-aggregator/components/filters/forwarded-proto-filter/src/main/scala/org/openrepose/filters/forwardedproto/ForwardedProtoFilter.scala @@ -22,7 +22,7 @@ package org.openrepose.filters.forwardedproto import javax.servlet._ import javax.servlet.http.HttpServletRequest -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper /** diff --git a/repose-aggregator/components/filters/forwarded-proto-filter/src/test/scala/org/openrepose/filters/forwardedproto/ForwardedProtoFilterTest.scala b/repose-aggregator/components/filters/forwarded-proto-filter/src/test/scala/org/openrepose/filters/forwardedproto/ForwardedProtoFilterTest.scala index a172339734b..e64e1403775 100644 --- a/repose-aggregator/components/filters/forwarded-proto-filter/src/test/scala/org/openrepose/filters/forwardedproto/ForwardedProtoFilterTest.scala +++ b/repose-aggregator/components/filters/forwarded-proto-filter/src/test/scala/org/openrepose/filters/forwardedproto/ForwardedProtoFilterTest.scala @@ -26,8 +26,8 @@ import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.Matchers.any import org.mockito.Mockito._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} import org.springframework.mock.web.MockHttpServletRequest diff --git a/repose-aggregator/components/filters/header-normalization-filter/build.gradle b/repose-aggregator/components/filters/header-normalization-filter/build.gradle index 50d29c578fb..f02accc4b5d 100644 --- a/repose-aggregator/components/filters/header-normalization-filter/build.gradle +++ b/repose-aggregator/components/filters/header-normalization-filter/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "io.dropwizard.metrics:metrics-core" compileOnly "javax.servlet:javax.servlet-api" diff --git a/repose-aggregator/components/filters/header-normalization-filter/src/main/scala/org/openrepose/filters/headernormalization/HeaderNormalizationFilter.scala b/repose-aggregator/components/filters/header-normalization-filter/src/main/scala/org/openrepose/filters/headernormalization/HeaderNormalizationFilter.scala index b452386fbde..281212b67af 100644 --- a/repose-aggregator/components/filters/header-normalization-filter/src/main/scala/org/openrepose/filters/headernormalization/HeaderNormalizationFilter.scala +++ b/repose-aggregator/components/filters/header-normalization-filter/src/main/scala/org/openrepose/filters/headernormalization/HeaderNormalizationFilter.scala @@ -22,7 +22,7 @@ package org.openrepose.filters.headernormalization import java.util.Optional import com.codahale.metrics.MetricRegistry -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} diff --git a/repose-aggregator/components/filters/header-normalization-filter/src/test/scala/org/openrepose/filters/headernormalization/HeaderNormalizationFilterTest.scala b/repose-aggregator/components/filters/header-normalization-filter/src/test/scala/org/openrepose/filters/headernormalization/HeaderNormalizationFilterTest.scala index c1e8da0ee9f..b568cecf02a 100644 --- a/repose-aggregator/components/filters/header-normalization-filter/src/test/scala/org/openrepose/filters/headernormalization/HeaderNormalizationFilterTest.scala +++ b/repose-aggregator/components/filters/header-normalization-filter/src/test/scala/org/openrepose/filters/headernormalization/HeaderNormalizationFilterTest.scala @@ -35,8 +35,8 @@ import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.openrepose.core.services.config.ConfigurationService import org.openrepose.core.services.reporting.metrics.{MetricsService, AggregateMeterFactory} import org.openrepose.filters.headernormalization.config._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/header-normalization-filter/src/test/scala/org/openrepose/filters/headernormalization/config/HeaderNormalizationConfigurationSchemaTest.scala b/repose-aggregator/components/filters/header-normalization-filter/src/test/scala/org/openrepose/filters/headernormalization/config/HeaderNormalizationConfigurationSchemaTest.scala index ef87b547060..722f63f7111 100644 --- a/repose-aggregator/components/filters/header-normalization-filter/src/test/scala/org/openrepose/filters/headernormalization/config/HeaderNormalizationConfigurationSchemaTest.scala +++ b/repose-aggregator/components/filters/header-normalization-filter/src/test/scala/org/openrepose/filters/headernormalization/config/HeaderNormalizationConfigurationSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest import org.openrepose.core.spring.{CoreSpringProvider, ReposeSpringProperties} -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/header-translation-filter/build.gradle b/repose-aggregator/components/filters/header-translation-filter/build.gradle index 4f59ef7983a..896ac85d46d 100644 --- a/repose-aggregator/components/filters/header-translation-filter/build.gradle +++ b/repose-aggregator/components/filters/header-translation-filter/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" compileOnly "javax.inject:javax.inject" diff --git a/repose-aggregator/components/filters/header-translation-filter/src/main/scala/org/openrepose/filters/headertranslation/HeaderTranslationFilter.scala b/repose-aggregator/components/filters/header-translation-filter/src/main/scala/org/openrepose/filters/headertranslation/HeaderTranslationFilter.scala index 336c6dd398c..d70bb1522fa 100644 --- a/repose-aggregator/components/filters/header-translation-filter/src/main/scala/org/openrepose/filters/headertranslation/HeaderTranslationFilter.scala +++ b/repose-aggregator/components/filters/header-translation-filter/src/main/scala/org/openrepose/filters/headertranslation/HeaderTranslationFilter.scala @@ -23,7 +23,7 @@ import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.openrepose.core.filter.FilterConfigHelper diff --git a/repose-aggregator/components/filters/header-translation-filter/src/test/scala/org/openrepose/filters/headertranslation/HeaderTranslationFilterTest.scala b/repose-aggregator/components/filters/header-translation-filter/src/test/scala/org/openrepose/filters/headertranslation/HeaderTranslationFilterTest.scala index 67824cde5fa..4114bbf92d3 100644 --- a/repose-aggregator/components/filters/header-translation-filter/src/test/scala/org/openrepose/filters/headertranslation/HeaderTranslationFilterTest.scala +++ b/repose-aggregator/components/filters/header-translation-filter/src/test/scala/org/openrepose/filters/headertranslation/HeaderTranslationFilterTest.scala @@ -28,8 +28,8 @@ import org.mockito.Matchers.any import org.mockito.Mockito.{never, reset, verify} import org.openrepose.core.services.config.ConfigurationService import org.openrepose.filters.headertranslation.config.{Header, HeaderTranslationType} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.MockHttpServletRequest diff --git a/repose-aggregator/components/filters/header-translation-filter/src/test/scala/org/openrepose/filters/headertranslation/config/HeaderTranslationSchemaTest.scala b/repose-aggregator/components/filters/header-translation-filter/src/test/scala/org/openrepose/filters/headertranslation/config/HeaderTranslationSchemaTest.scala index 45dd99d6525..c6d2c6a4028 100644 --- a/repose-aggregator/components/filters/header-translation-filter/src/test/scala/org/openrepose/filters/headertranslation/config/HeaderTranslationSchemaTest.scala +++ b/repose-aggregator/components/filters/header-translation-filter/src/test/scala/org/openrepose/filters/headertranslation/config/HeaderTranslationSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/header-user-filter/build.gradle b/repose-aggregator/components/filters/header-user-filter/build.gradle index 4f59ef7983a..896ac85d46d 100644 --- a/repose-aggregator/components/filters/header-user-filter/build.gradle +++ b/repose-aggregator/components/filters/header-user-filter/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" compileOnly "javax.inject:javax.inject" diff --git a/repose-aggregator/components/filters/header-user-filter/src/main/scala/org/openrepose/filters/headeruser/HeaderUserFilter.scala b/repose-aggregator/components/filters/header-user-filter/src/main/scala/org/openrepose/filters/headeruser/HeaderUserFilter.scala index 1d1f7b7deb8..f7f224f6c76 100644 --- a/repose-aggregator/components/filters/header-user-filter/src/main/scala/org/openrepose/filters/headeruser/HeaderUserFilter.scala +++ b/repose-aggregator/components/filters/header-user-filter/src/main/scala/org/openrepose/filters/headeruser/HeaderUserFilter.scala @@ -22,7 +22,7 @@ package org.openrepose.filters.headeruser import java.util.concurrent.atomic.AtomicReference import javax.servlet.http.{HttpServletResponse, HttpServletRequest} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.http.PowerApiHeader import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper diff --git a/repose-aggregator/components/filters/header-user-filter/src/test/scala/org/openrepose/filters/headeruser/HeaderUserFilterTest.scala b/repose-aggregator/components/filters/header-user-filter/src/test/scala/org/openrepose/filters/headeruser/HeaderUserFilterTest.scala index 4b5c2b8cc5b..82282cabecf 100644 --- a/repose-aggregator/components/filters/header-user-filter/src/test/scala/org/openrepose/filters/headeruser/HeaderUserFilterTest.scala +++ b/repose-aggregator/components/filters/header-user-filter/src/test/scala/org/openrepose/filters/headeruser/HeaderUserFilterTest.scala @@ -26,8 +26,8 @@ import org.junit.runner.RunWith import org.openrepose.commons.utils.http.PowerApiHeader import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.openrepose.filters.headeruser.config.{HeaderUserConfig, HttpHeader, HttpHeaderList} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockFilterChain, MockHttpServletRequest} diff --git a/repose-aggregator/components/filters/header-user-filter/src/test/scala/org/openrepose/filters/headeruser/config/HeaderUserSchemaTest.scala b/repose-aggregator/components/filters/header-user-filter/src/test/scala/org/openrepose/filters/headeruser/config/HeaderUserSchemaTest.scala index 9a9ea1827fa..689da7a8ab2 100644 --- a/repose-aggregator/components/filters/header-user-filter/src/test/scala/org/openrepose/filters/headeruser/config/HeaderUserSchemaTest.scala +++ b/repose-aggregator/components/filters/header-user-filter/src/test/scala/org/openrepose/filters/headeruser/config/HeaderUserSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/herp-filter/build.gradle b/repose-aggregator/components/filters/herp-filter/build.gradle index 87664ab25d8..97868157319 100644 --- a/repose-aggregator/components/filters/herp-filter/build.gradle +++ b/repose-aggregator/components/filters/herp-filter/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "org.springframework:spring-beans" compile "org.springframework:spring-web" compile "org.openrepose:http-delegation" diff --git a/repose-aggregator/components/filters/herp-filter/src/main/scala/org/openrepose/filters/herp/HerpFilter.scala b/repose-aggregator/components/filters/herp-filter/src/main/scala/org/openrepose/filters/herp/HerpFilter.scala index d63b59642e6..1753a017fab 100644 --- a/repose-aggregator/components/filters/herp-filter/src/main/scala/org/openrepose/filters/herp/HerpFilter.scala +++ b/repose-aggregator/components/filters/herp-filter/src/main/scala/org/openrepose/filters/herp/HerpFilter.scala @@ -30,7 +30,7 @@ import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import com.github.jknack.handlebars.{Handlebars, Helper, Options, Template} import com.rackspace.httpdelegation._ -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.apache.http.HttpHeaders import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.http.CommonRequestAttributes.{QUERY_PARAMS, REQUEST_URL} diff --git a/repose-aggregator/components/filters/herp-filter/src/test/scala/org/openrepose/filters/herp/HerpFilterTest.scala b/repose-aggregator/components/filters/herp-filter/src/test/scala/org/openrepose/filters/herp/HerpFilterTest.scala index 05beb53a46d..c926607869e 100644 --- a/repose-aggregator/components/filters/herp-filter/src/test/scala/org/openrepose/filters/herp/HerpFilterTest.scala +++ b/repose-aggregator/components/filters/herp-filter/src/test/scala/org/openrepose/filters/herp/HerpFilterTest.scala @@ -36,8 +36,8 @@ import org.openrepose.commons.utils.http.CommonHttpHeader import org.openrepose.commons.utils.http.CommonRequestAttributes.QUERY_PARAMS import org.openrepose.filters.herp.config.{FilterOut, HerpConfig, Match, Template} import org.scalatest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.springframework.http.HttpStatus._ import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/ip-user-filter/build.gradle b/repose-aggregator/components/filters/ip-user-filter/build.gradle index 5e6f2f21c90..1bc15df9c26 100644 --- a/repose-aggregator/components/filters/ip-user-filter/build.gradle +++ b/repose-aggregator/components/filters/ip-user-filter/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" compileOnly "javax.inject:javax.inject" diff --git a/repose-aggregator/components/filters/ip-user-filter/src/main/scala/org/openrepose/filters/ipuser/IpUserFilter.scala b/repose-aggregator/components/filters/ip-user-filter/src/main/scala/org/openrepose/filters/ipuser/IpUserFilter.scala index ad8182c78f9..47729757fa1 100644 --- a/repose-aggregator/components/filters/ip-user-filter/src/main/scala/org/openrepose/filters/ipuser/IpUserFilter.scala +++ b/repose-aggregator/components/filters/ip-user-filter/src/main/scala/org/openrepose/filters/ipuser/IpUserFilter.scala @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicReference import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import edazdarevic.commons.net.CIDRUtils import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.http.CommonHttpHeader diff --git a/repose-aggregator/components/filters/ip-user-filter/src/test/scala/org/openrepose/filters/ipuser/IpUserFilterTest.scala b/repose-aggregator/components/filters/ip-user-filter/src/test/scala/org/openrepose/filters/ipuser/IpUserFilterTest.scala index 6fd98ac63c4..38c873cb0a5 100644 --- a/repose-aggregator/components/filters/ip-user-filter/src/test/scala/org/openrepose/filters/ipuser/IpUserFilterTest.scala +++ b/repose-aggregator/components/filters/ip-user-filter/src/test/scala/org/openrepose/filters/ipuser/IpUserFilterTest.scala @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse import org.junit.runner.RunWith import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.openrepose.filters.ipuser.config.{GroupType, IpUserConfig} -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockFilterChain, MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/ip-user-filter/src/test/scala/org/openrepose/filters/ipuser/LabelApplicationTest.scala b/repose-aggregator/components/filters/ip-user-filter/src/test/scala/org/openrepose/filters/ipuser/LabelApplicationTest.scala index e4755796372..4855319305d 100644 --- a/repose-aggregator/components/filters/ip-user-filter/src/test/scala/org/openrepose/filters/ipuser/LabelApplicationTest.scala +++ b/repose-aggregator/components/filters/ip-user-filter/src/test/scala/org/openrepose/filters/ipuser/LabelApplicationTest.scala @@ -21,7 +21,7 @@ package org.openrepose.filters.ipuser import org.junit.runner.RunWith import org.scalatest.{FunSpec, Matchers} -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class LabelApplicationTest extends FunSpec with Matchers { diff --git a/repose-aggregator/components/filters/ip-user-filter/src/test/scala/org/openrepose/filters/ipuser/config/IpUserSchemaTest.scala b/repose-aggregator/components/filters/ip-user-filter/src/test/scala/org/openrepose/filters/ipuser/config/IpUserSchemaTest.scala index dcf47562f84..24972fdcaf9 100644 --- a/repose-aggregator/components/filters/ip-user-filter/src/test/scala/org/openrepose/filters/ipuser/config/IpUserSchemaTest.scala +++ b/repose-aggregator/components/filters/ip-user-filter/src/test/scala/org/openrepose/filters/ipuser/config/IpUserSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/iri-validator-filter/build.gradle b/repose-aggregator/components/filters/iri-validator-filter/build.gradle index 44735772570..5f122407b46 100644 --- a/repose-aggregator/components/filters/iri-validator-filter/build.gradle +++ b/repose-aggregator/components/filters/iri-validator-filter/build.gradle @@ -1,7 +1,7 @@ dependencies { compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "org.apache.jena:jena-iri" compileOnly "javax.servlet:javax.servlet-api" diff --git a/repose-aggregator/components/filters/iri-validator-filter/src/main/scala/org/openrepose/filters/irivalidator/IriValidatorFilter.scala b/repose-aggregator/components/filters/iri-validator-filter/src/main/scala/org/openrepose/filters/irivalidator/IriValidatorFilter.scala index ad84521ee2e..3275e921869 100644 --- a/repose-aggregator/components/filters/iri-validator-filter/src/main/scala/org/openrepose/filters/irivalidator/IriValidatorFilter.scala +++ b/repose-aggregator/components/filters/iri-validator-filter/src/main/scala/org/openrepose/filters/irivalidator/IriValidatorFilter.scala @@ -22,7 +22,7 @@ package org.openrepose.filters.irivalidator import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.apache.jena.iri.{IRIException, IRIFactory} /** diff --git a/repose-aggregator/components/filters/iri-validator-filter/src/test/scala/org/openrepose/filters/irivalidator/IriValidatorFilterTest.scala b/repose-aggregator/components/filters/iri-validator-filter/src/test/scala/org/openrepose/filters/irivalidator/IriValidatorFilterTest.scala index 130ec37dfda..79499c698e1 100644 --- a/repose-aggregator/components/filters/iri-validator-filter/src/test/scala/org/openrepose/filters/irivalidator/IriValidatorFilterTest.scala +++ b/repose-aggregator/components/filters/iri-validator-filter/src/test/scala/org/openrepose/filters/irivalidator/IriValidatorFilterTest.scala @@ -26,8 +26,8 @@ import org.junit.runner.RunWith import org.mockito.Matchers import org.mockito.Mockito._ import org.scalatest.FunSpec -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar @RunWith(classOf[JUnitRunner]) class IriValidatorFilterTest extends FunSpec with MockitoSugar { diff --git a/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/build.gradle b/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/build.gradle index 2f18e8b34d0..cbe2f0538e3 100644 --- a/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/build.gradle +++ b/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/build.gradle @@ -5,9 +5,9 @@ dependencies { compile project(':repose-aggregator:components:services:http-client-service:http-client-service-api') compile "org.openrepose:http-delegation" compile "org.scala-lang:scala-library" - compile "org.scala-lang.modules:scala-xml_2.11" + compile "org.scala-lang.modules:scala-xml_$scalaMajDotMin" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "org.springframework:spring-web" compile "org.apache.httpcomponents:httpclient" compile "org.apache.httpcomponents:httpcore" diff --git a/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/main/scala/org/openrepose/filters/keystonev2basicauth/KeystoneV2BasicAuthFilter.scala b/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/main/scala/org/openrepose/filters/keystonev2basicauth/KeystoneV2BasicAuthFilter.scala index 3570c791892..ee18bdcd484 100644 --- a/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/main/scala/org/openrepose/filters/keystonev2basicauth/KeystoneV2BasicAuthFilter.scala +++ b/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/main/scala/org/openrepose/filters/keystonev2basicauth/KeystoneV2BasicAuthFilter.scala @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit import java.util.{Calendar, GregorianCalendar} import com.rackspace.httpdelegation.HttpDelegationManager -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} diff --git a/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/test/scala/org/openrepose/filters/keystonev2basicauth/BasicAuthUtilsTest.scala b/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/test/scala/org/openrepose/filters/keystonev2basicauth/BasicAuthUtilsTest.scala index 156caa5206f..2fc7edef364 100644 --- a/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/test/scala/org/openrepose/filters/keystonev2basicauth/BasicAuthUtilsTest.scala +++ b/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/test/scala/org/openrepose/filters/keystonev2basicauth/BasicAuthUtilsTest.scala @@ -21,7 +21,7 @@ package org.openrepose.filters.keystonev2basicauth import org.apache.commons.codec.binary.Base64 import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/test/scala/org/openrepose/filters/keystonev2basicauth/KeystoneV2BasicAuthFilterTest.scala b/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/test/scala/org/openrepose/filters/keystonev2basicauth/KeystoneV2BasicAuthFilterTest.scala index 5e56e7b46ce..4fbad02ff37 100644 --- a/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/test/scala/org/openrepose/filters/keystonev2basicauth/KeystoneV2BasicAuthFilterTest.scala +++ b/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/test/scala/org/openrepose/filters/keystonev2basicauth/KeystoneV2BasicAuthFilterTest.scala @@ -21,7 +21,7 @@ package org.openrepose.filters.keystonev2basicauth import javax.servlet.{FilterChain, FilterConfig} import javax.servlet.http.{HttpServletRequest, HttpServletResponse} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.core.LoggerContext import org.apache.logging.log4j.test.appender.ListAppender @@ -36,8 +36,8 @@ import org.openrepose.core.services.datastore.{Datastore, DatastoreService} import org.openrepose.core.services.httpclient.{HttpClientService, HttpClientServiceClient} import org.openrepose.filters.keystonev2basicauth.config.KeystoneV2BasicAuthConfig import org.scalatest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.springframework.mock.web.MockHttpServletRequest import scala.collection.JavaConversions._ diff --git a/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/test/scala/org/openrepose/filters/keystonev2basicauth/config/KeystoneV2BasicAuthSchemaTest.scala b/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/test/scala/org/openrepose/filters/keystonev2basicauth/config/KeystoneV2BasicAuthSchemaTest.scala index 441d28adad4..f3acbeef6a3 100644 --- a/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/test/scala/org/openrepose/filters/keystonev2basicauth/config/KeystoneV2BasicAuthSchemaTest.scala +++ b/repose-aggregator/components/filters/keystone-v2-basic-auth-filter/src/test/scala/org/openrepose/filters/keystonev2basicauth/config/KeystoneV2BasicAuthSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class KeystoneV2BasicAuthSchemaTest extends ConfigurationTest { diff --git a/repose-aggregator/components/filters/keystone-v2-filter/build.gradle b/repose-aggregator/components/filters/keystone-v2-filter/build.gradle index 898f6a15925..d42b7131f98 100644 --- a/repose-aggregator/components/filters/keystone-v2-filter/build.gradle +++ b/repose-aggregator/components/filters/keystone-v2-filter/build.gradle @@ -8,10 +8,10 @@ dependencies { compile project(":repose-aggregator:components:services:datastore-service:datastore-service-api") compile project(":repose-aggregator:components:services:atom-feed-service:atom-feed-service-api") compile "org.scala-lang:scala-library" - compile "org.scala-lang.modules:scala-xml_2.11" + compile "org.scala-lang.modules:scala-xml_$scalaMajDotMin" compile "org.openrepose:http-delegation" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "joda-time:joda-time" compile "com.typesafe.play:play-json_$scalaMajDotMin" compile "org.apache.commons:commons-lang3" diff --git a/repose-aggregator/components/filters/keystone-v2-filter/src/main/scala/org/openrepose/filters/keystonev2/AbstractKeystoneV2Filter.scala b/repose-aggregator/components/filters/keystone-v2-filter/src/main/scala/org/openrepose/filters/keystonev2/AbstractKeystoneV2Filter.scala index 04b624a543e..83f586760b7 100644 --- a/repose-aggregator/components/filters/keystone-v2-filter/src/main/scala/org/openrepose/filters/keystonev2/AbstractKeystoneV2Filter.scala +++ b/repose-aggregator/components/filters/keystone-v2-filter/src/main/scala/org/openrepose/filters/keystonev2/AbstractKeystoneV2Filter.scala @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import com.rackspace.httpdelegation.HttpDelegationManager -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.utils.http.{IdentityStatus, OpenStackServiceHeader} import org.openrepose.commons.utils.servlet.http.ResponseMode.{MUTABLE, PASSTHROUGH} import org.openrepose.commons.utils.servlet.http.{HttpServletRequestWrapper, HttpServletResponseWrapper} diff --git a/repose-aggregator/components/filters/keystone-v2-filter/src/main/scala/org/openrepose/filters/keystonev2/KeystoneRequestHandler.scala b/repose-aggregator/components/filters/keystone-v2-filter/src/main/scala/org/openrepose/filters/keystonev2/KeystoneRequestHandler.scala index 8b589b80ee4..7cb4061f82d 100644 --- a/repose-aggregator/components/filters/keystone-v2-filter/src/main/scala/org/openrepose/filters/keystonev2/KeystoneRequestHandler.scala +++ b/repose-aggregator/components/filters/keystone-v2-filter/src/main/scala/org/openrepose/filters/keystonev2/KeystoneRequestHandler.scala @@ -22,7 +22,7 @@ package org.openrepose.filters.keystonev2 import java.util.{Calendar, GregorianCalendar} import com.fasterxml.jackson.core.JsonProcessingException -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.servlet.http.HttpServletResponse._ import javax.ws.rs.core.{HttpHeaders, MediaType} import org.apache.http.HttpResponse diff --git a/repose-aggregator/components/filters/keystone-v2-filter/src/main/scala/org/openrepose/filters/keystonev2/KeystoneV2Authorization.scala b/repose-aggregator/components/filters/keystone-v2-filter/src/main/scala/org/openrepose/filters/keystonev2/KeystoneV2Authorization.scala index 4b47021f248..04d044a9ab5 100644 --- a/repose-aggregator/components/filters/keystone-v2-filter/src/main/scala/org/openrepose/filters/keystonev2/KeystoneV2Authorization.scala +++ b/repose-aggregator/components/filters/keystone-v2-filter/src/main/scala/org/openrepose/filters/keystonev2/KeystoneV2Authorization.scala @@ -21,7 +21,7 @@ package org.openrepose.filters.keystonev2 import javax.servlet.http.HttpServletResponse.{SC_FORBIDDEN, SC_UNAUTHORIZED} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.openrepose.filters.keystonev2.AbstractKeystoneV2Filter.{KeystoneV2Result, Reject} import org.openrepose.filters.keystonev2.KeystoneV2Common._ diff --git a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneRequestHandlerTest.scala b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneRequestHandlerTest.scala index 7c4cb36f535..b4209885e63 100644 --- a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneRequestHandlerTest.scala +++ b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneRequestHandlerTest.scala @@ -27,8 +27,8 @@ import org.apache.http.HttpVersion import org.apache.http.message.BasicHttpResponse import org.junit.runner.RunWith import org.openrepose.commons.utils.http.HttpDate -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2AuthorizationFilterTest.scala b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2AuthorizationFilterTest.scala index 26dfe57d97e..268fec2baeb 100644 --- a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2AuthorizationFilterTest.scala +++ b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2AuthorizationFilterTest.scala @@ -33,8 +33,8 @@ import org.openrepose.filters.keystonev2.KeystoneV2Common.Endpoint import org.openrepose.filters.keystonev2.config.TenantHandlingType.SendTenantIdQuality import org.openrepose.filters.keystonev2.config.{KeystoneV2Config, TenantHandlingType, ValidateTenantType} import org.scalatest.TryValues._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.MockHttpServletRequest import play.api.libs.functional.syntax.{unlift, _} diff --git a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2AuthorizationTest.scala b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2AuthorizationTest.scala index 90360372f97..9954f8bf78f 100644 --- a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2AuthorizationTest.scala +++ b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2AuthorizationTest.scala @@ -25,7 +25,7 @@ import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.openrepose.filters.keystonev2.AbstractKeystoneV2Filter.Reject import org.openrepose.filters.keystonev2.KeystoneV2Common._ import org.openrepose.filters.keystonev2.config._ -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{BeforeAndAfterEach, FunSpec, PartialFunctionValues, TryValues} import org.springframework.mock.web.MockHttpServletRequest diff --git a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterCacheInvalidationTest.scala b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterCacheInvalidationTest.scala index 76028b2c9a5..85d4b2a5acd 100644 --- a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterCacheInvalidationTest.scala +++ b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterCacheInvalidationTest.scala @@ -34,8 +34,8 @@ import org.openrepose.core.services.httpclient.{HttpClientService, HttpClientSer import org.openrepose.filters.keystonev2.KeystoneRequestHandler._ import org.openrepose.filters.keystonev2.config.AtomFeedType import org.openrepose.nodeservice.atomfeed.{AtomFeedListener, AtomFeedService} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.MockFilterConfig diff --git a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterPrepTest.scala b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterPrepTest.scala index 41a96088dd0..f41c6be82c9 100644 --- a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterPrepTest.scala +++ b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterPrepTest.scala @@ -34,8 +34,8 @@ import org.openrepose.core.services.httpclient.{HttpClientService, HttpClientSer import org.openrepose.core.systemmodel.config.{SystemModel, TracingHeaderConfig} import org.openrepose.filters.keystonev2.config.KeystoneV2AuthenticationConfig import org.openrepose.nodeservice.atomfeed.{AtomFeedListener, AtomFeedService} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.MockFilterConfig diff --git a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterRcnTest.scala b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterRcnTest.scala index cc47f93e681..7b6ad95401f 100644 --- a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterRcnTest.scala +++ b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterRcnTest.scala @@ -44,8 +44,8 @@ import org.openrepose.core.services.httpclient.{HttpClientService, HttpClientSer import org.openrepose.core.systemmodel.config.{SystemModel, TracingHeaderConfig} import org.openrepose.filters.keystonev2.KeystoneRequestHandler._ import org.openrepose.nodeservice.atomfeed.AtomFeedService -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec} import org.springframework.mock.web.{MockFilterChain, MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterTest.scala b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterTest.scala index 1dc683d53b1..ecd713d7ee3 100644 --- a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterTest.scala +++ b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/KeystoneV2FilterTest.scala @@ -59,8 +59,8 @@ import org.openrepose.filters.keystonev2.KeystoneV2Common._ import org.openrepose.filters.keystonev2.KeystoneV2TestCommon.createValidToken import org.openrepose.filters.keystonev2.config.{KeystoneV2AuthenticationConfig, ServiceEndpointType} import org.openrepose.nodeservice.atomfeed.AtomFeedService -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec} import org.springframework.mock.web.{MockFilterChain, MockHttpServletRequest, MockHttpServletResponse} import play.api.libs.json.Json diff --git a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/config/KeystoneV2AuthorizationSchemaTest.scala b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/config/KeystoneV2AuthorizationSchemaTest.scala index 87cd53deaa3..950c790a423 100644 --- a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/config/KeystoneV2AuthorizationSchemaTest.scala +++ b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/config/KeystoneV2AuthorizationSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/config/KeystoneV2SchemaTest.scala b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/config/KeystoneV2SchemaTest.scala index 1a84ce1de44..1366948abc6 100644 --- a/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/config/KeystoneV2SchemaTest.scala +++ b/repose-aggregator/components/filters/keystone-v2-filter/src/test/scala/org/openrepose/filters/keystonev2/config/KeystoneV2SchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/merge-header-filter/build.gradle b/repose-aggregator/components/filters/merge-header-filter/build.gradle index 872c39ce802..6ee91b4cbb6 100644 --- a/repose-aggregator/components/filters/merge-header-filter/build.gradle +++ b/repose-aggregator/components/filters/merge-header-filter/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" compileOnly "javax.inject:javax.inject" diff --git a/repose-aggregator/components/filters/merge-header-filter/src/main/scala/org/openrepose/filters/mergeheader/MergeHeaderFilter.scala b/repose-aggregator/components/filters/merge-header-filter/src/main/scala/org/openrepose/filters/mergeheader/MergeHeaderFilter.scala index 5d46cf4ef6e..4e1ba1939f0 100644 --- a/repose-aggregator/components/filters/merge-header-filter/src/main/scala/org/openrepose/filters/mergeheader/MergeHeaderFilter.scala +++ b/repose-aggregator/components/filters/merge-header-filter/src/main/scala/org/openrepose/filters/mergeheader/MergeHeaderFilter.scala @@ -23,7 +23,7 @@ import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.openrepose.core.filter.FilterConfigHelper diff --git a/repose-aggregator/components/filters/merge-header-filter/src/test/scala/org/openrepose/filters/mergeheader/MergeHeaderFilterTest.scala b/repose-aggregator/components/filters/merge-header-filter/src/test/scala/org/openrepose/filters/mergeheader/MergeHeaderFilterTest.scala index 6c5269209ba..21044158315 100644 --- a/repose-aggregator/components/filters/merge-header-filter/src/test/scala/org/openrepose/filters/mergeheader/MergeHeaderFilterTest.scala +++ b/repose-aggregator/components/filters/merge-header-filter/src/test/scala/org/openrepose/filters/mergeheader/MergeHeaderFilterTest.scala @@ -25,8 +25,8 @@ import org.junit.runner.RunWith import org.mockito.Matchers.{any, anyString} import org.mockito.Mockito.verify import org.openrepose.core.services.config.ConfigurationService -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockFilterChain, MockFilterConfig, MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/openapi-validator-filter/build.gradle b/repose-aggregator/components/filters/openapi-validator-filter/build.gradle index dc608aacdae..293d6d29306 100644 --- a/repose-aggregator/components/filters/openapi-validator-filter/build.gradle +++ b/repose-aggregator/components/filters/openapi-validator-filter/build.gradle @@ -2,7 +2,7 @@ dependencies { compile project(":repose-aggregator:core:repose-core-api") compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "org.springframework:spring-beans" compile "com.atlassian.oai:swagger-request-validator-core" diff --git a/repose-aggregator/components/filters/openapi-validator-filter/src/main/scala/org/openrepose/filters/openapivalidator/OpenApiValidatorFilter.scala b/repose-aggregator/components/filters/openapi-validator-filter/src/main/scala/org/openrepose/filters/openapivalidator/OpenApiValidatorFilter.scala index c6aa66bdf9d..59efd10e575 100644 --- a/repose-aggregator/components/filters/openapi-validator-filter/src/main/scala/org/openrepose/filters/openapivalidator/OpenApiValidatorFilter.scala +++ b/repose-aggregator/components/filters/openapi-validator-filter/src/main/scala/org/openrepose/filters/openapivalidator/OpenApiValidatorFilter.scala @@ -24,7 +24,7 @@ import java.net.URI import com.atlassian.oai.validator.OpenApiInteractionValidator import com.atlassian.oai.validator.report.ValidationReport -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} @@ -105,6 +105,7 @@ class OpenApiValidatorFilter @Inject()(@Value(ReposeSpringProperties.CORE.CONFIG validator = OpenApiInteractionValidator .createFor(resolveHref(newConfiguration.getHref)) + .withCustomRequestValidation(new RaxRolesValidator()) .build() Thread.currentThread.setContextClassLoader(contextClassLoader) @@ -172,6 +173,7 @@ object OpenApiValidatorFilter { "validation.request.accept.invalid" -> HttpServletResponse.SC_BAD_REQUEST, "validation.request.accept.notAllowed" -> HttpServletResponse.SC_NOT_ACCEPTABLE, "validation.schema.invalidJson" -> HttpServletResponse.SC_BAD_REQUEST, + RaxRolesValidator.RoleValidationMessageKey-> HttpServletResponse.SC_UNAUTHORIZED, "validation.schema.unknownError" -> HttpServletResponse.SC_INTERNAL_SERVER_ERROR ) diff --git a/repose-aggregator/components/filters/openapi-validator-filter/src/main/scala/org/openrepose/filters/openapivalidator/RaxRolesValidator.scala b/repose-aggregator/components/filters/openapi-validator-filter/src/main/scala/org/openrepose/filters/openapivalidator/RaxRolesValidator.scala new file mode 100644 index 00000000000..cd31f7c8b39 --- /dev/null +++ b/repose-aggregator/components/filters/openapi-validator-filter/src/main/scala/org/openrepose/filters/openapivalidator/RaxRolesValidator.scala @@ -0,0 +1,42 @@ +/* + * _=_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_= + * Repose + * _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_- + * Copyright (C) 2010 - 2015 Rackspace US, Inc. + * _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * =_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_=_ + */ +package org.openrepose.filters.openapivalidator + +import com.atlassian.oai.validator.interaction.request.CustomRequestValidator +import com.atlassian.oai.validator.model.{ApiOperation, Request} +import com.atlassian.oai.validator.report.ValidationReport +import org.openrepose.commons.utils.http.OpenStackServiceHeader.ROLES +import org.openrepose.filters.openapivalidator.RaxRolesValidator.RoleValidationMessageKey + +import scala.collection.JavaConverters._ + +class RaxRolesValidator extends CustomRequestValidator { + override def validate(request: Request, apiOperation: ApiOperation): ValidationReport = { + apiOperation.getOperation.getExtensions.asScala.get("x-rax-roles") + .map(_.asInstanceOf[java.util.ArrayList[String]]) + .find(configuredRoles => !request.getHeaderValues(ROLES).asScala.exists(configuredRoles.contains(_))) + .map(_ => ValidationReport.singleton(ValidationReport.Message.create(RoleValidationMessageKey, "None of the configured roles match the request.").build())) + .getOrElse(ValidationReport.empty()) + } +} + +object RaxRolesValidator { + val RoleValidationMessageKey = "rax.roles" +} diff --git a/repose-aggregator/components/filters/openapi-validator-filter/src/test/scala/org/openrepose/filters/openapivalidator/HttpServletValidatorRequestTest.scala b/repose-aggregator/components/filters/openapi-validator-filter/src/test/scala/org/openrepose/filters/openapivalidator/HttpServletValidatorRequestTest.scala index 5833fad7a4c..e6ea864b319 100644 --- a/repose-aggregator/components/filters/openapi-validator-filter/src/test/scala/org/openrepose/filters/openapivalidator/HttpServletValidatorRequestTest.scala +++ b/repose-aggregator/components/filters/openapi-validator-filter/src/test/scala/org/openrepose/filters/openapivalidator/HttpServletValidatorRequestTest.scala @@ -27,8 +27,8 @@ import javax.servlet.http.HttpServletRequest import org.junit.runner.RunWith import org.mockito.Mockito.when import org.openrepose.filters.openapivalidator.HttpServletValidatorRequest.RequestConversionException -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} import org.springframework.http.{HttpHeaders, HttpMethod, MediaType} import org.springframework.mock.web.{DelegatingServletInputStream, MockHttpServletRequest} diff --git a/repose-aggregator/components/filters/openapi-validator-filter/src/test/scala/org/openrepose/filters/openapivalidator/OpenApiValidatorFilterTest.scala b/repose-aggregator/components/filters/openapi-validator-filter/src/test/scala/org/openrepose/filters/openapivalidator/OpenApiValidatorFilterTest.scala index c5b195fde13..bf421b5f3e4 100644 --- a/repose-aggregator/components/filters/openapi-validator-filter/src/test/scala/org/openrepose/filters/openapivalidator/OpenApiValidatorFilterTest.scala +++ b/repose-aggregator/components/filters/openapi-validator-filter/src/test/scala/org/openrepose/filters/openapivalidator/OpenApiValidatorFilterTest.scala @@ -37,8 +37,8 @@ import org.openrepose.core.services.config.ConfigurationService import org.openrepose.filters.openapivalidator.HttpServletValidatorRequest.RequestConversionException import org.openrepose.filters.openapivalidator.OpenApiValidatorFilterTest._ import org.openrepose.filters.openapivalidator.config.OpenApiValidatorConfig -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockFilterChain, MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/openapi-validator-filter/src/test/scala/org/openrepose/filters/openapivalidator/RaxRolesValidatorTest.scala b/repose-aggregator/components/filters/openapi-validator-filter/src/test/scala/org/openrepose/filters/openapivalidator/RaxRolesValidatorTest.scala new file mode 100644 index 00000000000..034958c1523 --- /dev/null +++ b/repose-aggregator/components/filters/openapi-validator-filter/src/test/scala/org/openrepose/filters/openapivalidator/RaxRolesValidatorTest.scala @@ -0,0 +1,84 @@ +/* + * _=_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_= + * Repose + * _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_- + * Copyright (C) 2010 - 2015 Rackspace US, Inc. + * _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * =_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_=_ + */ +package org.openrepose.filters.openapivalidator + +import com.atlassian.oai.validator.model.{ApiOperation, ApiPath, NormalisedPath, Request} +import io.swagger.v3.oas.models.{Operation, PathItem} +import org.junit.runner.RunWith +import org.openrepose.commons.utils.http.OpenStackServiceHeader.ROLES +import org.scalatest.junit.JUnitRunner +import org.scalatest.mock.MockitoSugar +import org.scalatest.{FunSpec, Matchers} +import org.springframework.mock.web.MockHttpServletRequest + +import scala.collection.JavaConverters._ + +@RunWith(classOf[JUnitRunner]) +class RaxRolesValidatorTest + extends FunSpec with Matchers with MockitoSugar { + + val validator = new RaxRolesValidator + + describe("validate") { + it("should match when there's a singular user role and singular configured role; one of which matches") { + val report = validator.validate(request("banana"), apiOperation("banana")) + report.hasErrors shouldBe false + } + + it("should match when there's a singular user role and multiple configured roles; one of which matches") { + val report = validator.validate(request("banana"), apiOperation("banana", "phone")) + report.hasErrors shouldBe false + } + + it("should match when there are multiple user roles and singular configured role; one of which matches") { + val report = validator.validate(request("banana", "phone"), apiOperation("banana")) + report.hasErrors shouldBe false + } + + it("should match when there are multiple user roles and multiple configured roles; one of which matches") { + val report = validator.validate(request("banana", "phone"), apiOperation("banana", "time")) + report.hasErrors shouldBe false + } + + it("should match when there are multiple user roles and multiple configured roles; several match") { + val report = validator.validate(request("banana", "phone"), apiOperation("banana", "phone", "time")) + report.hasErrors shouldBe false + } + + it("shouldn't match when there are multiple user roles and multiple configured roles; none match") { + val report = validator.validate(request("banana", "phone"), apiOperation("adventure", "time")) + val messages = report.getMessages + messages.size() shouldBe 1 + messages.get(0).getKey shouldBe RaxRolesValidator.RoleValidationMessageKey + } + } + + def request(roles: String*): Request = { + val request = new MockHttpServletRequest() + roles.foreach(request.addHeader(ROLES, _)) + new HttpServletValidatorRequest(request) + } + + def apiOperation(roles: String*): ApiOperation = { + val operation = new Operation() + operation.addExtension("x-rax-roles", roles.toList.asJava) + new ApiOperation(mock[ApiPath], mock[NormalisedPath], PathItem.HttpMethod.GET, operation) + } +} diff --git a/repose-aggregator/components/filters/openstack-identity-v3-filter/build.gradle b/repose-aggregator/components/filters/openstack-identity-v3-filter/build.gradle index 84376291fa5..4c63f7fcbb6 100644 --- a/repose-aggregator/components/filters/openstack-identity-v3-filter/build.gradle +++ b/repose-aggregator/components/filters/openstack-identity-v3-filter/build.gradle @@ -7,9 +7,9 @@ dependencies { compile project(":repose-aggregator:components:services:atom-feed-service:atom-feed-service-api") compile project(':repose-aggregator:components:services:http-client-service:http-client-service-api') compile "org.scala-lang:scala-library" - compile "org.scala-lang.modules:scala-xml_2.11" + compile "org.scala-lang.modules:scala-xml_$scalaMajDotMin" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "org.openrepose:http-delegation" compile "commons-codec:commons-codec" compile "org.springframework:spring-web" diff --git a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/main/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3Filter.scala b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/main/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3Filter.scala index 98aee13b8e3..02531df7925 100644 --- a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/main/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3Filter.scala +++ b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/main/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3Filter.scala @@ -24,7 +24,7 @@ import java.net.URL import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.servlet.filter.FilterAction import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper diff --git a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/main/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3Handler.scala b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/main/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3Handler.scala index 4846945f006..4bb28c48795 100644 --- a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/main/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3Handler.scala +++ b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/main/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3Handler.scala @@ -24,7 +24,7 @@ import javax.servlet.http.HttpServletResponse import javax.servlet.http.HttpServletResponse._ import com.rackspace.httpdelegation.HttpDelegationManager -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.apache.commons.codec.binary.Base64 import org.openrepose.commons.utils.http._ import org.openrepose.commons.utils.servlet.filter.FilterAction diff --git a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/main/scala/org/openrepose/filters/openstackidentityv3/utilities/OpenStackIdentityV3API.scala b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/main/scala/org/openrepose/filters/openstackidentityv3/utilities/OpenStackIdentityV3API.scala index fea84b19422..f9a92a00684 100644 --- a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/main/scala/org/openrepose/filters/openstackidentityv3/utilities/OpenStackIdentityV3API.scala +++ b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/main/scala/org/openrepose/filters/openstackidentityv3/utilities/OpenStackIdentityV3API.scala @@ -23,7 +23,7 @@ import java.io.{InputStream, Serializable} import java.util.concurrent.TimeUnit import java.util.{Calendar, GregorianCalendar} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.servlet.http.HttpServletResponse._ import javax.ws.rs.core.MediaType import org.apache.http.client.entity.EntityBuilder diff --git a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3FilterTest.scala b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3FilterTest.scala index baec6365995..3625f6530de 100644 --- a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3FilterTest.scala +++ b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3FilterTest.scala @@ -32,8 +32,8 @@ import org.openrepose.core.services.httpclient.{HttpClientService, HttpClientSer import org.openrepose.filters.openstackidentityv3.config.{OpenstackIdentityService, OpenstackIdentityV3Config} import org.openrepose.filters.openstackidentityv3.utilities.Cache._ import org.openrepose.nodeservice.atomfeed.{AtomFeedListener, AtomFeedService} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3HandlerDeprecatedTest.scala b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3HandlerDeprecatedTest.scala index 013de587232..d9f0b619df8 100644 --- a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3HandlerDeprecatedTest.scala +++ b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3HandlerDeprecatedTest.scala @@ -33,8 +33,8 @@ import org.openrepose.filters.openstackidentityv3.config._ import org.openrepose.filters.openstackidentityv3.objects._ import org.openrepose.filters.openstackidentityv3.utilities._ import org.scalatest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.springframework.http.HttpHeaders import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3HandlerTest.scala b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3HandlerTest.scala index 0651b2180b2..014267f6e8d 100644 --- a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3HandlerTest.scala +++ b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/OpenStackIdentityV3HandlerTest.scala @@ -33,8 +33,8 @@ import org.openrepose.filters.openstackidentityv3.config._ import org.openrepose.filters.openstackidentityv3.objects._ import org.openrepose.filters.openstackidentityv3.utilities._ import org.scalatest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.springframework.http.HttpHeaders import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/config/OpenStackIdentityV3SchemaTest.scala b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/config/OpenStackIdentityV3SchemaTest.scala index 5965fc3acf0..b7996eb652e 100644 --- a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/config/OpenStackIdentityV3SchemaTest.scala +++ b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/config/OpenStackIdentityV3SchemaTest.scala @@ -25,7 +25,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest import org.openrepose.core.spring.{CoreSpringProvider, ReposeSpringProperties} -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/utilities/CacheTest.scala b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/utilities/CacheTest.scala index dde58d4a74e..06deaa52976 100644 --- a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/utilities/CacheTest.scala +++ b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/utilities/CacheTest.scala @@ -21,8 +21,8 @@ package org.openrepose.filters.openstackidentityv3.utilities import org.junit.runner.RunWith import org.openrepose.core.services.datastore.Datastore -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/utilities/OpenStackIdentityV3APITest.scala b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/utilities/OpenStackIdentityV3APITest.scala index 122254f96cd..635623b0cdd 100644 --- a/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/utilities/OpenStackIdentityV3APITest.scala +++ b/repose-aggregator/components/filters/openstack-identity-v3-filter/src/test/scala/org/openrepose/filters/openstackidentityv3/utilities/OpenStackIdentityV3APITest.scala @@ -46,8 +46,8 @@ import org.openrepose.filters.openstackidentityv3.config.{OpenstackIdentityServi import org.openrepose.filters.openstackidentityv3.objects.ValidToken import org.openrepose.filters.openstackidentityv3.utilities.Cache._ import org.scalatest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import scala.Function.tupled import scala.util.{Failure, Success, Try} diff --git a/repose-aggregator/components/filters/rate-limiting-filter/build.gradle b/repose-aggregator/components/filters/rate-limiting-filter/build.gradle index 8448e1cb6e8..b48da599c60 100644 --- a/repose-aggregator/components/filters/rate-limiting-filter/build.gradle +++ b/repose-aggregator/components/filters/rate-limiting-filter/build.gradle @@ -7,7 +7,7 @@ dependencies { compile "com.typesafe.play:play-json_$scalaMajDotMin" compile "commons-pool:commons-pool" compile "org.scala-lang:scala-library" - compile "org.scala-lang.modules:scala-xml_2.11" + compile "org.scala-lang.modules:scala-xml_$scalaMajDotMin" compile "xalan:xalan" compile "org.springframework:spring-web" diff --git a/repose-aggregator/components/filters/rate-limiting-filter/src/test/scala/org/openrepose/filters/ratelimiting/UpstreamJsonToXmlTest.scala b/repose-aggregator/components/filters/rate-limiting-filter/src/test/scala/org/openrepose/filters/ratelimiting/UpstreamJsonToXmlTest.scala index 0190103a5a7..e36352cad6c 100644 --- a/repose-aggregator/components/filters/rate-limiting-filter/src/test/scala/org/openrepose/filters/ratelimiting/UpstreamJsonToXmlTest.scala +++ b/repose-aggregator/components/filters/rate-limiting-filter/src/test/scala/org/openrepose/filters/ratelimiting/UpstreamJsonToXmlTest.scala @@ -23,7 +23,7 @@ import java.io.ByteArrayInputStream import java.nio.charset.StandardCharsets import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} import scala.xml.{Elem, XML} diff --git a/repose-aggregator/components/filters/regex-rbac-filter/build.gradle b/repose-aggregator/components/filters/regex-rbac-filter/build.gradle index 1012f48cc34..c12d977f4a6 100644 --- a/repose-aggregator/components/filters/regex-rbac-filter/build.gradle +++ b/repose-aggregator/components/filters/regex-rbac-filter/build.gradle @@ -2,7 +2,7 @@ dependencies { compile project(":repose-aggregator:core:repose-core-api") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "org.openrepose:http-delegation" compileOnly "javax.servlet:javax.servlet-api" diff --git a/repose-aggregator/components/filters/regex-rbac-filter/src/main/scala/org/openrepose/filters/regexrbac/RegexRbacFilter.scala b/repose-aggregator/components/filters/regex-rbac-filter/src/main/scala/org/openrepose/filters/regexrbac/RegexRbacFilter.scala index 3bca43f011b..4b32ac962fb 100644 --- a/repose-aggregator/components/filters/regex-rbac-filter/src/main/scala/org/openrepose/filters/regexrbac/RegexRbacFilter.scala +++ b/repose-aggregator/components/filters/regex-rbac-filter/src/main/scala/org/openrepose/filters/regexrbac/RegexRbacFilter.scala @@ -26,7 +26,7 @@ import javax.servlet.http.HttpServletResponse._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import com.rackspace.httpdelegation.HttpDelegationManager -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.config.manager.UpdateFailedException import org.openrepose.commons.utils.http.PowerApiHeader.RELEVANT_ROLES import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper diff --git a/repose-aggregator/components/filters/regex-rbac-filter/src/test/scala/org/openrepose/filters/regexrbac/RegexRbacFilterTest.scala b/repose-aggregator/components/filters/regex-rbac-filter/src/test/scala/org/openrepose/filters/regexrbac/RegexRbacFilterTest.scala index 37d32d02ee3..abb26a0183c 100644 --- a/repose-aggregator/components/filters/regex-rbac-filter/src/test/scala/org/openrepose/filters/regexrbac/RegexRbacFilterTest.scala +++ b/repose-aggregator/components/filters/regex-rbac-filter/src/test/scala/org/openrepose/filters/regexrbac/RegexRbacFilterTest.scala @@ -37,8 +37,8 @@ import org.openrepose.commons.config.resource.{ConfigurationResource, Configurat import org.openrepose.core.services.config.ConfigurationService import org.openrepose.filters.regexrbac.config.{DelegatingType, RegexRbacConfig, ResourcesType} import org.scalatest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.springframework.mock.web.{MockFilterChain, MockFilterConfig, MockHttpServletRequest, MockHttpServletResponse} import scala.collection.JavaConversions._ diff --git a/repose-aggregator/components/filters/regex-rbac-filter/src/test/scala/org/openrepose/filters/regexrbac/config/RegexRbacSchemaTest.scala b/repose-aggregator/components/filters/regex-rbac-filter/src/test/scala/org/openrepose/filters/regexrbac/config/RegexRbacSchemaTest.scala index e05fb7c12f8..6e2a3904fc9 100644 --- a/repose-aggregator/components/filters/regex-rbac-filter/src/test/scala/org/openrepose/filters/regexrbac/config/RegexRbacSchemaTest.scala +++ b/repose-aggregator/components/filters/regex-rbac-filter/src/test/scala/org/openrepose/filters/regexrbac/config/RegexRbacSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/scripting-filter/build.gradle b/repose-aggregator/components/filters/scripting-filter/build.gradle index 152425b8749..b42cc15665b 100644 --- a/repose-aggregator/components/filters/scripting-filter/build.gradle +++ b/repose-aggregator/components/filters/scripting-filter/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "org.python:jython-standalone" compile "org.codehaus.groovy:groovy-all" compile "org.luaj:luaj-jse" diff --git a/repose-aggregator/components/filters/scripting-filter/src/main/scala/org/openrepose/filters/scripting/ScriptingFilter.scala b/repose-aggregator/components/filters/scripting-filter/src/main/scala/org/openrepose/filters/scripting/ScriptingFilter.scala index d767bd41c20..0a901809f00 100644 --- a/repose-aggregator/components/filters/scripting-filter/src/main/scala/org/openrepose/filters/scripting/ScriptingFilter.scala +++ b/repose-aggregator/components/filters/scripting-filter/src/main/scala/org/openrepose/filters/scripting/ScriptingFilter.scala @@ -25,7 +25,7 @@ import javax.script._ import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.config.manager.{UpdateFailedException, UpdateListener} import org.openrepose.commons.utils.servlet.http._ import org.openrepose.core.filter.FilterConfigHelper diff --git a/repose-aggregator/components/filters/scripting-filter/src/test/scala/org/openrepose/filters/scripting/ScriptingFilterTest.scala b/repose-aggregator/components/filters/scripting-filter/src/test/scala/org/openrepose/filters/scripting/ScriptingFilterTest.scala index 0628c483a76..02d6fd33b19 100644 --- a/repose-aggregator/components/filters/scripting-filter/src/test/scala/org/openrepose/filters/scripting/ScriptingFilterTest.scala +++ b/repose-aggregator/components/filters/scripting-filter/src/test/scala/org/openrepose/filters/scripting/ScriptingFilterTest.scala @@ -28,8 +28,8 @@ import org.mockito.Mockito.verify import org.openrepose.commons.config.manager.UpdateFailedException import org.openrepose.core.services.config.ConfigurationService import org.openrepose.filters.scripting.config.{ScriptingConfig, ScriptingLanguages} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} import org.springframework.mock.web.{MockFilterChain, MockFilterConfig, MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/simple-rbac-filter/build.gradle b/repose-aggregator/components/filters/simple-rbac-filter/build.gradle index 9ceb0e93467..7af5a26bb22 100644 --- a/repose-aggregator/components/filters/simple-rbac-filter/build.gradle +++ b/repose-aggregator/components/filters/simple-rbac-filter/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "xalan:xalan" // Forces the version used by api-checker. compile "com.google.guava:guava" // Forces the version used by api-checker. compile "com.rackspace.papi.components.api-checker:checker-core" diff --git a/repose-aggregator/components/filters/simple-rbac-filter/src/main/scala/org/openrepose/filters/simplerbac/SimpleRbacFilter.scala b/repose-aggregator/components/filters/simple-rbac-filter/src/main/scala/org/openrepose/filters/simplerbac/SimpleRbacFilter.scala index bc6ce9b2115..acd87c837ec 100644 --- a/repose-aggregator/components/filters/simple-rbac-filter/src/main/scala/org/openrepose/filters/simplerbac/SimpleRbacFilter.scala +++ b/repose-aggregator/components/filters/simple-rbac-filter/src/main/scala/org/openrepose/filters/simplerbac/SimpleRbacFilter.scala @@ -31,7 +31,7 @@ import javax.xml.transform.stream.StreamSource import com.rackspace.com.papi.components.checker.handler._ import com.rackspace.com.papi.components.checker.wadl.WADLException import com.rackspace.com.papi.components.checker.{Config, Validator, ValidatorException} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.apache.commons.lang3.StringUtils import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.StringUriUtilities diff --git a/repose-aggregator/components/filters/simple-rbac-filter/src/test/scala/org/openrepose/filters/simplerbac/SimpleRbacFilterTest.scala b/repose-aggregator/components/filters/simple-rbac-filter/src/test/scala/org/openrepose/filters/simplerbac/SimpleRbacFilterTest.scala index 14e4ba95829..3c61fe27d93 100644 --- a/repose-aggregator/components/filters/simple-rbac-filter/src/test/scala/org/openrepose/filters/simplerbac/SimpleRbacFilterTest.scala +++ b/repose-aggregator/components/filters/simple-rbac-filter/src/test/scala/org/openrepose/filters/simplerbac/SimpleRbacFilterTest.scala @@ -32,8 +32,8 @@ import org.openrepose.commons.config.resource.{ConfigurationResource, Configurat import org.openrepose.core.services.config.ConfigurationService import org.openrepose.filters.simplerbac.config.{DelegatingType, ResourcesType, SimpleRbacConfig} import org.scalatest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.springframework.mock.web.{MockFilterChain, MockFilterConfig, MockHttpServletRequest, MockHttpServletResponse} import scala.collection.JavaConversions._ diff --git a/repose-aggregator/components/filters/simple-rbac-filter/src/test/scala/org/openrepose/filters/simplerbac/config/SimpleRbacSchemaTest.scala b/repose-aggregator/components/filters/simple-rbac-filter/src/test/scala/org/openrepose/filters/simplerbac/config/SimpleRbacSchemaTest.scala index f7826bbbb32..2bca6eb982c 100644 --- a/repose-aggregator/components/filters/simple-rbac-filter/src/test/scala/org/openrepose/filters/simplerbac/config/SimpleRbacSchemaTest.scala +++ b/repose-aggregator/components/filters/simple-rbac-filter/src/test/scala/org/openrepose/filters/simplerbac/config/SimpleRbacSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/slf4j-http-logging-filter/build.gradle b/repose-aggregator/components/filters/slf4j-http-logging-filter/build.gradle index f2261583d6c..d8544a1c69b 100644 --- a/repose-aggregator/components/filters/slf4j-http-logging-filter/build.gradle +++ b/repose-aggregator/components/filters/slf4j-http-logging-filter/build.gradle @@ -4,7 +4,7 @@ dependencies { compile "org.scala-lang:scala-library" compile "org.slf4j:slf4j-api" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" compileOnly "javax.inject:javax.inject" diff --git a/repose-aggregator/components/filters/slf4j-http-logging-filter/src/main/scala/org/openrepose/filters/slf4jlogging/Slf4jHttpLoggingFilter.scala b/repose-aggregator/components/filters/slf4j-http-logging-filter/src/main/scala/org/openrepose/filters/slf4jlogging/Slf4jHttpLoggingFilter.scala index c47f395ddac..a7255fe53ec 100644 --- a/repose-aggregator/components/filters/slf4j-http-logging-filter/src/main/scala/org/openrepose/filters/slf4jlogging/Slf4jHttpLoggingFilter.scala +++ b/repose-aggregator/components/filters/slf4j-http-logging-filter/src/main/scala/org/openrepose/filters/slf4jlogging/Slf4jHttpLoggingFilter.scala @@ -24,7 +24,7 @@ import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.logging.apache.HttpLogFormatter import org.openrepose.core.filter.FilterConfigHelper diff --git a/repose-aggregator/components/filters/slf4j-http-logging-filter/src/test/scala/org/openrepose/filters/slf4jlogging/config/Slf4jHttpLoggingSchemaTest.scala b/repose-aggregator/components/filters/slf4j-http-logging-filter/src/test/scala/org/openrepose/filters/slf4jlogging/config/Slf4jHttpLoggingSchemaTest.scala index 7fbb19c1a6e..1485015d107 100644 --- a/repose-aggregator/components/filters/slf4j-http-logging-filter/src/test/scala/org/openrepose/filters/slf4jlogging/config/Slf4jHttpLoggingSchemaTest.scala +++ b/repose-aggregator/components/filters/slf4j-http-logging-filter/src/test/scala/org/openrepose/filters/slf4jlogging/config/Slf4jHttpLoggingSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/split-header-filter/build.gradle b/repose-aggregator/components/filters/split-header-filter/build.gradle index 41c2c598ab8..57cf4811a7d 100644 --- a/repose-aggregator/components/filters/split-header-filter/build.gradle +++ b/repose-aggregator/components/filters/split-header-filter/build.gradle @@ -2,7 +2,7 @@ dependencies { compile project(":repose-aggregator:core:repose-core-api") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" compileOnly "javax.inject:javax.inject" diff --git a/repose-aggregator/components/filters/split-header-filter/src/main/scala/org/openrepose/filters/splitheader/SplitHeaderFilter.scala b/repose-aggregator/components/filters/split-header-filter/src/main/scala/org/openrepose/filters/splitheader/SplitHeaderFilter.scala index f14576b47a9..348349b9681 100644 --- a/repose-aggregator/components/filters/split-header-filter/src/main/scala/org/openrepose/filters/splitheader/SplitHeaderFilter.scala +++ b/repose-aggregator/components/filters/split-header-filter/src/main/scala/org/openrepose/filters/splitheader/SplitHeaderFilter.scala @@ -19,7 +19,7 @@ */ package org.openrepose.filters.splitheader -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, Named} import javax.servlet.FilterChain import javax.servlet.http.{HttpServletRequest, HttpServletResponse} diff --git a/repose-aggregator/components/filters/split-header-filter/src/test/scala/org/openrepose/filters/splitheader/SplitHeaderFilterTest.scala b/repose-aggregator/components/filters/split-header-filter/src/test/scala/org/openrepose/filters/splitheader/SplitHeaderFilterTest.scala index aaa99f4f6a2..2f2cd58ea7c 100644 --- a/repose-aggregator/components/filters/split-header-filter/src/test/scala/org/openrepose/filters/splitheader/SplitHeaderFilterTest.scala +++ b/repose-aggregator/components/filters/split-header-filter/src/test/scala/org/openrepose/filters/splitheader/SplitHeaderFilterTest.scala @@ -24,8 +24,8 @@ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import org.junit.runner.RunWith import org.openrepose.core.services.config.ConfigurationService import org.openrepose.filters.splitheader.config.{HeaderList, SplitHeaderConfig} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockFilterChain, MockHttpServletRequest, MockHttpServletResponse} @@ -174,7 +174,7 @@ class SplitHeaderFilterTest extends FunSpec with BeforeAndAfterEach with Mockito splitHeaderFilter.doWork(request, response, filterChain) val passedResponse = filterChain.getResponse.asInstanceOf[HttpServletResponse] - passedResponse.getHeaders(TestHeaderName).asScala.toSeq should contain only("one", "two", "three", "four") + passedResponse.getHeaders(TestHeaderName).asScala.toSeq should contain theSameElementsAs Seq("one", "two", "two", "four") } it("should split a request header regardless of casing") { diff --git a/repose-aggregator/components/filters/split-header-filter/src/test/scala/org/openrepose/filters/splitheader/config/SplitHeaderSchemaTest.scala b/repose-aggregator/components/filters/split-header-filter/src/test/scala/org/openrepose/filters/splitheader/config/SplitHeaderSchemaTest.scala index 640457131fa..2e17114b776 100644 --- a/repose-aggregator/components/filters/split-header-filter/src/test/scala/org/openrepose/filters/splitheader/config/SplitHeaderSchemaTest.scala +++ b/repose-aggregator/components/filters/split-header-filter/src/test/scala/org/openrepose/filters/splitheader/config/SplitHeaderSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class SplitHeaderSchemaTest extends ConfigurationTest { diff --git a/repose-aggregator/components/filters/tenant-culling-filter/build.gradle b/repose-aggregator/components/filters/tenant-culling-filter/build.gradle index 8ca7444e763..a01f92db8f7 100644 --- a/repose-aggregator/components/filters/tenant-culling-filter/build.gradle +++ b/repose-aggregator/components/filters/tenant-culling-filter/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" compileOnly "javax.inject:javax.inject" diff --git a/repose-aggregator/components/filters/tenant-culling-filter/src/main/scala/org/openrepose/filters/tenantculling/TenantCullingFilter.scala b/repose-aggregator/components/filters/tenant-culling-filter/src/main/scala/org/openrepose/filters/tenantculling/TenantCullingFilter.scala index 9d054dbd45c..9bad621f766 100644 --- a/repose-aggregator/components/filters/tenant-culling-filter/src/main/scala/org/openrepose/filters/tenantculling/TenantCullingFilter.scala +++ b/repose-aggregator/components/filters/tenant-culling-filter/src/main/scala/org/openrepose/filters/tenantculling/TenantCullingFilter.scala @@ -22,7 +22,7 @@ package org.openrepose.filters.tenantculling import java.io.IOException import com.fasterxml.jackson.core.JsonParseException -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.servlet._ import javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR import javax.servlet.http.{HttpServletRequest, HttpServletResponse} diff --git a/repose-aggregator/components/filters/tenant-culling-filter/src/test/scala/org/openrepose/filters/tenantculling/TenantCullingFilterTest.scala b/repose-aggregator/components/filters/tenant-culling-filter/src/test/scala/org/openrepose/filters/tenantculling/TenantCullingFilterTest.scala index 41e52d470d4..4a206ad892b 100644 --- a/repose-aggregator/components/filters/tenant-culling-filter/src/test/scala/org/openrepose/filters/tenantculling/TenantCullingFilterTest.scala +++ b/repose-aggregator/components/filters/tenant-culling-filter/src/test/scala/org/openrepose/filters/tenantculling/TenantCullingFilterTest.scala @@ -30,8 +30,8 @@ import org.openrepose.commons.utils.http.PowerApiHeader.RELEVANT_ROLES import org.openrepose.commons.utils.json.JsonHeaderHelper import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.openrepose.filters.tenantculling.TenantCullingFilter.TenantToRolesMap -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} import org.springframework.mock.web.{MockFilterChain, MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/translation-filter/src/test/scala/org/openrepose/filters/translation/httpx/HttpxMarshallerTest.scala b/repose-aggregator/components/filters/translation-filter/src/test/scala/org/openrepose/filters/translation/httpx/HttpxMarshallerTest.scala index 15668532284..d7064f4e282 100644 --- a/repose-aggregator/components/filters/translation-filter/src/test/scala/org/openrepose/filters/translation/httpx/HttpxMarshallerTest.scala +++ b/repose-aggregator/components/filters/translation-filter/src/test/scala/org/openrepose/filters/translation/httpx/HttpxMarshallerTest.scala @@ -23,7 +23,7 @@ import java.io.{ByteArrayInputStream, InputStream} import org.junit.runner.RunWith import org.openrepose.docs.repose.httpx.v1._ -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/uri-normalization-filter/build.gradle b/repose-aggregator/components/filters/uri-normalization-filter/build.gradle index 71cdb76472b..3f621673099 100644 --- a/repose-aggregator/components/filters/uri-normalization-filter/build.gradle +++ b/repose-aggregator/components/filters/uri-normalization-filter/build.gradle @@ -8,7 +8,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "io.dropwizard.metrics:metrics-core" compile "org.slf4j:slf4j-api" diff --git a/repose-aggregator/components/filters/uri-normalization-filter/src/main/scala/org/openrepose/filters/urinormalization/UriNormalizationFilter.scala b/repose-aggregator/components/filters/uri-normalization-filter/src/main/scala/org/openrepose/filters/urinormalization/UriNormalizationFilter.scala index e64b1d0f088..805287ccfbe 100644 --- a/repose-aggregator/components/filters/uri-normalization-filter/src/main/scala/org/openrepose/filters/urinormalization/UriNormalizationFilter.scala +++ b/repose-aggregator/components/filters/uri-normalization-filter/src/main/scala/org/openrepose/filters/urinormalization/UriNormalizationFilter.scala @@ -26,7 +26,7 @@ import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import com.codahale.metrics.MetricRegistry -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.http.normal.QueryStringNormalizer import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper diff --git a/repose-aggregator/components/filters/uri-normalization-filter/src/main/scala/org/openrepose/filters/urinormalization/normalizer/MediaTypeNormalizer.scala b/repose-aggregator/components/filters/uri-normalization-filter/src/main/scala/org/openrepose/filters/urinormalization/normalizer/MediaTypeNormalizer.scala index 2f98dd33f1f..f2a2855b6fd 100644 --- a/repose-aggregator/components/filters/uri-normalization-filter/src/main/scala/org/openrepose/filters/urinormalization/normalizer/MediaTypeNormalizer.scala +++ b/repose-aggregator/components/filters/uri-normalization-filter/src/main/scala/org/openrepose/filters/urinormalization/normalizer/MediaTypeNormalizer.scala @@ -22,7 +22,7 @@ package org.openrepose.filters.urinormalization.normalizer import java.util.regex.Pattern import javax.ws.rs.core.HttpHeaders -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.utils.http.media.MimeType import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.openrepose.filters.urinormalization.config.MediaType diff --git a/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/UriNormalizationFilterTest.scala b/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/UriNormalizationFilterTest.scala index c66d95bc197..ed7918af62d 100644 --- a/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/UriNormalizationFilterTest.scala +++ b/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/UriNormalizationFilterTest.scala @@ -31,8 +31,8 @@ import org.mockito.Mockito.{reset, verify, when} import org.openrepose.core.services.config.ConfigurationService import org.openrepose.core.services.reporting.metrics.{MetricsService, AggregateMeterFactory} import org.openrepose.filters.urinormalization.config._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockFilterChain, MockFilterConfig, MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/normalizer/MediaTypeNormalizerTest.scala b/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/normalizer/MediaTypeNormalizerTest.scala index 7bfda0ae35e..39f302e8982 100644 --- a/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/normalizer/MediaTypeNormalizerTest.scala +++ b/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/normalizer/MediaTypeNormalizerTest.scala @@ -24,7 +24,7 @@ import javax.ws.rs.core.HttpHeaders import org.junit.runner.RunWith import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.openrepose.filters.urinormalization.config.MediaType -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.MockHttpServletRequest diff --git a/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/normalizer/MultiInstanceWhiteListFactoryTest.scala b/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/normalizer/MultiInstanceWhiteListFactoryTest.scala index 1f57563e8ad..5797660fc37 100644 --- a/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/normalizer/MultiInstanceWhiteListFactoryTest.scala +++ b/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/normalizer/MultiInstanceWhiteListFactoryTest.scala @@ -21,7 +21,7 @@ package org.openrepose.filters.urinormalization.normalizer import org.junit.runner.RunWith import org.openrepose.filters.urinormalization.config.{HttpUriParameterList, UriParameter} -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/normalizer/MultiInstanceWhiteListTest.scala b/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/normalizer/MultiInstanceWhiteListTest.scala index 39a45a153f2..5f28b586e15 100644 --- a/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/normalizer/MultiInstanceWhiteListTest.scala +++ b/repose-aggregator/components/filters/uri-normalization-filter/src/test/scala/org/openrepose/filters/urinormalization/normalizer/MultiInstanceWhiteListTest.scala @@ -21,7 +21,7 @@ package org.openrepose.filters.urinormalization.normalizer import org.junit.runner.RunWith import org.openrepose.filters.urinormalization.config.{HttpUriParameterList, UriParameter} -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/uri-stripper-filter/build.gradle b/repose-aggregator/components/filters/uri-stripper-filter/build.gradle index ab3957d0ee0..5892559c972 100644 --- a/repose-aggregator/components/filters/uri-stripper-filter/build.gradle +++ b/repose-aggregator/components/filters/uri-stripper-filter/build.gradle @@ -4,12 +4,10 @@ dependencies { compile "org.slf4j:slf4j-api" compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "com.typesafe.play:play-json_$scalaMajDotMin" compile "io.gatling:jsonpath_$scalaMajDotMin" compile "org.scala-lang.modules:scala-xml_$scalaMajDotMin" - compile "xalan:xalan" // Forces the version used by wadl-tools. - compile "com.rackspace.cloud.api:wadl-tools_$scalaMajDotMin" compile "net.sf.saxon:Saxon-EE" compileOnly "javax.servlet:javax.servlet-api" diff --git a/repose-aggregator/components/filters/uri-stripper-filter/src/main/scala/org/openrepose/filters/uristripper/LogErrorListener.scala b/repose-aggregator/components/filters/uri-stripper-filter/src/main/scala/org/openrepose/filters/uristripper/LogErrorListener.scala new file mode 100644 index 00000000000..ef214bc6b37 --- /dev/null +++ b/repose-aggregator/components/filters/uri-stripper-filter/src/main/scala/org/openrepose/filters/uristripper/LogErrorListener.scala @@ -0,0 +1,61 @@ +/* + * _=_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_= + * Repose + * _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_- + * Copyright (C) 2010 - 2015 Rackspace US, Inc. + * _-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * =_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_-_=_ + */ + +package org.openrepose.filters.uristripper + +import com.typesafe.scalalogging.StrictLogging +import javax.xml.transform.{ErrorListener, TransformerException} +import org.openrepose.filters.uristripper.LogErrorListener._ +import org.xml.sax.SAXParseException + +class LogErrorListener extends ErrorListener with StrictLogging { + + private def logException(e : TransformerException, default : => Unit) : Unit = { + e.getMessage() match { + case trace(m) => logger.trace(m) + case debug(m) => logger.debug(m) + case info(m) => logger.info(m) + case warning(m) => logger.warn(m) + case error(m) => logger.error(m) + case se(m) => logger.error(m) + throw new SAXParseException (m, null) + case s : String => default + } + } + + override def error (exception : TransformerException) : Unit = + logException(exception, logger.error(exception.getMessage())) + + override def fatalError (exception : TransformerException) : Unit = + logException(exception, logger.error(exception.getMessage())) + + override def warning (exception : TransformerException) : Unit = + logException(exception, logger.warn(exception.getMessage())) + +} + +private object LogErrorListener { + val trace = "^\\[TRACE\\]\\s+(.*)".r + val debug = "^\\[DEBUG\\]\\s+(.*)".r + val info = "^\\[INFO\\]\\s+(.*)".r + val warning = "^\\[WARNING\\]\\s+(.*)".r + val error = "^\\[ERROR\\]\\s+(.*)".r + val se = "^\\[SE\\]\\s+(.*)".r +} diff --git a/repose-aggregator/components/filters/uri-stripper-filter/src/main/scala/org/openrepose/filters/uristripper/UriStripperFilter.scala b/repose-aggregator/components/filters/uri-stripper-filter/src/main/scala/org/openrepose/filters/uristripper/UriStripperFilter.scala index 2632f1d98a2..dabf817a6a0 100644 --- a/repose-aggregator/components/filters/uri-stripper-filter/src/main/scala/org/openrepose/filters/uristripper/UriStripperFilter.scala +++ b/repose-aggregator/components/filters/uri-stripper-filter/src/main/scala/org/openrepose/filters/uristripper/UriStripperFilter.scala @@ -23,17 +23,17 @@ package org.openrepose.filters.uristripper import java.io.{ByteArrayInputStream, ByteArrayOutputStream, InputStream} import java.net.{URI, URL} import java.nio.charset.Charset + +import _root_.io.gatling.jsonpath.AST.{Field, RootNode} +import _root_.io.gatling.jsonpath.Parser +import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import javax.xml.transform._ import javax.xml.transform.dom._ import javax.xml.transform.stream._ - -import _root_.io.gatling.jsonpath.AST.{Field, RootNode} -import _root_.io.gatling.jsonpath.Parser -import com.rackspace.cloud.api.wadl.Converters._ -import com.typesafe.scalalogging.slf4j.StrictLogging +import net.sf.saxon.serialize.MessageWarner import net.sf.saxon.{Controller, TransformerFactoryImpl} import org.apache.http.HttpHeaders import org.openrepose.commons.config.manager.UpdateListener @@ -51,8 +51,9 @@ import play.api.libs.json._ import scala.collection.JavaConversions._ import scala.collection.mutable -import scala.language.{postfixOps, reflectiveCalls} +import scala.language.{implicitConversions, postfixOps, reflectiveCalls} import scala.util.{Failure, Success, Try} +import scala.xml.NodeSeq @Named class UriStripperFilter @Inject()(configurationService: ConfigurationService) @@ -67,6 +68,13 @@ class UriStripperFilter @Inject()(configurationService: ConfigurationService) private var templateMapResponse: Map[LinkPath, Templates] = _ private val DROP_CODE: String = "[[DROP]]" + def addLogErrorListener(c : Controller) : Unit = { + c.asInstanceOf[Transformer].setErrorListener (new LogErrorListener) + c.setMessageEmitter(new MessageWarner()) + } + + implicit def nodeSeq2ByteArrayInputStream(ns : NodeSeq) : ByteArrayInputStream = new ByteArrayInputStream(ns.toString().getBytes()) + override def init(filterConfig: FilterConfig): Unit = { logger.trace("URI Stripper filter initializing...") configurationFileName = new FilterConfigHelper(filterConfig).getFilterConfig(DefaultConfigFileName) @@ -185,7 +193,7 @@ class UriStripperFilter @Inject()(configurationService: ConfigurationService) val result = applicableLinkPaths.foldLeft(wrappedRequest.getInputStream) { (in: InputStream, linkPath: LinkPath) => val out = new ByteArrayOutputStream() val transformer = templateMapRequest(linkPath).newTransformer - transformer.asInstanceOf[Controller].addLogErrorListener + addLogErrorListener(transformer.asInstanceOf[Controller]) transformer.setParameter("removedToken", "") transformer.setParameter("prefixToken", "") transformer.setParameter("postfixToken", "") @@ -229,7 +237,7 @@ class UriStripperFilter @Inject()(configurationService: ConfigurationService) val result = applicableLinkPaths.foldLeft(wrappedResponse.getOutputStreamAsInputStream) { (in: InputStream, linkPath: LinkPath) => val out = new ByteArrayOutputStream() val transformer = templateMapResponse(linkPath).newTransformer - transformer.asInstanceOf[Controller].addLogErrorListener + addLogErrorListener(transformer.asInstanceOf[Controller]) transformer.setParameter("removedToken", token.getOrElse("")) transformer.setParameter("prefixToken", previousToken.getOrElse("")) transformer.setParameter("postfixToken", nextToken.getOrElse("")) @@ -431,7 +439,7 @@ class UriStripperFilter @Inject()(configurationService: ConfigurationService) )) setupTransformer.setParameter("failOnMiss", xmlElement.getXpath.getLinkMismatchAction == FAIL) - setupTransformer.asInstanceOf[Controller].addLogErrorListener + addLogErrorListener(setupTransformer.asInstanceOf[Controller]) val updateXPathXSLTDomResult = new DOMResult() setupTransformer.transform(new StreamSource(), updateXPathXSLTDomResult) diff --git a/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/UriStripperFilterRequestTest.scala b/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/UriStripperFilterRequestTest.scala index b6a70dd5f45..90b517b1b8a 100644 --- a/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/UriStripperFilterRequestTest.scala +++ b/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/UriStripperFilterRequestTest.scala @@ -30,8 +30,8 @@ import org.mockito.Matchers._ import org.mockito.Mockito._ import org.openrepose.commons.utils.http.media.MimeType import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} import play.api.libs.json.{JsDefined, JsUndefined, Json} diff --git a/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/UriStripperFilterResponseTest.scala b/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/UriStripperFilterResponseTest.scala index 93fdab1d727..7fcf3dd42bf 100644 --- a/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/UriStripperFilterResponseTest.scala +++ b/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/UriStripperFilterResponseTest.scala @@ -32,8 +32,8 @@ import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.Answer import org.openrepose.commons.utils.http.media.MimeType import org.openrepose.commons.utils.servlet.http.{HttpServletRequestWrapper, HttpServletResponseWrapper} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} import play.api.libs.json.{JsDefined, JsUndefined, Json} diff --git a/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/UriStripperFilterTest.scala b/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/UriStripperFilterTest.scala index d4f9acc6e22..b70c10a70a5 100644 --- a/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/UriStripperFilterTest.scala +++ b/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/UriStripperFilterTest.scala @@ -31,8 +31,8 @@ import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.Answer import org.openrepose.commons.utils.servlet.http.{HttpServletRequestWrapper, HttpServletResponseWrapper} import org.openrepose.filters.uristripper.config.UriStripperConfig -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/config/UriStripperSchemaTest.scala b/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/config/UriStripperSchemaTest.scala index 4701c310a30..cd7d9e70937 100644 --- a/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/config/UriStripperSchemaTest.scala +++ b/repose-aggregator/components/filters/uri-stripper-filter/src/test/scala/org/openrepose/filters/uristripper/config/UriStripperSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/uri-user-filter/build.gradle b/repose-aggregator/components/filters/uri-user-filter/build.gradle index 346b1e88df2..0a7b426da8d 100644 --- a/repose-aggregator/components/filters/uri-user-filter/build.gradle +++ b/repose-aggregator/components/filters/uri-user-filter/build.gradle @@ -4,7 +4,7 @@ dependencies { compile "org.slf4j:slf4j-api" compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" compileOnly "javax.inject:javax.inject" diff --git a/repose-aggregator/components/filters/uri-user-filter/src/main/scala/org/openrepose/filters/uriuser/UriUserFilter.scala b/repose-aggregator/components/filters/uri-user-filter/src/main/scala/org/openrepose/filters/uriuser/UriUserFilter.scala index 46e8ba1dd9f..431e55522e7 100644 --- a/repose-aggregator/components/filters/uri-user-filter/src/main/scala/org/openrepose/filters/uriuser/UriUserFilter.scala +++ b/repose-aggregator/components/filters/uri-user-filter/src/main/scala/org/openrepose/filters/uriuser/UriUserFilter.scala @@ -26,7 +26,7 @@ import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.http.PowerApiHeader import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper diff --git a/repose-aggregator/components/filters/uri-user-filter/src/test/scala/org/openrepose/filters/uriuser/UriUserFilterTest.scala b/repose-aggregator/components/filters/uri-user-filter/src/test/scala/org/openrepose/filters/uriuser/UriUserFilterTest.scala index 6e82a2011ce..76287eb93e1 100644 --- a/repose-aggregator/components/filters/uri-user-filter/src/test/scala/org/openrepose/filters/uriuser/UriUserFilterTest.scala +++ b/repose-aggregator/components/filters/uri-user-filter/src/test/scala/org/openrepose/filters/uriuser/UriUserFilterTest.scala @@ -29,8 +29,8 @@ import org.mockito.Mockito._ import org.openrepose.commons.utils.http.PowerApiHeader import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.openrepose.filters.uriuser.config.{IdentificationMapping, IdentificationMappingList, UriUserConfig} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.MockHttpServletRequest diff --git a/repose-aggregator/components/filters/uri-user-filter/src/test/scala/org/openrepose/filters/uriuser/config/UriUserSchemaTest.scala b/repose-aggregator/components/filters/uri-user-filter/src/test/scala/org/openrepose/filters/uriuser/config/UriUserSchemaTest.scala index c9774030ddf..96fb68eba81 100644 --- a/repose-aggregator/components/filters/uri-user-filter/src/test/scala/org/openrepose/filters/uriuser/config/UriUserSchemaTest.scala +++ b/repose-aggregator/components/filters/uri-user-filter/src/test/scala/org/openrepose/filters/uriuser/config/UriUserSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/url-extractor-to-header-filter/build.gradle b/repose-aggregator/components/filters/url-extractor-to-header-filter/build.gradle index 872c39ce802..6ee91b4cbb6 100644 --- a/repose-aggregator/components/filters/url-extractor-to-header-filter/build.gradle +++ b/repose-aggregator/components/filters/url-extractor-to-header-filter/build.gradle @@ -3,7 +3,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.servlet:javax.servlet-api" compileOnly "javax.inject:javax.inject" diff --git a/repose-aggregator/components/filters/url-extractor-to-header-filter/src/main/scala/org/openrepose/filters/urlextractortoheader/UrlExtractorToHeaderFilter.scala b/repose-aggregator/components/filters/url-extractor-to-header-filter/src/main/scala/org/openrepose/filters/urlextractortoheader/UrlExtractorToHeaderFilter.scala index 590e8b0d8b9..f168820f4f3 100644 --- a/repose-aggregator/components/filters/url-extractor-to-header-filter/src/main/scala/org/openrepose/filters/urlextractortoheader/UrlExtractorToHeaderFilter.scala +++ b/repose-aggregator/components/filters/url-extractor-to-header-filter/src/main/scala/org/openrepose/filters/urlextractortoheader/UrlExtractorToHeaderFilter.scala @@ -24,7 +24,7 @@ import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.openrepose.core.filter.FilterConfigHelper diff --git a/repose-aggregator/components/filters/url-extractor-to-header-filter/src/test/scala/org/openrepose/filters/urlextractortoheader/UrlExtractorToHeaderFilterTest.scala b/repose-aggregator/components/filters/url-extractor-to-header-filter/src/test/scala/org/openrepose/filters/urlextractortoheader/UrlExtractorToHeaderFilterTest.scala index 055c0be3d9c..a036f839158 100644 --- a/repose-aggregator/components/filters/url-extractor-to-header-filter/src/test/scala/org/openrepose/filters/urlextractortoheader/UrlExtractorToHeaderFilterTest.scala +++ b/repose-aggregator/components/filters/url-extractor-to-header-filter/src/test/scala/org/openrepose/filters/urlextractortoheader/UrlExtractorToHeaderFilterTest.scala @@ -27,8 +27,8 @@ import org.mockito.ArgumentCaptor import org.mockito.Matchers._ import org.mockito.Mockito._ import org.openrepose.filters.urlextractortoheader.config.{Extractor, UrlExtractorToHeaderConfig} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/valkyrie-authorization-filter/build.gradle b/repose-aggregator/components/filters/valkyrie-authorization-filter/build.gradle index efa5767fcf1..1f52c388aa5 100644 --- a/repose-aggregator/components/filters/valkyrie-authorization-filter/build.gradle +++ b/repose-aggregator/components/filters/valkyrie-authorization-filter/build.gradle @@ -5,7 +5,7 @@ dependencies { compile project(":repose-aggregator:components:services:http-client-service:http-client-service-api") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "org.openrepose:http-delegation" compile "com.typesafe.play:play-json_$scalaMajDotMin" compile "com.jayway.jsonpath:json-path" diff --git a/repose-aggregator/components/filters/valkyrie-authorization-filter/src/main/scala/org/openrepose/filters/valkyrieauthorization/ValkyrieAuthorizationFilter.scala b/repose-aggregator/components/filters/valkyrie-authorization-filter/src/main/scala/org/openrepose/filters/valkyrieauthorization/ValkyrieAuthorizationFilter.scala index 36ae38f5c4c..cdf67637d95 100644 --- a/repose-aggregator/components/filters/valkyrie-authorization-filter/src/main/scala/org/openrepose/filters/valkyrieauthorization/ValkyrieAuthorizationFilter.scala +++ b/repose-aggregator/components/filters/valkyrie-authorization-filter/src/main/scala/org/openrepose/filters/valkyrieauthorization/ValkyrieAuthorizationFilter.scala @@ -28,7 +28,7 @@ import java.util.regex.PatternSyntaxException import com.fasterxml.jackson.core.JsonParseException import com.jayway.jsonpath.{DocumentContext, InvalidJsonException, JsonPath, PathNotFoundException} import com.rackspace.httpdelegation.HttpDelegationManager -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, Named} import javax.servlet._ import javax.servlet.http.HttpServletResponse._ diff --git a/repose-aggregator/components/filters/valkyrie-authorization-filter/src/test/scala/org/openrepose/filters/valkyrieauthorization/ValkyrieAuthorizationFilterTest.scala b/repose-aggregator/components/filters/valkyrie-authorization-filter/src/test/scala/org/openrepose/filters/valkyrieauthorization/ValkyrieAuthorizationFilterTest.scala index e19db31a0c4..0202bef6019 100644 --- a/repose-aggregator/components/filters/valkyrie-authorization-filter/src/test/scala/org/openrepose/filters/valkyrieauthorization/ValkyrieAuthorizationFilterTest.scala +++ b/repose-aggregator/components/filters/valkyrie-authorization-filter/src/test/scala/org/openrepose/filters/valkyrieauthorization/ValkyrieAuthorizationFilterTest.scala @@ -57,8 +57,8 @@ import org.openrepose.filters.valkyrieauthorization.config.DeviceIdMismatchActio import org.openrepose.filters.valkyrieauthorization.config.DevicePath.Regex import org.openrepose.filters.valkyrieauthorization.config.HttpMethod._ import org.openrepose.filters.valkyrieauthorization.config._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers => ScalaTestMatchers} import org.springframework.mock.web.{MockFilterChain, MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/valkyrie-authorization-filter/src/test/scala/org/openrepose/filters/valkyrieauthorization/config/ValkyrieAuthorizationSchemaTest.scala b/repose-aggregator/components/filters/valkyrie-authorization-filter/src/test/scala/org/openrepose/filters/valkyrieauthorization/config/ValkyrieAuthorizationSchemaTest.scala index d678287fe3f..3c8c7157c66 100644 --- a/repose-aggregator/components/filters/valkyrie-authorization-filter/src/test/scala/org/openrepose/filters/valkyrieauthorization/config/ValkyrieAuthorizationSchemaTest.scala +++ b/repose-aggregator/components/filters/valkyrie-authorization-filter/src/test/scala/org/openrepose/filters/valkyrieauthorization/config/ValkyrieAuthorizationSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/filters/versioning-filter/build.gradle b/repose-aggregator/components/filters/versioning-filter/build.gradle index 42cf91ff838..658cb32ba5f 100644 --- a/repose-aggregator/components/filters/versioning-filter/build.gradle +++ b/repose-aggregator/components/filters/versioning-filter/build.gradle @@ -8,7 +8,7 @@ dependencies { compile "org.slf4j:slf4j-api" compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "io.dropwizard.metrics:metrics-core" compile "xalan:xalan" compile "org.springframework:spring-beans" diff --git a/repose-aggregator/components/filters/versioning-filter/src/main/scala/org/openrepose/filters/versioning/VersioningFilter.scala b/repose-aggregator/components/filters/versioning-filter/src/main/scala/org/openrepose/filters/versioning/VersioningFilter.scala index d8d3b496cc9..c66f0e7bc3f 100644 --- a/repose-aggregator/components/filters/versioning-filter/src/main/scala/org/openrepose/filters/versioning/VersioningFilter.scala +++ b/repose-aggregator/components/filters/versioning-filter/src/main/scala/org/openrepose/filters/versioning/VersioningFilter.scala @@ -27,7 +27,7 @@ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} import javax.xml.bind.JAXBElement import com.codahale.metrics.MetricRegistry -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.apache.http.HttpHeaders import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.commons.utils.http.CommonRequestAttributes diff --git a/repose-aggregator/components/filters/versioning-filter/src/test/scala/org/openrepose/filters/versioning/VersioningFilterTest.scala b/repose-aggregator/components/filters/versioning-filter/src/test/scala/org/openrepose/filters/versioning/VersioningFilterTest.scala index 24830bd222e..1951391fe67 100644 --- a/repose-aggregator/components/filters/versioning-filter/src/test/scala/org/openrepose/filters/versioning/VersioningFilterTest.scala +++ b/repose-aggregator/components/filters/versioning-filter/src/test/scala/org/openrepose/filters/versioning/VersioningFilterTest.scala @@ -35,8 +35,8 @@ import org.openrepose.core.services.config.ConfigurationService import org.openrepose.core.services.reporting.metrics.MetricsService import org.openrepose.core.systemmodel.config._ import org.openrepose.filters.versioning.config.{MediaType, MediaTypeList, ServiceVersionMapping, ServiceVersionMappingList} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockFilterChain, MockFilterConfig, MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/filters/versioning-filter/src/test/scala/org/openrepose/filters/versioning/config/VersioningSchemaTest.scala b/repose-aggregator/components/filters/versioning-filter/src/test/scala/org/openrepose/filters/versioning/config/VersioningSchemaTest.scala index d99a45608f1..039e8b9dfe6 100644 --- a/repose-aggregator/components/filters/versioning-filter/src/test/scala/org/openrepose/filters/versioning/config/VersioningSchemaTest.scala +++ b/repose-aggregator/components/filters/versioning-filter/src/test/scala/org/openrepose/filters/versioning/config/VersioningSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/build.gradle b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/build.gradle index adf320a88bc..66aaed7b895 100644 --- a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/build.gradle +++ b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/build.gradle @@ -5,7 +5,7 @@ dependencies { compile project(":repose-aggregator:commons:commons-utilities") compile "org.slf4j:slf4j-api" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "org.slf4j:jcl-over-slf4j" compile "org.scala-lang:scala-library" compile "com.typesafe.akka:akka-actor_$scalaMajDotMin" @@ -31,7 +31,8 @@ dependencies { testCompile "org.apache.logging.log4j:log4j-core" testCompile group: 'org.apache.logging.log4j', name: 'log4j-core', classifier: 'tests' testCompile "com.typesafe.akka:akka-testkit_$scalaMajDotMin" - testCompile "com.typesafe.akka:akka-http-core-experimental_$scalaMajDotMin" + testCompile "com.typesafe.akka:akka-http-core_$scalaMajDotMin" + testCompile "com.typesafe.akka:akka-stream_$scalaMajDotMin" testCompile "org.springframework:spring-test" } diff --git a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/AtomFeedServiceImpl.scala b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/AtomFeedServiceImpl.scala index 071500b0197..af519931542 100644 --- a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/AtomFeedServiceImpl.scala +++ b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/AtomFeedServiceImpl.scala @@ -23,7 +23,7 @@ import javax.annotation.{PostConstruct, PreDestroy} import javax.inject.{Inject, Named} import akka.actor._ -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import io.opentracing.Tracer import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.core.filter.SystemModelInterrogator @@ -90,7 +90,7 @@ class AtomFeedServiceImpl @Inject()(@Value(ReposeSpringProperties.CORE.REPOSE_VE configurationService.unsubscribeFrom(DefaultConfig, AtomFeedServiceConfigurationListener) configurationService.unsubscribeFrom(SystemModelConfig, SystemModelConfigurationListener) - actorSystem.shutdown() + actorSystem.terminate() } override def registerListener(feedId: String, listener: AtomFeedListener): String = { diff --git a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/actors/FeedReader.scala b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/actors/FeedReader.scala index 6dceb718fc0..e3b9f48f371 100644 --- a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/actors/FeedReader.scala +++ b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/actors/FeedReader.scala @@ -23,7 +23,7 @@ import java.io.{IOException, StringWriter} import java.net.{URI, UnknownServiceException} import akka.actor._ -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import io.opentracing.Tracer import io.opentracing.tag.Tags import org.apache.abdera.Abdera diff --git a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/actors/NotifierManager.scala b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/actors/NotifierManager.scala index 84c629a3fd5..667a6b621df 100644 --- a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/actors/NotifierManager.scala +++ b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/actors/NotifierManager.scala @@ -20,7 +20,7 @@ package org.openrepose.nodeservice.atomfeed.impl.actors import akka.actor.{Actor, ActorRef, PoisonPill} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.nodeservice.atomfeed.AtomFeedListener import org.openrepose.nodeservice.atomfeed.impl.actors.FeedReader.{CancelScheduledReading, ScheduleReading} import org.openrepose.nodeservice.atomfeed.impl.actors.Notifier._ diff --git a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/auth/OpenStackIdentityV2AuthenticatedRequestFactory.scala b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/auth/OpenStackIdentityV2AuthenticatedRequestFactory.scala index 7893f939dde..6a845c56a24 100644 --- a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/auth/OpenStackIdentityV2AuthenticatedRequestFactory.scala +++ b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/main/scala/org/openrepose/nodeservice/atomfeed/impl/auth/OpenStackIdentityV2AuthenticatedRequestFactory.scala @@ -21,7 +21,7 @@ package org.openrepose.nodeservice.atomfeed.impl.auth import java.util -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.inject.Inject import javax.servlet.http.HttpServletResponse._ import javax.ws.rs.core.{HttpHeaders, MediaType} diff --git a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/AtomEntryStreamBuilderTest.scala b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/AtomEntryStreamBuilderTest.scala index bb5719b2b21..8c3665ec90b 100644 --- a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/AtomEntryStreamBuilderTest.scala +++ b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/AtomEntryStreamBuilderTest.scala @@ -35,8 +35,8 @@ import org.mockito.{AdditionalAnswers, ArgumentCaptor} import org.openrepose.commons.utils.http.CommonHttpHeader import org.openrepose.nodeservice.atomfeed.impl.auth.AuthenticationRequestContextImpl import org.openrepose.nodeservice.atomfeed.{AuthenticatedRequestFactory, AuthenticationRequestContext, AuthenticationRequestException, FeedReadRequest} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSuite} import scala.concurrent.TimeoutException @@ -76,7 +76,7 @@ class AtomEntryStreamBuilderTest extends FunSuite with BeforeAndAfterEach with M mockAtomFeedService.requestHandler = { case HttpRequest(_, Uri.Path("/feed"), _, _, _) => - HttpResponse(entity = HttpEntity(MediaTypes.`application/atom+xml`, sw.toString)) + HttpResponse(entity = HttpEntity(ContentType.WithMissingCharset(MediaTypes.`application/atom+xml`), sw.toString.getBytes)) case HttpRequest(_, _, _, _, _) => HttpResponse(404, entity = "Not Found") @@ -216,10 +216,10 @@ class AtomEntryStreamBuilderTest extends FunSuite with BeforeAndAfterEach with M mockAtomFeedService.requestHandler = { case HttpRequest(_, Uri.Path("/feed"), _, _, _) => - HttpResponse(entity = HttpEntity(MediaTypes.`application/atom+xml`, swpo.toString)) + HttpResponse(entity = HttpEntity(ContentType.WithMissingCharset(MediaTypes.`application/atom+xml`), swpo.toString.getBytes)) case HttpRequest(_, Uri.Path("/feed2"), _, _, _) => - HttpResponse(entity = HttpEntity(MediaTypes.`application/atom+xml`, swpt.toString)) + HttpResponse(entity = HttpEntity(ContentType.WithMissingCharset(MediaTypes.`application/atom+xml`), swpt.toString.getBytes)) case HttpRequest(_, _, _, _, _) => HttpResponse(404, entity = "Not Found") @@ -279,7 +279,7 @@ class AtomEntryStreamBuilderTest extends FunSuite with BeforeAndAfterEach with M mockAtomFeedService.requestHandler = { case HttpRequest(_, Uri.Path("/feed"), _, _, _) => - HttpResponse(entity = HttpEntity(MediaTypes.`application/atom+xml`, swpo.toString)) + HttpResponse(entity = HttpEntity(ContentType.WithMissingCharset(MediaTypes.`application/atom+xml`), swpo.toString.getBytes)) case HttpRequest(_, Uri.Path("/feed2"), _, _, _) => HttpResponse(403) diff --git a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/AtomFeedServiceImplTest.scala b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/AtomFeedServiceImplTest.scala index 1fa589f4804..1e8a8a3bfb7 100644 --- a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/AtomFeedServiceImplTest.scala +++ b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/AtomFeedServiceImplTest.scala @@ -37,8 +37,8 @@ import org.openrepose.core.systemmodel.config._ import org.openrepose.docs.repose.atom_feed_service.v1.{AtomFeedServiceConfigType, OpenStackIdentityV2AuthenticationType} import org.openrepose.nodeservice.atomfeed.impl.actors.NotifierManager.RemoveNotifier import org.openrepose.nodeservice.atomfeed.AtomFeedListener -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpecLike, Matchers} import org.springframework.beans.factory.config.AutowireCapableBeanFactory import org.springframework.context.ApplicationContext diff --git a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/MockService.scala b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/MockService.scala index 3ba23dd61dc..8ec97719d6b 100644 --- a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/MockService.scala +++ b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/MockService.scala @@ -44,7 +44,7 @@ class MockService { // Defines a default handler, but can be changed var requestHandler: HttpRequest => HttpResponse = { case HttpRequest(GET, _, _, _, _) => - HttpResponse(entity = HttpEntity(MediaTypes.`text/html`, "Hello world!")) + HttpResponse(entity = HttpEntity(ContentType.WithMissingCharset(MediaTypes.`text/html`), "Hello world!".getBytes)) case _: HttpRequest => HttpResponse(404, entity = "Unknown resource!") diff --git a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/actors/FeedReaderTest.scala b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/actors/FeedReaderTest.scala index 236166da76b..dca47fe731b 100644 --- a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/actors/FeedReaderTest.scala +++ b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/actors/FeedReaderTest.scala @@ -43,8 +43,8 @@ import org.openrepose.nodeservice.atomfeed.impl.actors.FeedReader.{CancelSchedul import org.openrepose.nodeservice.atomfeed.impl.actors.Notifier._ import org.openrepose.nodeservice.atomfeed.impl.actors.NotifierManager.{BindFeedReader, Notify} import org.openrepose.nodeservice.atomfeed.{AuthenticatedRequestFactory, AuthenticationRequestContext, FeedReadRequest} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSuiteLike} import org.slf4j.MDC @@ -104,7 +104,7 @@ class FeedReaderTest(_system: ActorSystem) mockAtomFeedService.requestHandler = { case HttpRequest(_, Uri.Path("/feed"), _, _, _) => - HttpResponse(entity = HttpEntity(MediaTypes.`application/atom+xml`, sw.toString)) + HttpResponse(entity = HttpEntity(ContentType.WithMissingCharset(MediaTypes.`application/atom+xml`), sw.toString.getBytes)) case HttpRequest(_, _, _, _, _) => HttpResponse(404, entity = "Not Found") @@ -255,7 +255,7 @@ class FeedReaderTest(_system: ActorSystem) mockAtomFeedService.requestHandler = { case HttpRequest(_, Uri.Path("/feed"), _, _, _) => - HttpResponse(entity = HttpEntity(MediaTypes.`application/atom+xml`, sw.toString)) + HttpResponse(entity = HttpEntity(ContentType.WithMissingCharset(MediaTypes.`application/atom+xml`), sw.toString.getBytes)) case HttpRequest(_, _, _, _, _) => HttpResponse(404, entity = "Not Found") @@ -295,7 +295,7 @@ class FeedReaderTest(_system: ActorSystem) mockAtomFeedService.requestHandler = { case HttpRequest(_, Uri.Path("/feed"), _, _, _) => - HttpResponse(entity = HttpEntity(MediaTypes.`application/atom+xml`, sw.toString)) + HttpResponse(entity = HttpEntity(ContentType.WithMissingCharset(MediaTypes.`application/atom+xml`), sw.toString.getBytes)) case HttpRequest(_, _, _, _, _) => HttpResponse(404, entity = "Not Found") @@ -343,7 +343,7 @@ class FeedReaderTest(_system: ActorSystem) mockAtomFeedService.requestHandler = { case HttpRequest(_, Uri.Path("/feed"), _, _, _) => - HttpResponse(entity = HttpEntity(MediaTypes.`application/atom+xml`, sw.toString)) + HttpResponse(entity = HttpEntity(ContentType.WithMissingCharset(MediaTypes.`application/atom+xml`), sw.toString.getBytes)) case HttpRequest(_, _, _, _, _) => HttpResponse(404, entity = "Not Found") @@ -406,7 +406,7 @@ class FeedReaderTest(_system: ActorSystem) mockAtomFeedService.requestHandler = { case HttpRequest(_, Uri.Path("/feed"), _, _, _) => - HttpResponse(entity = HttpEntity(MediaTypes.`application/atom+xml`, sw.toString)) + HttpResponse(entity = HttpEntity(ContentType.WithMissingCharset(MediaTypes.`application/atom+xml`), sw.toString.getBytes)) case HttpRequest(_, _, _, _, _) => HttpResponse(404, entity = "Not Found") diff --git a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/actors/NotifierManagerTest.scala b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/actors/NotifierManagerTest.scala index ceb57c1e8d3..29e38b7a222 100644 --- a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/actors/NotifierManagerTest.scala +++ b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/actors/NotifierManagerTest.scala @@ -32,8 +32,8 @@ import org.openrepose.nodeservice.atomfeed.impl.actors.Notifier.{FeedReaderActiv import org.openrepose.nodeservice.atomfeed.impl.actors.NotifierManager._ import org.openrepose.nodeservice.atomfeed.{AtomFeedListener, LifecycleEvents} import org.scalatest.concurrent.Eventually -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSuiteLike, Matchers} import scala.collection.JavaConversions._ diff --git a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/actors/NotifierTest.scala b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/actors/NotifierTest.scala index c417141dd09..69ec6399dd9 100644 --- a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/actors/NotifierTest.scala +++ b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/actors/NotifierTest.scala @@ -25,8 +25,8 @@ import org.junit.runner.RunWith import org.mockito.Mockito.{reset, verify} import org.openrepose.nodeservice.atomfeed.impl.actors.Notifier._ import org.openrepose.nodeservice.atomfeed.{AtomFeedListener, LifecycleEvents} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSuiteLike} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/auth/OpenStackIdentityV2AuthenticatedRequestFactoryTest.scala b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/auth/OpenStackIdentityV2AuthenticatedRequestFactoryTest.scala index da27b45033c..878c6621308 100644 --- a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/auth/OpenStackIdentityV2AuthenticatedRequestFactoryTest.scala +++ b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/auth/OpenStackIdentityV2AuthenticatedRequestFactoryTest.scala @@ -36,8 +36,8 @@ import org.openrepose.commons.utils.http.CommonHttpHeader import org.openrepose.core.services.httpclient.{HttpClientService, HttpClientServiceClient} import org.openrepose.docs.repose.atom_feed_service.v1.{AtomFeedConfigType, OpenStackIdentityV2AuthenticationType} import org.openrepose.nodeservice.atomfeed.{AuthenticationRequestException, FeedReadRequest} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/config/AtomFeedSchemaTest.scala b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/config/AtomFeedSchemaTest.scala index 0e88f4c42e1..f823825f262 100644 --- a/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/config/AtomFeedSchemaTest.scala +++ b/repose-aggregator/components/services/atom-feed-service/atom-feed-service-impl/src/test/scala/org/openrepose/nodeservice/atomfeed/impl/config/AtomFeedSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest import org.openrepose.docs.repose.atom_feed_service.v1.ObjectFactory -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class AtomFeedSchemaTest extends ConfigurationTest { diff --git a/repose-aggregator/components/services/container-configuration-service/impl/build.gradle b/repose-aggregator/components/services/container-configuration-service/impl/build.gradle index c894910e699..4f11303d8a4 100644 --- a/repose-aggregator/components/services/container-configuration-service/impl/build.gradle +++ b/repose-aggregator/components/services/container-configuration-service/impl/build.gradle @@ -5,7 +5,7 @@ dependencies { compile "org.scala-lang:scala-library" compile "org.springframework:spring-beans" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly "javax.inject:javax.inject" diff --git a/repose-aggregator/components/services/container-configuration-service/impl/src/main/scala/org/openrepose/nodeservice/containerconfiguration/ContainerConfigurationServiceImpl.scala b/repose-aggregator/components/services/container-configuration-service/impl/src/main/scala/org/openrepose/nodeservice/containerconfiguration/ContainerConfigurationServiceImpl.scala index 98e1134a17f..69aa7360141 100644 --- a/repose-aggregator/components/services/container-configuration-service/impl/src/main/scala/org/openrepose/nodeservice/containerconfiguration/ContainerConfigurationServiceImpl.scala +++ b/repose-aggregator/components/services/container-configuration-service/impl/src/main/scala/org/openrepose/nodeservice/containerconfiguration/ContainerConfigurationServiceImpl.scala @@ -22,7 +22,7 @@ package org.openrepose.nodeservice.containerconfiguration import java.lang.Long import java.util.Optional -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.annotation.{PostConstruct, PreDestroy} import javax.inject.{Inject, Named} import org.openrepose.commons.config.manager.UpdateListener diff --git a/repose-aggregator/components/services/container-configuration-service/impl/src/test/scala/org/openrepose/nodeservice/containerconfiguration/ContainerConfigurationServiceImplTest.scala b/repose-aggregator/components/services/container-configuration-service/impl/src/test/scala/org/openrepose/nodeservice/containerconfiguration/ContainerConfigurationServiceImplTest.scala index 0c9259df964..92652b40681 100644 --- a/repose-aggregator/components/services/container-configuration-service/impl/src/test/scala/org/openrepose/nodeservice/containerconfiguration/ContainerConfigurationServiceImplTest.scala +++ b/repose-aggregator/components/services/container-configuration-service/impl/src/test/scala/org/openrepose/nodeservice/containerconfiguration/ContainerConfigurationServiceImplTest.scala @@ -27,8 +27,8 @@ import org.mockito.{Matchers => MockitoMatchers} import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.core.container.config._ import org.openrepose.core.services.config.ConfigurationService -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/datastore-service/datastore-service-api/src/test/scala/org/openrepose/core/services/datastore/types/PatchableSetTest.scala b/repose-aggregator/components/services/datastore-service/datastore-service-api/src/test/scala/org/openrepose/core/services/datastore/types/PatchableSetTest.scala index d900c41cde0..e186232a839 100644 --- a/repose-aggregator/components/services/datastore-service/datastore-service-api/src/test/scala/org/openrepose/core/services/datastore/types/PatchableSetTest.scala +++ b/repose-aggregator/components/services/datastore-service/datastore-service-api/src/test/scala/org/openrepose/core/services/datastore/types/PatchableSetTest.scala @@ -20,7 +20,7 @@ package org.openrepose.core.services.datastore.types import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} /** diff --git a/repose-aggregator/components/services/datastore-service/datastore-service-impl/src/test/scala/org/openrepose/core/services/datastore/distributed/config/DistDatastoreSchemaTest.scala b/repose-aggregator/components/services/datastore-service/datastore-service-impl/src/test/scala/org/openrepose/core/services/datastore/distributed/config/DistDatastoreSchemaTest.scala index 04db34de7b2..74a828da608 100644 --- a/repose-aggregator/components/services/datastore-service/datastore-service-impl/src/test/scala/org/openrepose/core/services/datastore/distributed/config/DistDatastoreSchemaTest.scala +++ b/repose-aggregator/components/services/datastore-service/datastore-service-impl/src/test/scala/org/openrepose/core/services/datastore/distributed/config/DistDatastoreSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/datastore-service/datastore-service-impl/src/test/scala/org/openrepose/core/services/datastore/remote/config/RemoteDatastoreSchemaTest.scala b/repose-aggregator/components/services/datastore-service/datastore-service-impl/src/test/scala/org/openrepose/core/services/datastore/remote/config/RemoteDatastoreSchemaTest.scala index e7aa51c9ae5..9c6929f3b0b 100644 --- a/repose-aggregator/components/services/datastore-service/datastore-service-impl/src/test/scala/org/openrepose/core/services/datastore/remote/config/RemoteDatastoreSchemaTest.scala +++ b/repose-aggregator/components/services/datastore-service/datastore-service-impl/src/test/scala/org/openrepose/core/services/datastore/remote/config/RemoteDatastoreSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class RemoteDatastoreSchemaTest extends ConfigurationTest { diff --git a/repose-aggregator/components/services/datastore-service/datastore-service-impl/src/test/scala/org/openrepose/nodeservice/distributed/servlet/DistributedDatastoreServletTest.scala b/repose-aggregator/components/services/datastore-service/datastore-service-impl/src/test/scala/org/openrepose/nodeservice/distributed/servlet/DistributedDatastoreServletTest.scala index bb2f296f3d5..c3d61b26450 100644 --- a/repose-aggregator/components/services/datastore-service/datastore-service-impl/src/test/scala/org/openrepose/nodeservice/distributed/servlet/DistributedDatastoreServletTest.scala +++ b/repose-aggregator/components/services/datastore-service/datastore-service-impl/src/test/scala/org/openrepose/nodeservice/distributed/servlet/DistributedDatastoreServletTest.scala @@ -37,8 +37,8 @@ import org.openrepose.core.services.datastore.distributed.config._ import org.openrepose.core.services.datastore.impl.distributed.CacheRequest.CACHE_URI_PATH import org.openrepose.core.services.datastore.{Datastore, DatastoreAccessControl, DatastoreService} import org.openrepose.core.services.uriredaction.UriRedactionService -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/CachingHttpClientContextTest.scala b/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/CachingHttpClientContextTest.scala index db5bd526e04..e1a5cf19a30 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/CachingHttpClientContextTest.scala +++ b/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/CachingHttpClientContextTest.scala @@ -21,7 +21,7 @@ package org.openrepose.core.services.httpclient import org.apache.http.protocol.BasicHttpContext import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/HttpClientServiceClientTest.scala b/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/HttpClientServiceClientTest.scala index 3b55798d6b7..c77f74344fc 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/HttpClientServiceClientTest.scala +++ b/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/HttpClientServiceClientTest.scala @@ -30,8 +30,8 @@ import org.apache.http.{HttpHost, HttpRequest, HttpResponse} import org.junit.runner.RunWith import org.mockito.Matchers.{any, eq => isEq} import org.mockito.Mockito.{verify, when} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/InternalHttpClientTest.scala b/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/InternalHttpClientTest.scala index cfd72d738fb..8f2b4c8af3c 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/InternalHttpClientTest.scala +++ b/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/InternalHttpClientTest.scala @@ -21,8 +21,8 @@ package org.openrepose.core.services.httpclient import org.apache.http.impl.client.CloseableHttpClient import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/config/HttpConnectionPoolSchemaTest.scala b/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/config/HttpConnectionPoolSchemaTest.scala index 34e5253a90a..f46f4d34f98 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/config/HttpConnectionPoolSchemaTest.scala +++ b/repose-aggregator/components/services/http-client-service/http-client-service-api/src/test/scala/org/openrepose/core/services/httpclient/config/HttpConnectionPoolSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-impl/build.gradle b/repose-aggregator/components/services/http-client-service/http-client-service-impl/build.gradle index 452a27de85c..96bf847b69a 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-impl/build.gradle +++ b/repose-aggregator/components/services/http-client-service/http-client-service-impl/build.gradle @@ -4,7 +4,7 @@ dependencies { compile project(":repose-aggregator:components:services:http-client-service:http-client-service-api") compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "org.slf4j:slf4j-api" compile "org.slf4j:jcl-over-slf4j" compile "org.springframework:spring-beans" diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/CachingHttpClient.scala b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/CachingHttpClient.scala index 429a2758faf..e91f52ac203 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/CachingHttpClient.scala +++ b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/CachingHttpClient.scala @@ -22,7 +22,7 @@ package org.openrepose.core.services.httpclient import java.util.concurrent.Callable import com.google.common.cache.{Cache, CacheBuilder} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import io.opentracing.Scope import io.opentracing.noop.NoopScopeManager.NoopScope import io.opentracing.util.GlobalTracer diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/HttpClientDecommissioner.scala b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/HttpClientDecommissioner.scala index 29de857cbe1..f4cde794568 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/HttpClientDecommissioner.scala +++ b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/HttpClientDecommissioner.scala @@ -19,7 +19,7 @@ */ package org.openrepose.core.services.httpclient -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.annotation.PreDestroy import javax.inject.Named import org.apache.http.impl.client.CloseableHttpClient diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/HttpClientProvider.scala b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/HttpClientProvider.scala index 6f58bec1c4f..d8467da2607 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/HttpClientProvider.scala +++ b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/HttpClientProvider.scala @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit import com.codahale.metrics.MetricRegistry import com.codahale.metrics.httpclient._ -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import io.opentracing.Tracer import javax.inject.{Inject, Named} import javax.net.ssl.SSLContext diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/HttpClientServiceImpl.scala b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/HttpClientServiceImpl.scala index b0e33d7bc12..4399b0bc948 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/HttpClientServiceImpl.scala +++ b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/main/scala/org/openrepose/core/services/httpclient/HttpClientServiceImpl.scala @@ -19,7 +19,7 @@ */ package org.openrepose.core.services.httpclient -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.annotation.{PostConstruct, PreDestroy} import javax.inject.{Inject, Named} import org.openrepose.commons.config.manager.UpdateListener diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/CachingHttpClientTest.scala b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/CachingHttpClientTest.scala index c4d795f3c68..a7af2009346 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/CachingHttpClientTest.scala +++ b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/CachingHttpClientTest.scala @@ -40,8 +40,8 @@ import org.mockito.invocation.InvocationOnMock import org.mockito.stubbing.Answer import org.openrepose.core.services.httpclient import org.openrepose.core.services.httpclient.CachingHttpClientTest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.slf4j.MDC diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/ConnectionKeepAliveWithTimeoutStrategyTest.scala b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/ConnectionKeepAliveWithTimeoutStrategyTest.scala index f40085cfa97..915d8f3bfc7 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/ConnectionKeepAliveWithTimeoutStrategyTest.scala +++ b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/ConnectionKeepAliveWithTimeoutStrategyTest.scala @@ -24,7 +24,7 @@ import org.apache.http.protocol.HTTP.CONN_KEEP_ALIVE import org.apache.http.{HttpStatus, HttpVersion} import org.junit.runner.RunWith import org.openrepose.core.services.httpclient -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} import scala.concurrent.duration._ diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/HttpClientDecommissionerTest.scala b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/HttpClientDecommissionerTest.scala index 866714ce14e..58ed70c6c22 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/HttpClientDecommissionerTest.scala +++ b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/HttpClientDecommissionerTest.scala @@ -22,8 +22,8 @@ package org.openrepose.core.services.httpclient import org.apache.http.impl.client.CloseableHttpClient import org.junit.runner.RunWith import org.mockito.Mockito.{never, verify} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/HttpClientProviderTest.scala b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/HttpClientProviderTest.scala index b4f27961795..84f1d583490 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/HttpClientProviderTest.scala +++ b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/HttpClientProviderTest.scala @@ -44,8 +44,8 @@ import org.openrepose.commons.utils.opentracing.httpclient.{ReposeTracingRequest import org.openrepose.core.services.httpclient.config.{Header, HeaderList, PoolConfig} import org.openrepose.core.services.reporting.metrics.MetricsService import org.openrepose.core.services.uriredaction.UriRedactionService -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import scala.collection.JavaConverters._ diff --git a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/HttpClientServiceImplTest.scala b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/HttpClientServiceImplTest.scala index 544739ec741..d1da3333f2d 100644 --- a/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/HttpClientServiceImplTest.scala +++ b/repose-aggregator/components/services/http-client-service/http-client-service-impl/src/test/scala/org/openrepose/core/services/httpclient/HttpClientServiceImplTest.scala @@ -35,8 +35,8 @@ import org.openrepose.core.services.config.ConfigurationService import org.openrepose.core.services.healthcheck.{HealthCheckService, HealthCheckServiceProxy, Severity} import org.openrepose.core.services.httpclient import org.openrepose.core.services.httpclient.config.{HttpConnectionPoolsConfig, PoolConfig} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/build.gradle b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/build.gradle index 03bfa4d32ac..204a303ea76 100644 --- a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/build.gradle +++ b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/build.gradle @@ -4,7 +4,7 @@ dependencies { compile "com.fasterxml.jackson.core:jackson-core" compile "com.google.guava:guava" // Forces the version used by jtwig-core compile "com.typesafe.play:play-json_$scalaMajDotMin" - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "org.jtwig:jtwig-core" compile "org.scala-lang:scala-library" diff --git a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/main/scala/org/openrepose/core/services/httplogging/HttpLoggingConfigListener.scala b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/main/scala/org/openrepose/core/services/httplogging/HttpLoggingConfigListener.scala index 31aa967f86b..30186f38363 100644 --- a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/main/scala/org/openrepose/core/services/httplogging/HttpLoggingConfigListener.scala +++ b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/main/scala/org/openrepose/core/services/httplogging/HttpLoggingConfigListener.scala @@ -20,7 +20,7 @@ package org.openrepose.core.services.httplogging import com.fasterxml.jackson.core.JsonProcessingException -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.inject.Named import org.jtwig.environment.{EnvironmentConfiguration, EnvironmentConfigurationBuilder} import org.jtwig.exceptions.JtwigException diff --git a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/main/scala/org/openrepose/core/services/httplogging/HttpLoggingServiceImpl.scala b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/main/scala/org/openrepose/core/services/httplogging/HttpLoggingServiceImpl.scala index 07d982f04ba..16151c223c8 100644 --- a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/main/scala/org/openrepose/core/services/httplogging/HttpLoggingServiceImpl.scala +++ b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/main/scala/org/openrepose/core/services/httplogging/HttpLoggingServiceImpl.scala @@ -19,7 +19,7 @@ */ package org.openrepose.core.services.httplogging -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.annotation.{PostConstruct, PreDestroy} import javax.inject.{Inject, Named} import org.jtwig.JtwigModel diff --git a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/HttpLoggingConfigListenerTest.scala b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/HttpLoggingConfigListenerTest.scala index cfc56d1f869..aa330776be0 100644 --- a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/HttpLoggingConfigListenerTest.scala +++ b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/HttpLoggingConfigListenerTest.scala @@ -22,7 +22,7 @@ package org.openrepose.core.services.httplogging import org.junit.runner.RunWith import org.openrepose.core.services.httplogging.HttpLoggingConfigListenerTest._ import org.openrepose.core.services.httplogging.config.{Format, HttpLoggingConfig, Message} -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import scala.collection.JavaConverters._ diff --git a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/HttpLoggingContextMapTest.scala b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/HttpLoggingContextMapTest.scala index 149dde8e4f7..af1630e8f28 100644 --- a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/HttpLoggingContextMapTest.scala +++ b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/HttpLoggingContextMapTest.scala @@ -25,7 +25,7 @@ import java.util import org.junit.runner.RunWith import org.openrepose.commons.utils.http.CommonHttpHeader import org.openrepose.commons.utils.logging.TracingHeaderHelper -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/HttpLoggingServiceImplTest.scala b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/HttpLoggingServiceImplTest.scala index 9c030bbb40c..9b30f9fcc4e 100644 --- a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/HttpLoggingServiceImplTest.scala +++ b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/HttpLoggingServiceImplTest.scala @@ -29,8 +29,8 @@ import org.mockito.Mockito.{verify, when} import org.openrepose.core.services.config.ConfigurationService import org.openrepose.core.services.httplogging.HttpLoggingServiceImplTest._ import org.openrepose.core.services.httplogging.config.HttpLoggingConfig -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.slf4j.Logger import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/jtwig/HttpLoggingEnvironmentConfigurationTest.scala b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/jtwig/HttpLoggingEnvironmentConfigurationTest.scala index c4e25750b80..3b38f7ddac9 100644 --- a/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/jtwig/HttpLoggingEnvironmentConfigurationTest.scala +++ b/repose-aggregator/components/services/http-logging-service/http-logging-service-impl/src/test/scala/org/openrepose/core/services/httplogging/jtwig/HttpLoggingEnvironmentConfigurationTest.scala @@ -21,7 +21,7 @@ package org.openrepose.core.services.httplogging.jtwig import org.junit.runner.RunWith import org.openrepose.core.services.httplogging.config.Format -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/open-tracing-service/src/main/scala/org/openrepose/core/services/opentracing/OpenTracingServiceImpl.scala b/repose-aggregator/components/services/open-tracing-service/src/main/scala/org/openrepose/core/services/opentracing/OpenTracingServiceImpl.scala index 49bfaff302b..b16c5efe2be 100644 --- a/repose-aggregator/components/services/open-tracing-service/src/main/scala/org/openrepose/core/services/opentracing/OpenTracingServiceImpl.scala +++ b/repose-aggregator/components/services/open-tracing-service/src/main/scala/org/openrepose/core/services/opentracing/OpenTracingServiceImpl.scala @@ -22,7 +22,7 @@ package org.openrepose.core.services.opentracing import javax.annotation.{PostConstruct, PreDestroy} import javax.inject.{Inject, Named} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import io.jaegertracing.Configuration import io.jaegertracing.Configuration.{SamplerConfiguration, SenderConfiguration} import io.jaegertracing.samplers.{ConstSampler, ProbabilisticSampler, RateLimitingSampler} diff --git a/repose-aggregator/components/services/open-tracing-service/src/test/scala/org/openrepose/core/services/opentracing/OpenTracingServiceImplTest.scala b/repose-aggregator/components/services/open-tracing-service/src/test/scala/org/openrepose/core/services/opentracing/OpenTracingServiceImplTest.scala index 17fb1173b36..81720bd8b24 100644 --- a/repose-aggregator/components/services/open-tracing-service/src/test/scala/org/openrepose/core/services/opentracing/OpenTracingServiceImplTest.scala +++ b/repose-aggregator/components/services/open-tracing-service/src/test/scala/org/openrepose/core/services/opentracing/OpenTracingServiceImplTest.scala @@ -32,8 +32,8 @@ import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.core.opentracing.DelegatingTracer import org.openrepose.core.service.opentracing.config.{JaegerConnectionUdp, JaegerSamplingProbabilistic, _} import org.openrepose.core.services.config.ConfigurationService -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/open-tracing-service/src/test/scala/org/openrepose/core/services/opentracing/config/OpenTracingSchemaTest.scala b/repose-aggregator/components/services/open-tracing-service/src/test/scala/org/openrepose/core/services/opentracing/config/OpenTracingSchemaTest.scala index 43bebd1ee9d..87d7cb54be3 100644 --- a/repose-aggregator/components/services/open-tracing-service/src/test/scala/org/openrepose/core/services/opentracing/config/OpenTracingSchemaTest.scala +++ b/repose-aggregator/components/services/open-tracing-service/src/test/scala/org/openrepose/core/services/opentracing/config/OpenTracingSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest import org.openrepose.core.service.opentracing.config.ObjectFactory -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import scala.xml.SAXParseException diff --git a/repose-aggregator/components/services/phone-home-service/build.gradle b/repose-aggregator/components/services/phone-home-service/build.gradle index 58917b49816..7efec3ec8b7 100644 --- a/repose-aggregator/components/services/phone-home-service/build.gradle +++ b/repose-aggregator/components/services/phone-home-service/build.gradle @@ -4,7 +4,7 @@ dependencies { compile project(':repose-aggregator:components:services:http-client-service:http-client-service-api') compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compile "org.springframework:spring-beans" compile "com.typesafe.play:play-json_$scalaMajDotMin" compile "io.opentracing:opentracing-api" diff --git a/repose-aggregator/components/services/phone-home-service/src/main/scala/org/openrepose/core/services/phonehome/PhoneHomeService.scala b/repose-aggregator/components/services/phone-home-service/src/main/scala/org/openrepose/core/services/phonehome/PhoneHomeService.scala index 4139a17d427..5ddc0123ae3 100644 --- a/repose-aggregator/components/services/phone-home-service/src/main/scala/org/openrepose/core/services/phonehome/PhoneHomeService.scala +++ b/repose-aggregator/components/services/phone-home-service/src/main/scala/org/openrepose/core/services/phonehome/PhoneHomeService.scala @@ -22,7 +22,7 @@ package org.openrepose.core.services.phonehome import java.text.SimpleDateFormat import java.util.{Date, TimeZone, UUID} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import io.opentracing.tag.Tags import io.opentracing.{Scope, Tracer} import javax.annotation.PostConstruct diff --git a/repose-aggregator/components/services/phone-home-service/src/test/scala/org/openrepose/core/services/phonehome/PhoneHomeServiceTest.scala b/repose-aggregator/components/services/phone-home-service/src/test/scala/org/openrepose/core/services/phonehome/PhoneHomeServiceTest.scala index ed777f2d1c9..d979b34d4e7 100644 --- a/repose-aggregator/components/services/phone-home-service/src/test/scala/org/openrepose/core/services/phonehome/PhoneHomeServiceTest.scala +++ b/repose-aggregator/components/services/phone-home-service/src/test/scala/org/openrepose/core/services/phonehome/PhoneHomeServiceTest.scala @@ -38,8 +38,8 @@ import org.openrepose.commons.utils.http.CommonHttpHeader import org.openrepose.core.services.config.ConfigurationService import org.openrepose.core.services.httpclient.{HttpClientService, HttpClientServiceClient} import org.openrepose.core.systemmodel.config._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import play.api.libs.json.{JsNull, Json} diff --git a/repose-aggregator/components/services/rate-limiting-service/src/test/scala/org/openrepose/core/services/ratelimit/config/RateLimitingSchemaTest.scala b/repose-aggregator/components/services/rate-limiting-service/src/test/scala/org/openrepose/core/services/ratelimit/config/RateLimitingSchemaTest.scala index 7582c4416aa..35f33755967 100644 --- a/repose-aggregator/components/services/rate-limiting-service/src/test/scala/org/openrepose/core/services/ratelimit/config/RateLimitingSchemaTest.scala +++ b/repose-aggregator/components/services/rate-limiting-service/src/test/scala/org/openrepose/core/services/ratelimit/config/RateLimitingSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/build.gradle b/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/build.gradle index 40977206d3e..4ca544e4297 100644 --- a/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/build.gradle +++ b/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/build.gradle @@ -4,7 +4,7 @@ dependencies { compile project(':repose-aggregator:components:services:uri-redaction-service:uri-redaction-service-api') compile 'org.scala-lang:scala-library' compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly 'javax.inject:javax.inject' diff --git a/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/src/main/scala/org/openrepose/core/services/uriredaction/UriRedactionServiceImpl.scala b/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/src/main/scala/org/openrepose/core/services/uriredaction/UriRedactionServiceImpl.scala index 1c597761526..fb3fb88bf22 100644 --- a/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/src/main/scala/org/openrepose/core/services/uriredaction/UriRedactionServiceImpl.scala +++ b/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/src/main/scala/org/openrepose/core/services/uriredaction/UriRedactionServiceImpl.scala @@ -19,7 +19,7 @@ */ package org.openrepose.core.services.uriredaction -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.annotation.{PostConstruct, PreDestroy} import javax.inject.{Inject, Named} import org.openrepose.commons.config.manager.UpdateListener diff --git a/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/src/test/scala/org/openrepose/core/services/uriredaction/UriRedactionServiceImplTest.scala b/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/src/test/scala/org/openrepose/core/services/uriredaction/UriRedactionServiceImplTest.scala index df672389988..bd898ca541f 100644 --- a/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/src/test/scala/org/openrepose/core/services/uriredaction/UriRedactionServiceImplTest.scala +++ b/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/src/test/scala/org/openrepose/core/services/uriredaction/UriRedactionServiceImplTest.scala @@ -29,8 +29,8 @@ import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.core.services.config.ConfigurationService import org.openrepose.core.services.uriredaction.UriRedactionServiceImpl._ import org.openrepose.core.services.uriredaction.config.UriRedactionConfig -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import scala.collection.JavaConverters._ diff --git a/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/src/test/scala/org/openrepose/core/services/uriredaction/config/UriRedactionSchemaTest.scala b/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/src/test/scala/org/openrepose/core/services/uriredaction/config/UriRedactionSchemaTest.scala index f587adabb58..b8fa110cdf0 100644 --- a/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/src/test/scala/org/openrepose/core/services/uriredaction/config/UriRedactionSchemaTest.scala +++ b/repose-aggregator/components/services/uri-redaction-service/uri-redaction-service-impl/src/test/scala/org/openrepose/core/services/uriredaction/config/UriRedactionSchemaTest.scala @@ -23,7 +23,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner @RunWith(classOf[JUnitRunner]) class UriRedactionSchemaTest extends ConfigurationTest { diff --git a/repose-aggregator/core/repose-core-api/build.gradle b/repose-aggregator/core/repose-core-api/build.gradle index 2036cda8cc9..bf8e0d7f58e 100644 --- a/repose-aggregator/core/repose-core-api/build.gradle +++ b/repose-aggregator/core/repose-core-api/build.gradle @@ -5,7 +5,7 @@ dependencies { compile "io.dropwizard.metrics:metrics-core" compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly 'org.projectlombok:lombok' compileOnly "org.glassfish:javax.servlet" diff --git a/repose-aggregator/core/repose-core-api/src/main/scala/org/openrepose/core/filter/AbstractConfiguredFilter.scala b/repose-aggregator/core/repose-core-api/src/main/scala/org/openrepose/core/filter/AbstractConfiguredFilter.scala index e804e7bb36d..3ba70202909 100644 --- a/repose-aggregator/core/repose-core-api/src/main/scala/org/openrepose/core/filter/AbstractConfiguredFilter.scala +++ b/repose-aggregator/core/repose-core-api/src/main/scala/org/openrepose/core/filter/AbstractConfiguredFilter.scala @@ -23,7 +23,7 @@ import java.net.URL import javax.servlet._ import javax.servlet.http.{HttpServletRequest, HttpServletResponse} -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.servlet.http.HttpServletResponse.SC_SERVICE_UNAVAILABLE import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.core.services.config.ConfigurationService diff --git a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/container/config/ContainerSchemaTest.scala b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/container/config/ContainerSchemaTest.scala index c84a951a18b..66784f60b6f 100644 --- a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/container/config/ContainerSchemaTest.scala +++ b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/container/config/ContainerSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/filter/AbstractConfiguredFilterTest.scala b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/filter/AbstractConfiguredFilterTest.scala index fae9c440f7c..f1d65781358 100644 --- a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/filter/AbstractConfiguredFilterTest.scala +++ b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/filter/AbstractConfiguredFilterTest.scala @@ -30,8 +30,8 @@ import org.mockito.Matchers.{any, anyString, argThat, same, eq => eql} import org.mockito.Mockito.{verify, when} import org.openrepose.commons.config.manager.UpdateListener import org.openrepose.core.services.config.ConfigurationService -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfter, FunSpec, Matchers} import org.springframework.mock.web.MockHttpServletResponse diff --git a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/AndTest.scala b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/AndTest.scala index 75802952406..dbd3d943a90 100644 --- a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/AndTest.scala +++ b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/AndTest.scala @@ -23,8 +23,8 @@ package org.openrepose.core.systemmodel.config import javax.servlet.ServletInputStream import org.junit.runner.RunWith import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} import org.springframework.mock.web.MockHttpServletRequest diff --git a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/HeaderTest.scala b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/HeaderTest.scala index 32c84f08d59..620f5708f45 100644 --- a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/HeaderTest.scala +++ b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/HeaderTest.scala @@ -24,8 +24,8 @@ import javax.servlet.ServletInputStream import org.junit.runner.RunWith import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.scalatest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.springframework.mock.web.MockHttpServletRequest @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/MethodsTest.scala b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/MethodsTest.scala index 253bea221ac..6acf253dcc4 100644 --- a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/MethodsTest.scala +++ b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/MethodsTest.scala @@ -24,8 +24,8 @@ import javax.servlet.ServletInputStream import org.junit.runner.RunWith import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.scalatest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.springframework.mock.web.MockHttpServletRequest @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/NotTest.scala b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/NotTest.scala index dc49c002482..1375b859f93 100644 --- a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/NotTest.scala +++ b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/NotTest.scala @@ -26,8 +26,8 @@ import org.mockito.Matchers.any import org.mockito.Mockito.when import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.scalatest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.springframework.mock.web.MockHttpServletRequest @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/OrTest.scala b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/OrTest.scala index 76f065da8cb..b491d62f167 100644 --- a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/OrTest.scala +++ b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/OrTest.scala @@ -23,8 +23,8 @@ package org.openrepose.core.systemmodel.config import javax.servlet.ServletInputStream import org.junit.runner.RunWith import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} import org.springframework.mock.web.MockHttpServletRequest diff --git a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/SystemModelSchemaTest.scala b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/SystemModelSchemaTest.scala index 2341b427fa4..958564bbeec 100644 --- a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/SystemModelSchemaTest.scala +++ b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/SystemModelSchemaTest.scala @@ -24,7 +24,7 @@ import java.net.URL import org.junit.runner.RunWith import org.openrepose.commons.test.ConfigurationTest -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.xml.sax.SAXParseException @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/UriTest.scala b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/UriTest.scala index 97056f1ca43..c3cb9ee9b71 100644 --- a/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/UriTest.scala +++ b/repose-aggregator/core/repose-core-api/src/test/scala/org/openrepose/core/systemmodel/config/UriTest.scala @@ -24,8 +24,8 @@ import javax.servlet.ServletInputStream import org.junit.runner.RunWith import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.scalatest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.springframework.mock.web.MockHttpServletRequest @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/core/opentracing/ReposeTracer.scala b/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/core/opentracing/ReposeTracer.scala index df3395f5e98..10a2b72a9ce 100644 --- a/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/core/opentracing/ReposeTracer.scala +++ b/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/core/opentracing/ReposeTracer.scala @@ -19,7 +19,7 @@ */ package org.openrepose.core.opentracing -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import io.opentracing.noop.{NoopTracer, NoopTracerFactory} import io.opentracing.propagation.Format import io.opentracing.util.GlobalTracer diff --git a/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeFilter.scala b/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeFilter.scala index c5c704fc42a..41c7242bdb8 100644 --- a/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeFilter.scala +++ b/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeFilter.scala @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit import java.util.{Optional, UUID} import com.codahale.metrics.MetricRegistry -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import io.opentracing.Tracer import io.opentracing.tag.Tags import javax.inject.{Inject, Named} diff --git a/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeFilterChain.scala b/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeFilterChain.scala index 03877b2b938..4a724c17d22 100644 --- a/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeFilterChain.scala +++ b/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeFilterChain.scala @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit import com.codahale.metrics.MetricRegistry import com.fasterxml.jackson.annotation.{JsonAutoDetect, PropertyAccessor} import com.fasterxml.jackson.databind.ObjectMapper -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import io.opentracing.Tracer import javax.servlet.http.HttpServletResponse.SC_INTERNAL_SERVER_ERROR import javax.servlet.http.{HttpServletRequest, HttpServletResponse} diff --git a/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeFilterLoader.scala b/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeFilterLoader.scala index d2d43c9f584..61a7bf213a7 100644 --- a/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeFilterLoader.scala +++ b/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeFilterLoader.scala @@ -23,7 +23,7 @@ import java.util import java.util.UUID import com.oracle.javaee6.FilterType -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.annotation.{PostConstruct, PreDestroy} import javax.inject.{Inject, Named} import javax.servlet.{Filter, ServletContext, ServletException} diff --git a/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeRoutingServlet.scala b/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeRoutingServlet.scala index a9417e54ef3..aa01cfe9184 100644 --- a/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeRoutingServlet.scala +++ b/repose-aggregator/core/repose-core/src/main/scala/org/openrepose/powerfilter/ReposeRoutingServlet.scala @@ -25,7 +25,7 @@ import java.util.Optional import java.util.concurrent.TimeUnit import com.codahale.metrics.MetricRegistry -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import javax.inject.{Inject, Named} import javax.servlet.http.HttpServletResponse._ import javax.servlet.http.{HttpServlet, HttpServletRequest, HttpServletResponse} diff --git a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/commons/utils/classloader/EarClassProviderTest.scala b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/commons/utils/classloader/EarClassProviderTest.scala index 6f4bd8c25d8..9b01a772797 100644 --- a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/commons/utils/classloader/EarClassProviderTest.scala +++ b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/commons/utils/classloader/EarClassProviderTest.scala @@ -30,7 +30,7 @@ import org.apache.logging.log4j.core.LoggerContext import org.apache.logging.log4j.test.appender.ListAppender import org.apache.logging.log4j.{Level, LogManager} import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} import org.springframework.context.annotation.AnnotationConfigApplicationContext diff --git a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/opentracing/ReposeTracerTest.scala b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/opentracing/ReposeTracerTest.scala index 08d9081bb95..591d1a83c06 100644 --- a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/opentracing/ReposeTracerTest.scala +++ b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/opentracing/ReposeTracerTest.scala @@ -23,8 +23,8 @@ import io.opentracing.mock.MockTracer import io.opentracing.noop.NoopTracer import io.opentracing.util.GlobalTracer import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/services/logging/LoggingServiceImplTest.scala b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/services/logging/LoggingServiceImplTest.scala index 8d977aa28bc..f1530e06523 100644 --- a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/services/logging/LoggingServiceImplTest.scala +++ b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/services/logging/LoggingServiceImplTest.scala @@ -31,8 +31,8 @@ import org.apache.logging.log4j.test.appender.ListAppender import org.junit.runner.RunWith import org.openrepose.core.services.config.ConfigurationService import org.scalatest.concurrent.Eventually -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.time.{Seconds, Span} import org.scalatest.{FunSpec, Matchers} import org.slf4j.{Logger, LoggerFactory} diff --git a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/spring/CoreSpringProviderTest.scala b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/spring/CoreSpringProviderTest.scala index f52506c8727..23ce6185d92 100644 --- a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/spring/CoreSpringProviderTest.scala +++ b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/spring/CoreSpringProviderTest.scala @@ -23,7 +23,7 @@ import javax.servlet.Filter import org.junit.runner.RunWith import org.openrepose.core.spring.test.foo.FooBean import org.openrepose.core.spring.test.{DerpBean, HerpBean} -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} import org.springframework.context.ApplicationContext import com.anycompany.spring.test.foo.TestFooBean diff --git a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/spring/NextVersionTimebombTest.scala b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/spring/NextVersionTimebombTest.scala index bc541665ebb..3bf46e26bfe 100644 --- a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/spring/NextVersionTimebombTest.scala +++ b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/core/spring/NextVersionTimebombTest.scala @@ -20,7 +20,7 @@ package org.openrepose.core.spring import org.junit.runner.RunWith -import org.scalatest.junit.JUnitRunner +import org.scalatestplus.junit.JUnitRunner import org.scalatest.{FunSpec, Matchers} /** diff --git a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/nodeservice/response/ResponseHeaderServiceImplTest.scala b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/nodeservice/response/ResponseHeaderServiceImplTest.scala index 80a0b0aa827..8fca0ef65b3 100644 --- a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/nodeservice/response/ResponseHeaderServiceImplTest.scala +++ b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/nodeservice/response/ResponseHeaderServiceImplTest.scala @@ -27,8 +27,8 @@ import org.mockito.Matchers.anyString import org.mockito.Mockito.{never, verify, when} import org.openrepose.commons.utils.http.CommonHttpHeader import org.openrepose.nodeservice.containerconfiguration.ContainerConfigurationService -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} @RunWith(classOf[JUnitRunner]) diff --git a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeFilterChainTest.scala b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeFilterChainTest.scala index 0ebec300704..a05532ef795 100644 --- a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeFilterChainTest.scala +++ b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeFilterChainTest.scala @@ -41,8 +41,8 @@ import org.openrepose.core.services.httplogging.HttpLoggingContext import org.openrepose.core.systemmodel.config.{Filter => FilterConfig} import org.openrepose.powerfilter.ReposeFilterLoader.FilterContext import org.scalatest.LoneElement._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.slf4j.MDC import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse} diff --git a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeFilterLoaderTest.scala b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeFilterLoaderTest.scala index fdc45e8c52e..2fe2a9ae546 100644 --- a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeFilterLoaderTest.scala +++ b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeFilterLoaderTest.scala @@ -43,8 +43,8 @@ import org.openrepose.core.services.jmx.ConfigurationInformation import org.openrepose.core.systemmodel.config.{SystemModel, TracingHeaderConfig, Filter => FilterConfig} import org.openrepose.powerfilter.ReposeFilterLoader.{FilterContext, FilterContextList, FilterContextRegistrar} import org.openrepose.powerfilter.ReposeFilterLoaderTest._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers, OptionValues} import org.springframework.context.ApplicationContext diff --git a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeFilterTest.scala b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeFilterTest.scala index bb7ffbe9a5c..bc3da3ceab5 100644 --- a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeFilterTest.scala +++ b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeFilterTest.scala @@ -48,8 +48,8 @@ import org.openrepose.core.systemmodel.config.{Filter => FilterConfig} import org.openrepose.nodeservice.containerconfiguration.ContainerConfigurationService import org.openrepose.nodeservice.response.ResponseHeaderService import org.openrepose.powerfilter.ReposeFilterLoader.{FilterContext, FilterContextList, FilterContextRegistrar} -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.slf4j.MDC import org.springframework.context.support.AbstractApplicationContext diff --git a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeRoutingServletTest.scala b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeRoutingServletTest.scala index a424ae407e6..5255233384a 100644 --- a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeRoutingServletTest.scala +++ b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/ReposeRoutingServletTest.scala @@ -49,8 +49,8 @@ import org.openrepose.core.systemmodel.config._ import org.openrepose.nodeservice.containerconfiguration.ContainerConfigurationService import org.openrepose.powerfilter.ReposeRoutingServletTest._ import org.scalatest.TryValues._ -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import org.springframework.mock.web.{MockHttpServletRequest, MockHttpServletResponse, MockServletConfig} diff --git a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/intrafilterlogging/RequestLogTest.scala b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/intrafilterlogging/RequestLogTest.scala index 08500631274..9fd39107d25 100644 --- a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/intrafilterlogging/RequestLogTest.scala +++ b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/intrafilterlogging/RequestLogTest.scala @@ -26,8 +26,8 @@ import org.junit.runner.RunWith import org.openrepose.commons.utils.io.BufferedServletInputStream import org.openrepose.commons.utils.servlet.http.HttpServletRequestWrapper import org.openrepose.core.systemmodel.config.Filter -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import scala.collection.JavaConverters._ diff --git a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/intrafilterlogging/ResponseLogTest.scala b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/intrafilterlogging/ResponseLogTest.scala index 2ab70aa27a4..fab5455cb5e 100644 --- a/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/intrafilterlogging/ResponseLogTest.scala +++ b/repose-aggregator/core/repose-core/src/test/scala/org/openrepose/powerfilter/intrafilterlogging/ResponseLogTest.scala @@ -24,8 +24,8 @@ import java.io.ByteArrayInputStream import org.junit.runner.RunWith import org.openrepose.commons.utils.servlet.http.HttpServletResponseWrapper import org.openrepose.core.systemmodel.config.Filter -import org.scalatest.junit.JUnitRunner -import org.scalatest.mock.MockitoSugar +import org.scalatestplus.junit.JUnitRunner +import org.scalatestplus.mockito.MockitoSugar import org.scalatest.{BeforeAndAfterEach, FunSpec, Matchers} import scala.collection.JavaConverters._ diff --git a/repose-aggregator/docs/src/asciibinder/filters/openapi-validator.adoc b/repose-aggregator/docs/src/asciibinder/filters/openapi-validator.adoc index 9a9bbc021db..3907b57ad03 100644 --- a/repose-aggregator/docs/src/asciibinder/filters/openapi-validator.adoc +++ b/repose-aggregator/docs/src/asciibinder/filters/openapi-validator.adoc @@ -20,7 +20,7 @@ Vary based on configuration. This filter itself does not require any request headers, however the configured OpenAPI document may. === Required Preceding Filters -This filter has no dependency on any other filter. +<> is recommended when doing Role Based Access Control. === Request Headers Created This filter does not create/modify any request headers. @@ -62,6 +62,9 @@ a| * The OpenAPI document does not specify a request body, but the request conta * The OpenAPI document requires JSON content, but the request contains invalid JSON content. * A validation failure that is not explicitly expected has occurred. +| `401` +a| * The OpenAPI document specifies a role and none of the provided roles match. + | `404` a| * The OpenAPI document does not contain a path matching the path of the request. @@ -80,6 +83,29 @@ a| * An error occurs while attempting to read the request. * An unknown error occurs while validating schema from the OpenAPI document against the request. |=== +== Role Based Access Control +For convenience an extension is provided that does role checking when used in combination with the <>. +This is enable through the extension mechanism of *Swagger/OpenApi* under the element name `x-rax-roles`. + +[source, yaml] +.partial api-spec.yml +---- +paths: + /pets: + get: + summary: List all pets + operationId: listPets + x-rax-roles: ["user", "admin"] <1> +---- +<1> The array of role names that are acceptable. This value must be an array even if it contains a single value. + +The values contained in the request `X-Roles` header will be compared against the configured list, if any match the request is considered valid. + +[NOTE] +==== +This is just a convenience, the same thing could be acheived by doing a header check in the api specification. +==== + == Examples === OpenAPI Request Validation This configuration will validate inbound requests against an OpenAPI document. diff --git a/repose-aggregator/docs/src/asciibinder/recipes/role-based-access-control.adoc b/repose-aggregator/docs/src/asciibinder/recipes/role-based-access-control.adoc index 52eba7b4153..ebf9bdd8d3a 100644 --- a/repose-aggregator/docs/src/asciibinder/recipes/role-based-access-control.adoc +++ b/repose-aggregator/docs/src/asciibinder/recipes/role-based-access-control.adoc @@ -73,6 +73,7 @@ If your API is minimal or your just getting started with it, then you might find It uses a very simple Domain Specific Language (DSL) that is similar to what other tools use for this basic mechanism. Another powerful, but easy to configure tool is the <<../filters/regex-rbac.adoc#,RegEx RBAC filter>>. This filter uses a similar configuration, but the resources are defined with http://docs.oracle.com/javase/8/docs/api/java/util/regex/Pattern.html[Java Regular Expressions]. +If you have an OpenAPI document, try using the <<../filters/openapi-validator.adoc#,OpenAPI Validation Filter>> If on the other had your API is large and/or your authorizations are complex, then you will need the heavy lifting of the <<../filters/api-validator.adoc#,API Validator filter>> which uses a WADL to fully define the API. As with anything, the more bells and whistles you need, the more complex the configuration will be. @@ -126,7 +127,23 @@ This filter provides an RBAC mechanism for API's that don't conveniently fit int Please refer to the <<../filters/regex-rbac.adoc#,RegEx RBAC filter>> documentation for more information about the available configuration options. -==== 3. API Validator filter +==== 3. OpenAPI Validator filter +Role based access control is provided by a custom extension to the OpenApi specification. + +[source,yaml] +.your-api.yaml +---- +paths: + /pets: + get: + summary: List all pets + operationId: listPets + x-rax-roles: ["user", "admin"] +---- + +Please refer to the <<../filters/openapi-validator.adoc#,OpenApi Validator filter>> documentation for more information about the available configuration options. + +==== 4. API Validator filter If your API is complex or you simply need or are already using some of the extra features available in the API Validator filter, then this is the choice for you. ===== 1. Enable RAX-Roles diff --git a/repose-aggregator/docs/src/asciibinder/welcome/release-notes.adoc b/repose-aggregator/docs/src/asciibinder/welcome/release-notes.adoc index 72717f2a819..3ab8682085a 100644 --- a/repose-aggregator/docs/src/asciibinder/welcome/release-notes.adoc +++ b/repose-aggregator/docs/src/asciibinder/welcome/release-notes.adoc @@ -1,10 +1,27 @@ = Release Notes +== Upcoming Release 9.1.0.0 (2019-??-??) + +=== Integrators +* [.breaking-tag]#Breaking Change# | https://repose.atlassian.net/browse/REP-6825[REP-6825] - Scala and all dependent libraries upgraded to 2.12 versions. +** Akka: 2.4.20 → 2.5.23 +** Akka Http: 1.0 → 10.1.8 +** API Checker: 2.7.0 → 2.8.0 +** Diffson: 2.0.1 → 2.2.6 +** Gattling JsonPath: 0.6.4 → 0.6.10 +** Http Delegation: 4.0.0 → 5.0.0 +** Play Json: 2.5.2 → 2.7.4 +** Scala: 2.11.12 → 2.12.8 +** Scala Logging: 2.1.2 → 3.9.2 +** Scala Test: 2.2.0 → 3.0.8 +** Scopt: 3.2.0 → 3.7.1 + == 9.0.1.0 (2019-06-24) * [.new-tag]#New# | https://repose.atlassian.net/browse/REP-7786[REP-7786] - Added the <<../services/http-logging.adoc#, HTTP Logging Service>>. * [.new-tag]#New# | https://repose.atlassian.net/browse/REP-7600[REP-7600] - Added the <<../filters/openapi-validator.adoc#, OpenApi Validator Filter>>. * [.bug-tag]#Bug Fix# | https://repose.atlassian.net/browse/REP-7608[REP-7608] - Fixed bug where *Repose* was acting like it was sending content when the body was empty and chunked encoding was on. * [.bug-tag]#Bug Fix# | https://repose.atlassian.net/browse/REP-7663[REP-7663] - Fixed a file contention issue between Repose processes in the EAR unpacking logic. +* [.new-tag]#New# | https://repose.atlassian.net/browse/REP-7600[REP-7600] | https://repose.atlassian.net/browse/REP-7789[REP-7789] - Added the <<../filters/openapi-validator.adoc#, OpenApi Validator Filter>> which provides *Swagger/OpenApi* api validation support. * [.enhancement-tag]#Enhancement# | https://repose.atlassian.net/browse/REP-7391[REP-7391] - Updated dependencies: ** Jetty: 9.4.8.v20171121 → 9.4.14.v20181114 * [.enhancement-tag]#Enhancement# | https://repose.atlassian.net/browse/REP-7150[REP-7150] - Added OWASP security dependency checking to the build. diff --git a/repose-aggregator/tests/functional-tests/src/integrationTest/configs/features/filters/openapivalidation/validation/v3/validations.yaml b/repose-aggregator/tests/functional-tests/src/integrationTest/configs/features/filters/openapivalidation/validation/v3/validations.yaml index 44991f35a3c..14aec6a9bf0 100644 --- a/repose-aggregator/tests/functional-tests/src/integrationTest/configs/features/filters/openapivalidation/validation/v3/validations.yaml +++ b/repose-aggregator/tests/functional-tests/src/integrationTest/configs/features/filters/openapivalidation/validation/v3/validations.yaml @@ -41,6 +41,166 @@ paths: responses: '200': description: A 200 response + /rax-roles/multi/a: + get: + x-rax-roles: + - admin + - roleGET + responses: + '200': + description: A 200 response + put: + x-rax-roles: + - rolePUT + - admin + responses: + '200': + description: A 200 response + post: + x-rax-roles: + - admin + - rolePOST + responses: + '200': + description: A 200 response + delete: + x-rax-roles: + - roleDELETE + - admin + responses: + '200': + description: A 200 response + /rax-roles/multi/b: + get: + x-rax-roles: + - nimda + - roleGOOD + responses: + '200': + description: A 200 response + put: + x-rax-roles: + - nimda + - roleGOOD + responses: + '200': + description: A 200 response + post: + x-rax-roles: + - nimda + - roleGOOD + responses: + '200': + description: A 200 response + delete: + x-rax-roles: + - nimda + - roleGOOD + responses: + '200': + description: A 200 response + /rax-roles/dash/a: + get: + x-rax-roles: + - This-Is-A-Role + - role-GET + responses: + '200': + description: A 200 response + put: + x-rax-roles: + - role-PUT + responses: + '200': + description: A 200 response + post: + x-rax-roles: + - role-POST + responses: + '200': + description: A 200 response + delete: + x-rax-roles: + - role-DELETE + responses: + '200': + description: A 200 response + /rax-roles/dash/b: + get: + x-rax-roles: + - role-GOOD + responses: + '200': + description: A 200 response + put: + x-rax-roles: + - role-GOOD + responses: + '200': + description: A 200 response + post: + x-rax-roles: + - role-GOOD + responses: + '200': + description: A 200 response + delete: + x-rax-roles: + - role-GOOD + responses: + '200': + description: A 200 response + /rax-roles/space/a: + get: + x-rax-roles: + - This Is A Role + - role GET + responses: + '200': + description: A 200 response + put: + x-rax-roles: + - role PUT + responses: + '200': + description: A 200 response + post: + x-rax-roles: + - role POST + responses: + '200': + description: A 200 response + delete: + x-rax-roles: + - role DELETE + responses: + '200': + description: A 200 response + /rax-roles/space/b: + get: + x-rax-roles: + - role GOOD + responses: + '200': + description: A 200 response + put: + x-rax-roles: + - role GOOD + responses: + '200': + description: A 200 response + post: + x-rax-roles: + - role GOOD + responses: + '200': + description: A 200 response + delete: + x-rax-roles: + - role GOOD + responses: + '200': + description: A 200 response /accept: get: responses: diff --git a/repose-aggregator/tests/functional-tests/src/integrationTest/groovy/features/filters/openapivalidator/OpenApiValidationTest.groovy b/repose-aggregator/tests/functional-tests/src/integrationTest/groovy/features/filters/openapivalidator/OpenApiValidationTest.groovy index 1541b47534f..00062ce3ba8 100644 --- a/repose-aggregator/tests/functional-tests/src/integrationTest/groovy/features/filters/openapivalidator/OpenApiValidationTest.groovy +++ b/repose-aggregator/tests/functional-tests/src/integrationTest/groovy/features/filters/openapivalidator/OpenApiValidationTest.groovy @@ -26,6 +26,9 @@ import org.rackspace.deproxy.MessageChain import scaffold.category.Filters import spock.lang.Unroll +import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST +import static javax.servlet.http.HttpServletResponse.SC_OK + /** * Verifies the behavior of the OpenAPI Validator Filter. */ @@ -150,6 +153,117 @@ class OpenApiValidationTest extends ReposeValveTest { ['x-int-header': '32'] || 200 | 'pass a request with the header with a valid value' } + @Unroll + def "Should receive #expectedResponseStatus when the rax-role #raxRole is present on a #method to #path)"() { + when: + MessageChain messageChain1 = deproxy.makeRequest( + method: 'GET', + url: "$reposeEndpoint/v3/validations/rax-roles/$path", + headers: ['x-rax-roles': raxRole] + ) + + then: + messageChain1.receivedResponse.code as Integer == expectedResponseStatus + verifyHandlings(messageChain1) + + when: + MessageChain messageChain2 = deproxy.makeRequest( + method: 'GET', + url: "$reposeEndpoint/v3/validations/rax-roles/$path", + headers: ['x-rax-roles': "Bogus, $raxRole, Stuff"] + ) + + then: + messageChain2.receivedResponse.code as Integer == expectedResponseStatus + verifyHandlings(messageChain2) + + where: + path | method | raxRole || expectedResponseStatus + // Multi + 'multi/a' | 'GET' | 'admin' || SC_OK + 'multi/a' | 'PUT' | 'admin' || SC_OK + 'multi/a' | 'POST' | 'admin' || SC_OK + 'multi/a' | 'DELETE' | 'admin' || SC_OK + 'multi/a' | 'GET' | 'roleGET' || SC_OK + 'multi/a' | 'PUT' | 'rolePUT' || SC_OK + 'multi/a' | 'POST' | 'rolePOST' || SC_OK + 'multi/a' | 'DELETE' | 'roleDELETE' || SC_OK + 'multi/a' | 'GET' | 'nimda' || SC_BAD_REQUEST + 'multi/a' | 'PUT' | 'nimda' || SC_BAD_REQUEST + 'multi/a' | 'POST' | 'nimda' || SC_BAD_REQUEST + 'multi/a' | 'DELETE' | 'nimda' || SC_BAD_REQUEST + 'multi/a' | 'GET' | 'roleBAD' || SC_BAD_REQUEST + 'multi/a' | 'PUT' | 'roleBAD' || SC_BAD_REQUEST + 'multi/a' | 'POST' | 'roleBAD' || SC_BAD_REQUEST + 'multi/a' | 'DELETE' | 'roleBAD' || SC_BAD_REQUEST + 'multi/a' | 'GET' | 'roleGOOD' || SC_BAD_REQUEST + 'multi/a' | 'PUT' | 'roleGOOD' || SC_BAD_REQUEST + 'multi/a' | 'POST' | 'roleGOOD' || SC_BAD_REQUEST + 'multi/a' | 'DELETE' | 'roleGOOD' || SC_BAD_REQUEST + 'multi/b' | 'GET' | 'nimda' || SC_OK + 'multi/b' | 'PUT' | 'nimda' || SC_OK + 'multi/b' | 'POST' | 'nimda' || SC_OK + 'multi/b' | 'DELETE' | 'nimda' || SC_OK + 'multi/b' | 'GET' | 'roleGOOD' || SC_OK + 'multi/b' | 'PUT' | 'roleGOOD' || SC_OK + 'multi/b' | 'POST' | 'roleGOOD' || SC_OK + 'multi/b' | 'DELETE' | 'roleGOOD' || SC_OK + 'multi/b' | 'GET' | 'admin' || SC_BAD_REQUEST + 'multi/b' | 'PUT' | 'admin' || SC_BAD_REQUEST + 'multi/b' | 'POST' | 'admin' || SC_BAD_REQUEST + 'multi/b' | 'DELETE' | 'admin' || SC_BAD_REQUEST + 'multi/b' | 'GET' | 'roleGET' || SC_BAD_REQUEST + 'multi/b' | 'PUT' | 'rolePUT' || SC_BAD_REQUEST + 'multi/b' | 'POST' | 'rolePOST' || SC_BAD_REQUEST + 'multi/b' | 'DELETE' | 'roleDELETE' || SC_BAD_REQUEST + // Dash + 'dash/a' | 'GET' | 'This-Is-A-Role' || SC_OK + 'dash/a' | 'GET' | 'role-GET' || SC_OK + 'dash/a' | 'PUT' | 'role-PUT' || SC_OK + 'dash/a' | 'POST' | 'role-POST' || SC_OK + 'dash/a' | 'DELETE' | 'role-DELETE' || SC_OK + 'dash/a' | 'GET' | 'role-BAD' || SC_BAD_REQUEST + 'dash/a' | 'PUT' | 'role-BAD' || SC_BAD_REQUEST + 'dash/a' | 'POST' | 'role-BAD' || SC_BAD_REQUEST + 'dash/a' | 'DELETE' | 'role-BAD' || SC_BAD_REQUEST + 'dash/a' | 'GET' | 'role-GOOD' || SC_BAD_REQUEST + 'dash/a' | 'PUT' | 'role-GOOD' || SC_BAD_REQUEST + 'dash/a' | 'POST' | 'role-GOOD' || SC_BAD_REQUEST + 'dash/a' | 'DELETE' | 'role-GOOD' || SC_BAD_REQUEST + 'dash/b' | 'GET' | 'role-GOOD' || SC_OK + 'dash/b' | 'PUT' | 'role-GOOD' || SC_OK + 'dash/b' | 'POST' | 'role-GOOD' || SC_OK + 'dash/b' | 'DELETE' | 'role-GOOD' || SC_OK + 'dash/b' | 'GET' | 'This-Is-A-Role' || SC_BAD_REQUEST + 'dash/b' | 'GET' | 'role-GET' || SC_BAD_REQUEST + 'dash/b' | 'PUT' | 'role-PUT' || SC_BAD_REQUEST + 'dash/b' | 'POST' | 'role-POST' || SC_BAD_REQUEST + 'dash/b' | 'DELETE' | 'role-DELETE' || SC_BAD_REQUEST + // Space + 'space/a' | 'GET' | 'This Is A Role' || SC_OK + 'space/a' | 'GET' | 'role GET' || SC_OK + 'space/a' | 'PUT' | 'role PUT' || SC_OK + 'space/a' | 'POST' | 'role POST' || SC_OK + 'space/a' | 'DELETE' | 'role DELETE' || SC_OK + 'space/a' | 'GET' | 'role BAD' || SC_BAD_REQUEST + 'space/a' | 'PUT' | 'role BAD' || SC_BAD_REQUEST + 'space/a' | 'POST' | 'role BAD' || SC_BAD_REQUEST + 'space/a' | 'DELETE' | 'role BAD' || SC_BAD_REQUEST + 'space/a' | 'GET' | 'role GOOD' || SC_BAD_REQUEST + 'space/a' | 'PUT' | 'role GOOD' || SC_BAD_REQUEST + 'space/a' | 'POST' | 'role GOOD' || SC_BAD_REQUEST + 'space/a' | 'DELETE' | 'role GOOD' || SC_BAD_REQUEST + 'space/b' | 'GET' | 'role GOOD' || SC_OK + 'space/b' | 'PUT' | 'role GOOD' || SC_OK + 'space/b' | 'POST' | 'role GOOD' || SC_OK + 'space/b' | 'DELETE' | 'role GOOD' || SC_OK + 'space/b' | 'GET' | 'This Is A Role' || SC_BAD_REQUEST + 'space/b' | 'GET' | 'role GET' || SC_BAD_REQUEST + 'space/b' | 'PUT' | 'role PUT' || SC_BAD_REQUEST + 'space/b' | 'POST' | 'role POST' || SC_BAD_REQUEST + 'space/b' | 'DELETE' | 'role DELETE' || SC_BAD_REQUEST + } + @Unroll def "when configured to validate the Accept media type, should #description"() { when: diff --git a/repose-aggregator/tests/performance-tests/src/performanceTest/resources/roles/repose/files/config/filters/openapivalidator/openapi.yaml b/repose-aggregator/tests/performance-tests/src/performanceTest/resources/roles/repose/files/config/filters/openapivalidator/openapi.yaml index f273a168ad9..7bb3945ad37 100644 --- a/repose-aggregator/tests/performance-tests/src/performanceTest/resources/roles/repose/files/config/filters/openapivalidator/openapi.yaml +++ b/repose-aggregator/tests/performance-tests/src/performanceTest/resources/roles/repose/files/config/filters/openapivalidator/openapi.yaml @@ -122,6 +122,14 @@ paths: application/json: schema: $ref: '#/components/schemas/Error' + /roles: + get: + description: does nothing of value + operationId: checks roles + x-rax-roles: ["foo", "bar"] + responses: + '204': + description: yep still pointless components: schemas: Pet: diff --git a/repose-aggregator/tests/performance-tests/src/performanceTest/scala/filters/openapivalidator/OpenApiValidatorFilterSimulation.scala b/repose-aggregator/tests/performance-tests/src/performanceTest/scala/filters/openapivalidator/OpenApiValidatorFilterSimulation.scala index 67eb747c0ab..6366aac961d 100644 --- a/repose-aggregator/tests/performance-tests/src/performanceTest/scala/filters/openapivalidator/OpenApiValidatorFilterSimulation.scala +++ b/repose-aggregator/tests/performance-tests/src/performanceTest/scala/filters/openapivalidator/OpenApiValidatorFilterSimulation.scala @@ -55,15 +55,25 @@ class OpenApiValidatorFilterSimulation extends AbstractReposeSimulation { ) } + var feederRole: Array[Map[String, Any]] = + ScenariosDelete.map { case (role, respcode) => + Map( + "role" -> role, + "roleRespCode" -> respcode + ) + } + // set up the warm up scenario override val warmupScenario: ScenarioBuilder = scenario("Warmup") .feed(feederGet.circular) .feed(feederPost.circular) .feed(feederDelete.circular) + .feed(feederRole.circular) .forever { exec(requestGet) exec(requestPost) exec(requestDelete) + exec(requestRole) } // set up the main scenario @@ -71,10 +81,12 @@ class OpenApiValidatorFilterSimulation extends AbstractReposeSimulation { .feed(feederGet.circular) .feed(feederPost.circular) .feed(feederDelete.circular) + .feed(feederRole.circular) .forever { exec(requestGet) exec(requestPost) exec(requestDelete) + exec(requestRole) } // run the scenarios @@ -105,11 +117,23 @@ class OpenApiValidatorFilterSimulation extends AbstractReposeSimulation { .header(HeaderMockRespStatus, "${deleteRespCode}") .check(status.is(session => session("deleteRespCode").as[Int])) } + + def requestRole: HttpRequestBuilder = { + http(session => session.scenario) + .get("/roles") + .header(HttpHeaderNames.Host, "localhost") + .header(HeaderMockRespStatus, s"$StatusCodeNoContent") + .header(HeaderRole, "${role}, banana") + .check(status.is(session => session("roleRespCode").as[Int])) + } } object OpenApiValidatorFilterSimulation { val HeaderMockRespStatus = "Mock-Origin-Res-Status" + val HeaderRole = "X-Role" val StatusCodeOk = 200 + val StatusCodeNoContent = 204 + val StatusCodeUnauthorized =401 val StatusCodeNotFound = 404 val StatusCodeMethodNotAllowed = 405 @@ -126,4 +150,10 @@ object OpenApiValidatorFilterSimulation { ("/pets", StatusCodeMethodNotAllowed), ("/pets/17362", StatusCodeOk), ("/notPets", StatusCodeNotFound)) + + //(role: String , respcode: Int) + private val ScenariosRole = Array[(String, Int)]( + ("foo", StatusCodeNoContent), + ("bar", StatusCodeNoContent), + ("baz", StatusCodeUnauthorized)) } diff --git a/repose-aggregator/tests/test-bundles/filter-five/build.gradle b/repose-aggregator/tests/test-bundles/filter-five/build.gradle index 8b15bd75e9c..d6da4a95b26 100644 --- a/repose-aggregator/tests/test-bundles/filter-five/build.gradle +++ b/repose-aggregator/tests/test-bundles/filter-five/build.gradle @@ -2,7 +2,7 @@ dependencies { compile project(':repose-aggregator:tests:test-bundles:classloader-dependency-two') compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly 'javax.servlet:javax.servlet-api' compileOnly 'javax.inject:javax.inject' diff --git a/repose-aggregator/tests/test-bundles/filter-five/src/main/scala/org/openrepose/filters/core/filterfive/FilterFive.scala b/repose-aggregator/tests/test-bundles/filter-five/src/main/scala/org/openrepose/filters/core/filterfive/FilterFive.scala index aaa20c5a37c..91a20e20e49 100644 --- a/repose-aggregator/tests/test-bundles/filter-five/src/main/scala/org/openrepose/filters/core/filterfive/FilterFive.scala +++ b/repose-aggregator/tests/test-bundles/filter-five/src/main/scala/org/openrepose/filters/core/filterfive/FilterFive.scala @@ -22,7 +22,7 @@ package org.openrepose.filters.core.filterfive import javax.inject.Named import javax.servlet._ -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.others.SimplicityDivine /** diff --git a/repose-aggregator/tests/test-bundles/filter-four/build.gradle b/repose-aggregator/tests/test-bundles/filter-four/build.gradle index 0cb3232dcb7..fc0dec0cb63 100644 --- a/repose-aggregator/tests/test-bundles/filter-four/build.gradle +++ b/repose-aggregator/tests/test-bundles/filter-four/build.gradle @@ -2,7 +2,7 @@ dependencies { compile project(':repose-aggregator:tests:test-bundles:classloader-dependency-one') compile "org.scala-lang:scala-library" compile "org.scala-lang:scala-reflect" // Forces the version used by scala-logging. - compile "com.typesafe.scala-logging:scala-logging-slf4j_$scalaMajDotMin" + compile "com.typesafe.scala-logging:scala-logging_$scalaMajDotMin" compileOnly 'javax.servlet:javax.servlet-api' compileOnly 'javax.inject:javax.inject' diff --git a/repose-aggregator/tests/test-bundles/filter-four/src/main/scala/org/openrepose/filters/core/filterfour/FilterFour.scala b/repose-aggregator/tests/test-bundles/filter-four/src/main/scala/org/openrepose/filters/core/filterfour/FilterFour.scala index 015898ed1f5..c5203e726f6 100644 --- a/repose-aggregator/tests/test-bundles/filter-four/src/main/scala/org/openrepose/filters/core/filterfour/FilterFour.scala +++ b/repose-aggregator/tests/test-bundles/filter-four/src/main/scala/org/openrepose/filters/core/filterfour/FilterFour.scala @@ -22,7 +22,7 @@ package org.openrepose.filters.core.filterfour import javax.inject.Named import javax.servlet._ -import com.typesafe.scalalogging.slf4j.StrictLogging +import com.typesafe.scalalogging.StrictLogging import org.openrepose.others.SimplicityDivine /** diff --git a/versions.properties b/versions.properties index 14e4eb0f38b..73b5b08a58f 100644 --- a/versions.properties +++ b/versions.properties @@ -1,16 +1,18 @@ -com.atlassian.oai:swagger-request-validator-core=2.2.2 +com.atlassian.oai:swagger-request-validator-core=2.3.0 jacksonVersion=2.9.9 com.fasterxml.jackson.core:jackson-annotations=$jacksonVersion com.fasterxml.jackson.core:jackson-core=$jacksonVersion com.fasterxml.jackson.core:jackson-databind=$jacksonVersion com.fasterxml.jackson.dataformat:jackson-dataformat-yaml=$jacksonVersion com.github.jknack:handlebars=2.0.0 -com.github.scopt:scopt_2.11=3.2.0 +com.github.scopt:scopt_2.12=3.7.1 com.google.code.findbugs:jsr305=1.3.9 com.google.guava:guava=27.0.1-jre -apiCheckerVersion=2.7.0 +apiCheckerVersion=2.8.0 com.rackspace.papi.components.api-checker:checker-core=$apiCheckerVersion com.rackspace.papi.components.api-checker:checker-util=$apiCheckerVersion +#force version of spray json till api checker can be updated +io.spray:spray-json_2.12=1.3.5 jerseyVersion=1.19 com.sun.jersey:jersey-server=$jerseyVersion com.sun.jersey:jersey-servlet=$jerseyVersion @@ -18,15 +20,16 @@ jaxbVersion=2.2.7-b41 com.sun.xml.bind:jaxb-xjc=$jaxbVersion com.sun.xml.bind:jaxb-impl=$jaxbVersion com.typesafe:config=1.2.1 -akkaVersion=2.4.20 -com.rackspace.cloud.api:wadl-tools_2.11=1.0.32 -com.squareup.okhttp3:okhttp=3.12.1 -com.typesafe.akka:akka-actor_2.11=$akkaVersion -com.typesafe.akka:akka-testkit_2.11=$akkaVersion -com.typesafe.akka:akka-http-core-experimental_2.11=1.0 -com.typesafe.play:play-json_2.11=2.5.2 -com.typesafe.scala-logging:scala-logging-slf4j_2.11=2.1.2 +akkaVersion=2.5.23 +com.typesafe.akka:akka-actor_2.12=$akkaVersion +com.typesafe.akka:akka-stream_2.12=$akkaVersion +com.typesafe.akka:akka-testkit_2.12=$akkaVersion +com.typesafe.akka:akka-http-core_2.12=10.1.8 +com.typesafe.play:play-json_2.12=2.7.4 +com.typesafe.scala-logging:scala-logging_2.12=3.9.2 com.jayway.jsonpath:json-path=2.4.0 +# Forces the version used by jaeger +com.squareup.okhttp3:okhttp=3.12.1 io.jaegertracing:jaeger-core=0.27.0 commons-cli:commons-cli=1.2 commons-codec:commons-codec=1.10 @@ -40,7 +43,7 @@ io.dropwizard.metrics:metrics-httpclient=$metricsVersion gatlingVersion=2.2.4 io.gatling:gatling-core=$gatlingVersion io.gatling:gatling-http=$gatlingVersion -io.gatling:jsonpath_2.11=0.6.4 +io.gatling:jsonpath_2.12=0.6.10 opentracingVersion=0.31.0 io.opentracing:opentracing-api=$opentracingVersion io.opentracing:opentracing-mock=$opentracingVersion @@ -91,7 +94,7 @@ org.eclipse.jetty:jetty-server=$jettyVersion org.eclipse.jetty:jetty-servlet=$jettyVersion org.eclipse.jetty:jetty-util=$jettyVersion org.glassfish:javax.servlet=3.1 -org.gnieh:diffson_2.11=2.0.1 +org.gnieh:diffson-play-json_2.12=2.2.6 org.hamcrest:hamcrest-library=1.3 org.jetbrains:annotations=13.0 org.jtwig:jtwig-core=5.86.1.RELEASE @@ -106,15 +109,15 @@ org.linkedin:org.linkedin.util-groovy=1.8.0 org.luaj:luaj-jse=3.0.1 mockitoVersion=1.9.5 org.mockito:mockito-core=$mockitoVersion -org.openrepose:http-delegation=4.0.0 +org.openrepose:http-delegation=5.0.0 org.projectlombok:lombok=1.18.2 org.python:jython-standalone=2.7.1 org.rackspace:deproxy=0.21 -scalaVersion=2.11.12 +scalaVersion=2.12.8 org.scala-lang:scala-library=$scalaVersion org.scala-lang:scala-reflect=$scalaVersion -org.scala-lang.modules:scala-xml_2.11=1.0.5 -org.scalatest:scalatest_2.11=2.2.0 +org.scala-lang.modules:scala-xml_2.12=1.0.5 +org.scalatest:scalatest_2.12=3.0.8 slf4jVersion=1.7.7 org.slf4j:slf4j-api=$slf4jVersion org.slf4j:jcl-over-slf4j=$slf4jVersion