diff --git a/deegree-services/deegree-services-commons/pom.xml b/deegree-services/deegree-services-commons/pom.xml index a20c3c16bb..7c23b27670 100644 --- a/deegree-services/deegree-services-commons/pom.xml +++ b/deegree-services/deegree-services-commons/pom.xml @@ -98,7 +98,15 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 + + + net.bytebuddy + byte-buddy + + + org.objenesis + objenesis diff --git a/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/OGCFrontControllerTest.java b/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/OGCFrontControllerTest.java index 548a38e352..c39bec809f 100644 --- a/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/OGCFrontControllerTest.java +++ b/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/OGCFrontControllerTest.java @@ -37,9 +37,9 @@ import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import static org.powermock.api.mockito.PowerMockito.mockStatic; @@ -49,6 +49,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.powermock.api.mockito.PowerMockito; +import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -57,6 +58,9 @@ */ @RunWith(PowerMockRunner.class) @PrepareForTest(OGCFrontController.class) +@PowerMockIgnore({"jdk.internal.reflect.*", "jdk.internal.misc.*", "javax.management.*", "javax.xml.*", + "javax.activation.*", "com.sun.org.apache.xerces.*", "com.sun.org.apache.xalan.*", "org.xml.*", "org.w3c.dom.*" + }) public class OGCFrontControllerTest { @Test diff --git a/pom.xml b/pom.xml index 14a02da370..1f14797a7e 100644 --- a/pom.xml +++ b/pom.xml @@ -398,25 +398,37 @@ org.mockito mockito-core - 1.10.19 + 2.28.2 test org.powermock powermock-module-junit4 - 1.6.3 + 2.0.9 test org.powermock - powermock-api-mockito - 1.6.3 + powermock-api-mockito2 + 2.0.9 + test + + + net.bytebuddy + byte-buddy + 1.9.10 + test + + + org.objenesis + objenesis + 2.6 test org.javassist javassist - 3.20.0-GA + 3.27.0-GA org.xmlmatchers