diff --git a/spring-cloud-kubernetes-commons/pom.xml b/spring-cloud-kubernetes-commons/pom.xml index 6a6ee7919a..b16ccdf8ee 100644 --- a/spring-cloud-kubernetes-commons/pom.xml +++ b/spring-cloud-kubernetes-commons/pom.xml @@ -10,19 +10,6 @@ 4.0.0 spring-cloud-kubernetes-commons - ${project.artifactId} - - - - org.apache.maven.plugins - maven-compiler-plugin - - 17 - 17 - - - - diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml index 6268864c01..fd2d378832 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml +++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/pom.xml @@ -74,12 +74,9 @@ + org.apache.maven.plugins maven-surefire-plugin - 3.1.2 - - - maven-failsafe-plugin - 3.1.2 + 3.5.3 diff --git a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/test/java/org/springframework/cloud/kubernetes/examples/LeaderControllerTest.java b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/test/java/org/springframework/cloud/kubernetes/examples/LeaderControllerTests.java similarity index 91% rename from spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/test/java/org/springframework/cloud/kubernetes/examples/LeaderControllerTest.java rename to spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/test/java/org/springframework/cloud/kubernetes/examples/LeaderControllerTests.java index 63ed314355..2ed5d3f31f 100644 --- a/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/test/java/org/springframework/cloud/kubernetes/examples/LeaderControllerTest.java +++ b/spring-cloud-kubernetes-examples/kubernetes-leader-election-example/src/test/java/org/springframework/cloud/kubernetes/examples/LeaderControllerTests.java @@ -21,9 +21,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; +import org.mockito.Mockito; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -36,17 +34,13 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; -@ExtendWith(MockitoExtension.class) -public class LeaderControllerTest { +public class LeaderControllerTests { - @Mock - private OnGrantedEvent mockOnGrantedEvent; + private final OnGrantedEvent mockOnGrantedEvent = Mockito.mock(OnGrantedEvent.class); - @Mock - private OnRevokedEvent mockOnRevokedEvent; + private final OnRevokedEvent mockOnRevokedEvent = Mockito.mock(OnRevokedEvent.class); - @Mock - private Context mockContext; + private final Context mockContext = Mockito.mock(Context.class); private String host;