From e5d93e58a19b5d35bcd32ef4359c937e8e4641a7 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 9 May 2018 20:16:05 +0200 Subject: [PATCH] Bump PowerMock to 1.7.3 And also drop the powermock-classloading-xstream dependency as it is currently not used. --- smack-core/build.gradle | 8 ++++---- .../test/java/org/jivesoftware/util/ConnectionUtils.java | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/smack-core/build.gradle b/smack-core/build.gradle index 0bbd02238..1c1441be5 100644 --- a/smack-core/build.gradle +++ b/smack-core/build.gradle @@ -8,6 +8,7 @@ Smack core components.""" ext { xmlUnitVersion = "2.6.0" + powerMockVersion = "1.7.3" } dependencies { @@ -20,10 +21,9 @@ dependencies { testCompile "org.junit.vintage:junit-vintage-engine:$junitVersion" testCompile "org.xmlunit:xmlunit-core:$xmlUnitVersion" testCompile "org.xmlunit:xmlunit-legacy:$xmlUnitVersion" - testCompile "org.powermock:powermock-module-junit4:1.6.4" - testCompile "org.powermock:powermock-module-junit4-rule:1.6.4" - testCompile "org.powermock:powermock-api-mockito:1.6.4" - testCompile "org.powermock:powermock-classloading-xstream:1.6.4" + testCompile "org.powermock:powermock-module-junit4:$powerMockVersion" + testCompile "org.powermock:powermock-module-junit4-rule:$powerMockVersion" + testCompile "org.powermock:powermock-api-mockito2:$powerMockVersion" testCompile 'com.jamesmurty.utils:java-xmlbuilder:0.6' testCompile 'net.iharder:base64:2.3.8' } diff --git a/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java b/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java index e7ebf7a49..cc2f51391 100644 --- a/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java +++ b/smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java @@ -16,9 +16,9 @@ */ package org.jivesoftware.util; -import static org.mockito.Matchers.anyInt; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.isA; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.ArgumentMatchers.anyLong; +import static org.mockito.ArgumentMatchers.isA; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when;