Skip to content

Commit 081b3d3

Browse files
committed
Move JavaUtilLoggingConfigurer to spring-core test fixtures
See gh-23550
1 parent 92a2839 commit 081b3d3

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

spring-core/spring-core.gradle

+3-2
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,12 @@ dependencies {
6060
testCompile("javax.xml.bind:jaxb-api")
6161
testCompile("com.fasterxml.woodstox:woodstox-core")
6262
testCompile(project(":kotlin-coroutines"))
63-
testFixturesApi("org.junit.jupiter:junit-jupiter-api")
64-
testFixturesApi("org.junit.jupiter:junit-jupiter-params")
6563
testFixturesImplementation("com.google.code.findbugs:jsr305")
6664
testFixturesImplementation("io.projectreactor:reactor-test")
6765
testFixturesImplementation("org.assertj:assertj-core")
66+
testFixturesImplementation("org.junit.platform:junit-platform-launcher")
67+
testFixturesImplementation("org.junit.jupiter:junit-jupiter-api")
68+
testFixturesImplementation("org.junit.jupiter:junit-jupiter-params")
6869
testFixturesImplementation("org.xmlunit:xmlunit-assertj")
6970
}
7071

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2019 the original author or authors.
2+
* Copyright 2002-2020 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
package org.springframework.web.reactive.fixtures;
17+
package org.springframework.core.testfixture;
1818

1919
import java.io.InputStream;
2020
import java.util.logging.LogManager;

spring-webflux/spring-webflux.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ dependencies {
4646
testCompile("org.eclipse.jetty:jetty-server")
4747
testCompile("org.eclipse.jetty:jetty-servlet")
4848
testCompile("org.eclipse.jetty:jetty-reactive-httpclient")
49-
testCompile("org.junit.platform:junit-platform-launcher")
5049
testCompile("com.squareup.okhttp3:mockwebserver")
5150
testCompile("org.jetbrains.kotlin:kotlin-script-runtime")
5251
testRuntime("org.jetbrains.kotlin:kotlin-scripting-jsr223-embeddable")
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
org.springframework.web.reactive.fixtures.JavaUtilLoggingConfigurer
1+
org.springframework.core.testfixture.JavaUtilLoggingConfigurer

0 commit comments

Comments
 (0)