diff --git a/spring-cloud-contract-dependencies/pom.xml b/spring-cloud-contract-dependencies/pom.xml index 36436502a0..2b67e2b8af 100644 --- a/spring-cloud-contract-dependencies/pom.xml +++ b/spring-cloud-contract-dependencies/pom.xml @@ -18,7 +18,6 @@ 0.4.13 1.0.2.v20150114 3.0.7 - 5.2.0 @@ -156,16 +155,6 @@ maven-settings-builder 3.2.1 - - org.junit.jupiter - junit-jupiter-engine - ${junit5-version} - - - org.junit.jupiter - junit-jupiter-api - ${junit5-version} - diff --git a/spring-cloud-contract-stub-runner/README.adoc b/spring-cloud-contract-stub-runner/README.adoc index 86ac8fb7fd..b67974ab42 100644 --- a/spring-cloud-contract-stub-runner/README.adoc +++ b/spring-cloud-contract-stub-runner/README.adoc @@ -314,7 +314,7 @@ JUnit 5 Extension example: [source,java,indent=0] ---- -include::src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionTest.java[tags=extension] +include::src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionTests.java[tags=extension] ---- Check the *Common properties for JUnit and Spring* for more information on how to apply global configuration of Stub Runner. diff --git a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java index 8a580dc054..0773d10e42 100644 --- a/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java +++ b/spring-cloud-contract-stub-runner/src/main/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerExtension.java @@ -16,10 +16,11 @@ package org.springframework.cloud.contract.stubrunner.junit; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.jupiter.api.extension.AfterAllCallback; import org.junit.jupiter.api.extension.BeforeAllCallback; import org.junit.jupiter.api.extension.ExtensionContext; -import org.slf4j.LoggerFactory; import org.springframework.cloud.contract.spec.Contract; import org.springframework.cloud.contract.stubrunner.BatchStubRunner; import org.springframework.cloud.contract.stubrunner.BatchStubRunnerFactory; @@ -49,8 +50,7 @@ public class StubRunnerExtension implements BeforeAllCallback, AfterAllCallback, private static final String DELIMITER = ":"; private static final String LATEST_VERSION = "+"; - - private static org.slf4j.Logger LOG = LoggerFactory.getLogger(StubRunnerExtension.class); + private static final Log LOG = LogFactory.getLog(StubRunnerExtension.class); StubRunnerExtension delegate = this; private BatchStubRunner stubFinder; diff --git a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionCustomMessageVerifierTest.java b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionCustomMessageVerifierTests.java similarity index 98% rename from spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionCustomMessageVerifierTest.java rename to spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionCustomMessageVerifierTests.java index 042cf0a574..34b888f6d5 100644 --- a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionCustomMessageVerifierTest.java +++ b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionCustomMessageVerifierTests.java @@ -33,7 +33,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; * @author Olga Maciaszek-Sharma * @since 2.1.0 */ -class StubRunnerJUnit5ExtensionCustomMessageVerifierTest { +class StubRunnerJUnit5ExtensionCustomMessageVerifierTests { @BeforeAll @AfterAll diff --git a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionCustomPortTest.java b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionCustomPortTests.java similarity index 96% rename from spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionCustomPortTest.java rename to spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionCustomPortTests.java index 7378f0d875..3a1b45e8c4 100644 --- a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionCustomPortTest.java +++ b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionCustomPortTests.java @@ -33,7 +33,7 @@ import static org.assertj.core.api.BDDAssertions.then; * @author Olga Maciaszek-Sharma * @since 2.1.0 */ -class StubRunnerJUnit5ExtensionCustomPortTest { +class StubRunnerJUnit5ExtensionCustomPortTests { @BeforeAll @AfterAll @@ -70,7 +70,7 @@ class StubRunnerJUnit5ExtensionCustomPortTest { private static String repoRoot() { try { - return StubRunnerJUnit5ExtensionCustomPortTest.class.getResource("/m2repo/repository/") + return StubRunnerJUnit5ExtensionCustomPortTests.class.getResource("/m2repo/repository/") .toURI().toString(); } catch (Exception e) { return ""; diff --git a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionExceptionThrowingTest.java b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionExceptionThrowingTests.java similarity index 97% rename from spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionExceptionThrowingTest.java rename to spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionExceptionThrowingTests.java index 34d24a2807..64bc403e37 100644 --- a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionExceptionThrowingTest.java +++ b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionExceptionThrowingTests.java @@ -28,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows; * @author Olga Maciaszek-Sharma * @since 2.1.0 */ -public class StubRunnerJUnit5ExtensionExceptionThrowingTest { +public class StubRunnerJUnit5ExtensionExceptionThrowingTests { @RegisterExtension static StubRunnerExtension stubRunnerExtension = new StubRunnerExtension() diff --git a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionTest.java b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionTests.java similarity index 98% rename from spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionTest.java rename to spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionTests.java index 50589ddb3f..3104b99c6f 100644 --- a/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionTest.java +++ b/spring-cloud-contract-stub-runner/src/test/java/org/springframework/cloud/contract/stubrunner/junit/StubRunnerJUnit5ExtensionTests.java @@ -32,7 +32,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Olga Maciaszek-Sharma */ -class StubRunnerJUnit5ExtensionTest { +class StubRunnerJUnit5ExtensionTests { @BeforeAll @AfterAll