Merge pull request #3095 from srdo/STORM-3478
STORM-3478: Upgrade to JUnit 5.5.1 and Mockito 3.0.0
diff --git a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
index 15d2295..99b7c9b 100644
--- a/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
+++ b/external/storm-kafka-client/src/test/java/org/apache/storm/kafka/spout/KafkaSpoutMessagingGuaranteeTest.java
@@ -90,8 +90,6 @@
spout.nextTuple();
- when(consumerMock.position(partition)).thenReturn(1L);
-
//The spout should have emitted the tuple, and must have committed it before emit
InOrder inOrder = inOrder(consumerMock, collectorMock);
inOrder.verify(consumerMock).poll(anyLong());
@@ -155,9 +153,6 @@
reset(consumerMock);
- when(consumerMock.poll(anyLong())).thenReturn(new ConsumerRecords<>(Collections.singletonMap(partition,
- SpoutWithMockedConsumerSetupHelper.createRecords(partition, 1, 1))));
-
spout.nextTuple();
//The consumer should not be seeking to retry the failed tuple, it should just be continuing from the current position
diff --git a/pom.xml b/pom.xml
index 3b587a7..18ad44c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -284,7 +284,7 @@
<log4j.version>2.11.2</log4j.version>
<slf4j.version>1.7.26</slf4j.version>
<metrics.version>3.2.6</metrics.version>
- <mockito.version>2.19.0</mockito.version>
+ <mockito.version>3.0.0</mockito.version>
<zookeeper.version>3.4.14</zookeeper.version>
<jline.version>0.9.94</jline.version>
<hive.version>2.3.4</hive.version>
@@ -295,7 +295,7 @@
<servlet.version>3.1.0</servlet.version>
<joda-time.version>2.3</joda-time.version>
<thrift.version>0.12.0</thrift.version>
- <junit.jupiter.version>5.5.0-M1</junit.jupiter.version>
+ <junit.jupiter.version>5.5.1</junit.jupiter.version>
<surefire.version>2.22.1</surefire.version>
<awaitility.version>3.1.0</awaitility.version>
<hdrhistogram.version>2.1.10</hdrhistogram.version>
