vanitasvitae
/
Smack
mirror of https://github.com/vanitasvitae/Smack.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Bump PowerMock to 1.7.3 

And also drop the powermock-classloading-xstream dependency as it is
currently not used.
This commit is contained in:
Florian Schmaus 2018-05-09 20:16:05 +02:00
parent 4cff9ddfa0
commit e5d93e58a1
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
smack-core/build.gradle
View File

@ -8,6 +8,7 @@ Smack core components."""
ext { ext {
xmlUnitVersion = "2.6.0" xmlUnitVersion = "2.6.0"
powerMockVersion = "1.7.3"
} }
dependencies { dependencies {
@ -20,10 +21,9 @@ dependencies {
testCompile "org.junit.vintage:junit-vintage-engine:$junitVersion" testCompile "org.junit.vintage:junit-vintage-engine:$junitVersion"
testCompile "org.xmlunit:xmlunit-core:$xmlUnitVersion" testCompile "org.xmlunit:xmlunit-core:$xmlUnitVersion"
testCompile "org.xmlunit:xmlunit-legacy:$xmlUnitVersion" testCompile "org.xmlunit:xmlunit-legacy:$xmlUnitVersion"
testCompile "org.powermock:powermock-module-junit4:1.6.4" testCompile "org.powermock:powermock-module-junit4:$powerMockVersion"
testCompile "org.powermock:powermock-module-junit4-rule:1.6.4" testCompile "org.powermock:powermock-module-junit4-rule:$powerMockVersion"
testCompile "org.powermock:powermock-api-mockito:1.6.4" testCompile "org.powermock:powermock-api-mockito2:$powerMockVersion"
testCompile "org.powermock:powermock-classloading-xstream:1.6.4"
testCompile 'com.jamesmurty.utils:java-xmlbuilder:0.6' testCompile 'com.jamesmurty.utils:java-xmlbuilder:0.6'
testCompile 'net.iharder:base64:2.3.8' testCompile 'net.iharder:base64:2.3.8'
} }

6
smack-extensions/src/test/java/org/jivesoftware/util/ConnectionUtils.java
View File

@ -16,9 +16,9 @@
*/ */
package org.jivesoftware.util; package org.jivesoftware.util;
import static org.mockito.Matchers.anyInt; import static org.mockito.ArgumentMatchers.anyInt;
import static org.mockito.Matchers.anyLong; import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Matchers.isA; import static org.mockito.ArgumentMatchers.isA;
import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;