Browse Source

Move JavaUtilLoggingConfigurer to spring-core test fixtures

See gh-23550
pull/24295/head
Sam Brannen 6 years ago
parent
commit
081b3d304d
  1. 5
      spring-core/spring-core.gradle
  2. 4
      spring-core/src/testFixtures/java/org/springframework/core/testfixture/JavaUtilLoggingConfigurer.java
  3. 1
      spring-webflux/spring-webflux.gradle
  4. 2
      spring-webflux/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener

5
spring-core/spring-core.gradle

@ -60,11 +60,12 @@ dependencies { @@ -60,11 +60,12 @@ dependencies {
testCompile("javax.xml.bind:jaxb-api")
testCompile("com.fasterxml.woodstox:woodstox-core")
testCompile(project(":kotlin-coroutines"))
testFixturesApi("org.junit.jupiter:junit-jupiter-api")
testFixturesApi("org.junit.jupiter:junit-jupiter-params")
testFixturesImplementation("com.google.code.findbugs:jsr305")
testFixturesImplementation("io.projectreactor:reactor-test")
testFixturesImplementation("org.assertj:assertj-core")
testFixturesImplementation("org.junit.platform:junit-platform-launcher")
testFixturesImplementation("org.junit.jupiter:junit-jupiter-api")
testFixturesImplementation("org.junit.jupiter:junit-jupiter-params")
testFixturesImplementation("org.xmlunit:xmlunit-assertj")
}

4
spring-webflux/src/test/java/org/springframework/web/reactive/fixtures/JavaUtilLoggingConfigurer.java → spring-core/src/testFixtures/java/org/springframework/core/testfixture/JavaUtilLoggingConfigurer.java

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -14,7 +14,7 @@ @@ -14,7 +14,7 @@
* limitations under the License.
*/
package org.springframework.web.reactive.fixtures;
package org.springframework.core.testfixture;
import java.io.InputStream;
import java.util.logging.LogManager;

1
spring-webflux/spring-webflux.gradle

@ -46,7 +46,6 @@ dependencies { @@ -46,7 +46,6 @@ dependencies {
testCompile("org.eclipse.jetty:jetty-server")
testCompile("org.eclipse.jetty:jetty-servlet")
testCompile("org.eclipse.jetty:jetty-reactive-httpclient")
testCompile("org.junit.platform:junit-platform-launcher")
testCompile("com.squareup.okhttp3:mockwebserver")
testCompile("org.jetbrains.kotlin:kotlin-script-runtime")
testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223-embeddable")

2
spring-webflux/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener

@ -1 +1 @@ @@ -1 +1 @@
org.springframework.web.reactive.fixtures.JavaUtilLoggingConfigurer
org.springframework.core.testfixture.JavaUtilLoggingConfigurer
Loading…
Cancel
Save