diff --git a/aws-xray-recorder-sdk-core/pom.xml b/aws-xray-recorder-sdk-core/pom.xml index 5ce85620..adb96322 100644 --- a/aws-xray-recorder-sdk-core/pom.xml +++ b/aws-xray-recorder-sdk-core/pom.xml @@ -60,20 +60,20 @@ org.mockito - mockito-all - 1.10.19 + mockito-core + 2.23.4 test org.powermock powermock-module-junit4 - 1.6.6 + 2.0.2 test org.powermock - powermock-api-mockito - 1.6.6 + powermock-api-mockito2 + 2.0.2 test diff --git a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/javax/servlet/AWSXRayServletFilterTest.java b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/javax/servlet/AWSXRayServletFilterTest.java index 27b27d7a..75cddc58 100644 --- a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/javax/servlet/AWSXRayServletFilterTest.java +++ b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/javax/servlet/AWSXRayServletFilterTest.java @@ -24,7 +24,7 @@ import org.junit.runners.MethodSorters; import org.mockito.ArgumentCaptor; import org.mockito.Mockito; -import org.mockito.internal.util.reflection.Whitebox; +import org.powermock.reflect.Whitebox; import com.amazonaws.xray.AWSXRay; import com.amazonaws.xray.AWSXRayRecorderBuilder; diff --git a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/LocalizedSamplingStrategyTest.java b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/LocalizedSamplingStrategyTest.java index 9d20d043..4f297948 100644 --- a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/LocalizedSamplingStrategyTest.java +++ b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/LocalizedSamplingStrategyTest.java @@ -8,7 +8,7 @@ import org.junit.FixMethodOrder; import org.junit.Test; import org.junit.runners.MethodSorters; -import org.mockito.internal.util.reflection.Whitebox; +import org.powermock.reflect.Whitebox; @FixMethodOrder(MethodSorters.JVM) public class LocalizedSamplingStrategyTest { diff --git a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/RulePollerTest.java b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/RulePollerTest.java index ad106941..a35c1257 100644 --- a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/RulePollerTest.java +++ b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/RulePollerTest.java @@ -5,7 +5,7 @@ import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; -import org.mockito.internal.util.reflection.Whitebox; +import org.powermock.reflect.Whitebox; import java.time.Clock; import java.util.concurrent.ScheduledExecutorService; diff --git a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/TargetPollerTest.java b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/TargetPollerTest.java index c9cf6f9a..93cbefab 100644 --- a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/TargetPollerTest.java +++ b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/pollers/TargetPollerTest.java @@ -5,7 +5,7 @@ import org.junit.Test; import org.junit.Assert; import org.mockito.Mockito; -import org.mockito.internal.util.reflection.Whitebox; +import org.powermock.reflect.Whitebox; import java.time.Clock; import java.util.concurrent.ScheduledExecutorService; diff --git a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/rule/CentralizedRuleTest.java b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/rule/CentralizedRuleTest.java index eae7aa1f..8f1cd8b4 100644 --- a/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/rule/CentralizedRuleTest.java +++ b/aws-xray-recorder-sdk-core/src/test/java/com/amazonaws/xray/strategy/sampling/rule/CentralizedRuleTest.java @@ -12,7 +12,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.Mockito; -import org.mockito.runners.MockitoJUnitRunner; +import org.mockito.junit.MockitoJUnitRunner; import org.powermock.reflect.Whitebox; import java.time.Clock; diff --git a/pom.xml b/pom.xml index e7cfce93..033fc584 100644 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ maven-javadoc-plugin - 2.10.4 + 3.0.1