From e44b595c0d1af72d7fd9c7970bc5f299b9249ac3 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Thu, 19 Jan 2017 16:35:35 +0100 Subject: [PATCH] Fix merge issue --- .../jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java index 925db0f034..0470a60434 100644 --- a/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java +++ b/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/orm/jpa/TestDatabaseAutoConfigurationNoEmbeddedTests.java @@ -23,9 +23,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.BeanCreationException; +import org.springframework.boot.junit.runner.classpath.ClassPathExclusions; +import org.springframework.boot.junit.runner.classpath.ModifiedClassPathRunner; +import org.springframework.boot.test.autoconfigure.jdbc.TestDatabaseAutoConfiguration; import org.springframework.boot.test.util.EnvironmentTestUtils; -import org.springframework.boot.testutil.ClassPathExclusions; -import org.springframework.boot.testutil.FilteredClassPathRunner; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; @@ -40,7 +41,7 @@ import static org.mockito.Mockito.mock; * * @author Stephane Nicoll */ -@RunWith(FilteredClassPathRunner.class) +@RunWith(ModifiedClassPathRunner.class) @ClassPathExclusions({ "h2-*.jar", "hsqldb-*.jar", "derby-*.jar" }) public class TestDatabaseAutoConfigurationNoEmbeddedTests {