diff --git a/README.md b/README.md
index 90d89fd..7492ef5 100644
--- a/README.md
+++ b/README.md
@@ -41,3 +41,8 @@ With `ru.lanwen.wiremock.config.WiremockCustomizer` and `ru.lanwen.wiremock.conf
you can reuse logic of initial setup.
Please look into test for example.
+
+## Compatibility with JUnit5
+
+*v1.0.1* `->` *M4*
+*v1.1.0* `->` *RC2*
diff --git a/pom.xml b/pom.xml
index 8ca8e41..beadbf1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,8 +42,8 @@
1.16.16
1.1.11
0.7.7.201606060606
- 5.0.0-M4
- 1.0.0-M4
+ 5.0.0-RC2
+ 1.0.0-RC2
diff --git a/src/main/java/ru/lanwen/wiremock/ext/WiremockResolver.java b/src/main/java/ru/lanwen/wiremock/ext/WiremockResolver.java
index da5cbb7..3fb6955 100644
--- a/src/main/java/ru/lanwen/wiremock/ext/WiremockResolver.java
+++ b/src/main/java/ru/lanwen/wiremock/ext/WiremockResolver.java
@@ -8,7 +8,6 @@
import org.junit.jupiter.api.extension.ParameterContext;
import org.junit.jupiter.api.extension.ParameterResolutionException;
import org.junit.jupiter.api.extension.ParameterResolver;
-import org.junit.jupiter.api.extension.TestExtensionContext;
import ru.lanwen.wiremock.config.WiremockConfigFactory;
import ru.lanwen.wiremock.config.WiremockCustomizer;
@@ -30,7 +29,7 @@ public class WiremockResolver implements ParameterResolver, AfterEachCallback {
private WireMockServer server;
@Override
- public void afterEach(TestExtensionContext testExtensionContext) throws Exception {
+ public void afterEach(ExtensionContext testExtensionContext) throws Exception {
if (server == null || !server.isRunning()) {
return;
}
@@ -42,12 +41,12 @@ public void afterEach(TestExtensionContext testExtensionContext) throws Exceptio
}
@Override
- public boolean supports(ParameterContext parameterContext, ExtensionContext context) {
+ public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext context) {
return parameterContext.getParameter().isAnnotationPresent(Wiremock.class);
}
@Override
- public Object resolve(ParameterContext parameterContext, ExtensionContext context) {
+ public Object resolveParameter(ParameterContext parameterContext, ExtensionContext context) {
Validate.validState(
!Optional.ofNullable(server).map(WireMockServer::isRunning).orElse(false),
"Can't inject more than one server"
diff --git a/src/main/java/ru/lanwen/wiremock/ext/WiremockUriResolver.java b/src/main/java/ru/lanwen/wiremock/ext/WiremockUriResolver.java
index a20982b..565f168 100644
--- a/src/main/java/ru/lanwen/wiremock/ext/WiremockUriResolver.java
+++ b/src/main/java/ru/lanwen/wiremock/ext/WiremockUriResolver.java
@@ -15,13 +15,13 @@
*/
public class WiremockUriResolver implements ParameterResolver {
@Override
- public boolean supports(ParameterContext parameterContext, ExtensionContext extensionContext) {
+ public boolean supportsParameter(ParameterContext parameterContext, ExtensionContext extensionContext) {
return parameterContext.getParameter().isAnnotationPresent(WiremockUri.class)
&& String.class.isAssignableFrom(parameterContext.getParameter().getType());
}
@Override
- public Object resolve(ParameterContext parameterContext, ExtensionContext context) {
+ public Object resolveParameter(ParameterContext parameterContext, ExtensionContext context) {
ExtensionContext.Store store = context.getStore(ExtensionContext.Namespace.create(WiremockResolver.class));
return "http://localhost:" + store.get(WiremockResolver.WIREMOCK_PORT);