From 081b3d304d94bdbdffc663e3a4810f76d6eb1fc4 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Fri, 3 Jan 2020 14:34:29 +0100 Subject: [PATCH] Move JavaUtilLoggingConfigurer to spring-core test fixtures See gh-23550 --- spring-core/spring-core.gradle | 5 +++-- .../core/testfixture}/JavaUtilLoggingConfigurer.java | 4 ++-- spring-webflux/spring-webflux.gradle | 1 - .../org.junit.platform.launcher.TestExecutionListener | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename {spring-webflux/src/test/java/org/springframework/web/reactive/fixtures => spring-core/src/testFixtures/java/org/springframework/core/testfixture}/JavaUtilLoggingConfigurer.java (94%) diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle index a84b8e7537..94327d342e 100644 --- a/spring-core/spring-core.gradle +++ b/spring-core/spring-core.gradle @@ -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") } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/fixtures/JavaUtilLoggingConfigurer.java b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/JavaUtilLoggingConfigurer.java similarity index 94% rename from spring-webflux/src/test/java/org/springframework/web/reactive/fixtures/JavaUtilLoggingConfigurer.java rename to spring-core/src/testFixtures/java/org/springframework/core/testfixture/JavaUtilLoggingConfigurer.java index 2c555e16ad..d54483099e 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/fixtures/JavaUtilLoggingConfigurer.java +++ b/spring-core/src/testFixtures/java/org/springframework/core/testfixture/JavaUtilLoggingConfigurer.java @@ -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 @@ * limitations under the License. */ -package org.springframework.web.reactive.fixtures; +package org.springframework.core.testfixture; import java.io.InputStream; import java.util.logging.LogManager; diff --git a/spring-webflux/spring-webflux.gradle b/spring-webflux/spring-webflux.gradle index a636d47ad8..1028d6e59c 100644 --- a/spring-webflux/spring-webflux.gradle +++ b/spring-webflux/spring-webflux.gradle @@ -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") diff --git a/spring-webflux/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener b/spring-webflux/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener index fd231f292c..973bfea976 100644 --- a/spring-webflux/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener +++ b/spring-webflux/src/test/resources/META-INF/services/org.junit.platform.launcher.TestExecutionListener @@ -1 +1 @@ -org.springframework.web.reactive.fixtures.JavaUtilLoggingConfigurer \ No newline at end of file +org.springframework.core.testfixture.JavaUtilLoggingConfigurer \ No newline at end of file