This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-omid.git
The following commit(s) were added to refs/heads/master by this push:
new 0aa3509c OMID-260 Align mockito version with Hadoop and HBase (#174)
0aa3509c is described below
commit 0aa3509c90bb8655dd9464fac647acc3ce6c5516
Author: Nihal Jain <[email protected]>
AuthorDate: Fri Nov 8 20:34:31 2024 +0530
OMID-260 Align mockito version with Hadoop and HBase (#174)
Also remove hamcrest dependency
---
.../omid/transaction/TestAsynchronousPostCommitter.java | 2 +-
.../java/org/apache/omid/transaction/TestCheckpoint.java | 2 +-
.../java/org/apache/omid/transaction/TestFilters.java | 2 +-
.../omid/transaction/TestHBaseTransactionClient.java | 2 +-
.../omid/transaction/TestHBaseTransactionManager.java | 8 ++++----
.../java/org/apache/omid/transaction/TestShadowCells.java | 12 ++++++------
.../apache/omid/transaction/TestTransactionCleanup.java | 6 +++---
hbase-coprocessor/pom.xml | 6 ------
.../java/org/apache/omid/transaction/TestCompaction.java | 2 +-
.../org/apache/omid/transaction/TestSnapshotFilter.java | 2 +-
pom.xml | 15 ++++-----------
.../test/java/org/apache/omid/tso/TestLeaseManager.java | 4 ++--
.../src/test/java/org/apache/omid/tso/TestPanicker.java | 6 +++---
.../org/apache/omid/tso/TestPersistenceProcessor.java | 6 +++---
.../apache/omid/tso/TestPersistenceProcessorHandler.java | 6 +++---
.../test/java/org/apache/omid/tso/TestReplyProcessor.java | 4 ++--
.../java/org/apache/omid/tso/TestRequestProcessor.java | 6 +++---
.../test/java/org/apache/omid/tso/TestRetryProcessor.java | 2 +-
.../org/apache/omid/tso/TestTSOChannelHandlerNetty.java | 14 +++++++-------
.../java/org/apache/omid/tso/TestTSOStateManager.java | 2 +-
.../java/org/apache/omid/tso/TestTimestampOracle.java | 6 +++---
.../java/org/apache/omid/tso/TestWorldTimeOracle.java | 6 +++---
...estIntegrationOfTSOClientServerBasicFunctionality.java | 2 +-
23 files changed, 55 insertions(+), 68 deletions(-)
diff --git
a/hbase-client/src/test/java/org/apache/omid/transaction/TestAsynchronousPostCommitter.java
b/hbase-client/src/test/java/org/apache/omid/transaction/TestAsynchronousPostCommitter.java
index 9a98b844..4464dd4b 100644
---
a/hbase-client/src/test/java/org/apache/omid/transaction/TestAsynchronousPostCommitter.java
+++
b/hbase-client/src/test/java/org/apache/omid/transaction/TestAsynchronousPostCommitter.java
@@ -17,7 +17,7 @@
*/
package org.apache.omid.transaction;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.times;
diff --git
a/hbase-client/src/test/java/org/apache/omid/transaction/TestCheckpoint.java
b/hbase-client/src/test/java/org/apache/omid/transaction/TestCheckpoint.java
index f05fc0a2..f5db44a8 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestCheckpoint.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestCheckpoint.java
@@ -20,7 +20,7 @@ package org.apache.omid.transaction;
import static org.apache.omid.transaction.CellUtils.hasCell;
import static org.apache.omid.transaction.CellUtils.hasShadowCell;
import static org.junit.Assert.assertEquals;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.spy;
import static org.testng.Assert.assertTrue;
diff --git
a/hbase-client/src/test/java/org/apache/omid/transaction/TestFilters.java
b/hbase-client/src/test/java/org/apache/omid/transaction/TestFilters.java
index 07cf0217..94a5ac74 100644
--- a/hbase-client/src/test/java/org/apache/omid/transaction/TestFilters.java
+++ b/hbase-client/src/test/java/org/apache/omid/transaction/TestFilters.java
@@ -17,7 +17,7 @@
*/
package org.apache.omid.transaction;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.spy;
import static org.testng.Assert.assertEquals;
diff --git
a/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionClient.java
b/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionClient.java
index ef5a24d8..243572df 100644
---
a/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionClient.java
+++
b/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionClient.java
@@ -21,7 +21,7 @@ import static
org.apache.omid.committable.CommitTable.CommitTimestamp.Location.C
import static
org.apache.omid.committable.CommitTable.CommitTimestamp.Location.COMMIT_TABLE;
import static
org.apache.omid.committable.CommitTable.CommitTimestamp.Location.NOT_PRESENT;
import static
org.apache.omid.committable.CommitTable.CommitTimestamp.Location.SHADOW_CELL;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.spy;
diff --git
a/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionManager.java
b/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionManager.java
index 86930e9c..ac7c9516 100644
---
a/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionManager.java
+++
b/hbase-client/src/test/java/org/apache/omid/transaction/TestHBaseTransactionManager.java
@@ -17,8 +17,8 @@
*/
package org.apache.omid.transaction;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anySetOf;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anySet;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.timeout;
@@ -84,7 +84,7 @@ public class TestHBaseTransactionManager extends OmidTestBase
{
txTable.put(tx1, put);
tm.commit(tx1);
- verify(tsoClient,
times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(),
anySetOf(HBaseCellId.class), anySetOf(HBaseCellId.class));
+ verify(tsoClient,
times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySet(), anySet());
// Create a read-only tx and verify that commit has not been
invoked again in the TSOClient
AbstractTransaction readOnlyTx = (AbstractTransaction) tm.begin();
@@ -94,7 +94,7 @@ public class TestHBaseTransactionManager extends OmidTestBase
{
assertTrue(readOnlyTx.getWriteSet().isEmpty());
tm.commit(readOnlyTx);
- verify(tsoClient,
times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(),
anySetOf(HBaseCellId.class), anySetOf(HBaseCellId.class));
+ verify(tsoClient,
times(EXPECTED_INVOCATIONS_FOR_COMMIT)).commit(anyLong(), anySet(), anySet());
assertEquals(readOnlyTx.getStatus(),
Transaction.Status.COMMITTED_RO);
}
diff --git
a/hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java
b/hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java
index 5e3f8926..d7019e4b 100644
---
a/hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java
+++
b/hbase-client/src/test/java/org/apache/omid/transaction/TestShadowCells.java
@@ -19,9 +19,9 @@ package org.apache.omid.transaction;
import static org.apache.omid.transaction.CellUtils.hasCell;
import static org.apache.omid.transaction.CellUtils.hasShadowCell;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyLong;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.never;
@@ -53,7 +53,7 @@ import org.apache.hadoop.hbase.client.Table;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.omid.committable.CommitTable;
import org.apache.omid.metrics.NullMetricsProvider;
-import org.mockito.Matchers;
+import org.mockito.ArgumentMatchers;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
import org.slf4j.Logger;
@@ -378,8 +378,8 @@ public class TestShadowCells extends OmidTestBase {
postCommitEnd.await();
return (List<KeyValue>)
invocation.callRealMethod();
}
-
}).when(snapshotFilter).filterCellsForSnapshot(Matchers.<List<Cell>>any(),
- any(HBaseTransaction.class), anyInt(),
Matchers.<Map<String, Long>>any(), Matchers.<Map<String,byte[]>>any());
+
}).when(snapshotFilter).filterCellsForSnapshot(ArgumentMatchers.<List<Cell>>any(),
+ any(HBaseTransaction.class), anyInt(),
ArgumentMatchers.<Map<String, Long>>any(),
ArgumentMatchers.<Map<String,byte[]>>any());
TransactionManager tm = newTransactionManager(context);
if (hasShadowCell(row,
diff --git
a/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java
b/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java
index 42eb5895..79003907 100644
---
a/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java
+++
b/hbase-client/src/test/java/org/apache/omid/transaction/TestTransactionCleanup.java
@@ -17,8 +17,8 @@
*/
package org.apache.omid.transaction;
-import static org.mockito.Matchers.anySetOf;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.anySet;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.testng.Assert.assertEquals;
@@ -78,7 +78,7 @@ public class TestTransactionCleanup extends OmidTestBase {
.when(mockedTSOClient).getNewStartTimestamp();
doReturn(abortingFF)
- .when(mockedTSOClient).commit(eq(START_TS),
anySetOf(HBaseCellId.class), anySetOf(HBaseCellId.class));
+ .when(mockedTSOClient).commit(eq(START_TS), anySet(),
anySet());
try (TransactionManager tm = newTransactionManager(context,
mockedTSOClient);
TTable txTable = new TTable(connection, TEST_TABLE)) {
diff --git a/hbase-coprocessor/pom.xml b/hbase-coprocessor/pom.xml
index 6f397c36..9f6285a2 100644
--- a/hbase-coprocessor/pom.xml
+++ b/hbase-coprocessor/pom.xml
@@ -137,12 +137,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
<artifactId>hbase-testing-util</artifactId>
diff --git
a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
index ca2dfae3..0ca1a132 100644
---
a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
+++
b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestCompaction.java
@@ -17,7 +17,7 @@
*/
package org.apache.omid.transaction;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
diff --git
a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestSnapshotFilter.java
b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestSnapshotFilter.java
index c07679a3..59cebff2 100644
---
a/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestSnapshotFilter.java
+++
b/hbase-coprocessor/src/test/java/org/apache/omid/transaction/TestSnapshotFilter.java
@@ -17,7 +17,7 @@
*/
package org.apache.omid.transaction;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
diff --git a/pom.xml b/pom.xml
index 58c4fd8f..99607f02 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,11 +166,10 @@
<protoc.version>2.5.0</protoc.version>
<protobuf.plugin.version>0.6.1</protobuf.plugin.version>
<junit.version>4.13.2</junit.version>
- <mockito.version>2.28.2</mockito.version>
+ <mockito.version>4.11.0</mockito.version>
<disruptor.version>3.2.0</disruptor.version>
<metrics.version>3.0.1</metrics.version>
<jcommander.version>1.82</jcommander.version>
- <hamcrest.version>1.3</hamcrest.version>
<guava.version>32.1.3-jre</guava.version>
<!-- 2.12+ shades guava -->
<curator.version>5.6.0</curator.version>
@@ -1266,16 +1265,10 @@
<dependency>
<groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
+ <artifactId>mockito-bom</artifactId>
<version>${mockito.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.hamcrest</groupId>
- <artifactId>hamcrest-all</artifactId>
- <version>${hamcrest.version}</version>
- <scope>test</scope>
+ <type>pom</type>
+ <scope>import</scope>
</dependency>
<dependency>
diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java
b/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java
index 77acfb16..798bc32b 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestLeaseManager.java
@@ -18,8 +18,8 @@
package org.apache.omid.tso;
import static org.apache.omid.tso.client.TSOClient.DEFAULT_ZK_CLUSTER;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.spy;
diff --git a/tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java
b/tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java
index e1625a78..6659b0a1 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestPanicker.java
@@ -35,9 +35,9 @@ import com.lmax.disruptor.BlockingWaitStrategy;
import java.io.IOException;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
diff --git
a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java
b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java
index e98336e9..50b217f9 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessor.java
@@ -37,9 +37,9 @@ import com.lmax.disruptor.BlockingWaitStrategy;
import java.io.IOException;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
diff --git
a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
index 3f77b42b..7cef4795 100644
---
a/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
+++
b/tso-server/src/test/java/org/apache/omid/tso/TestPersistenceProcessorHandler.java
@@ -34,9 +34,9 @@ import org.testng.annotations.Test;
import java.io.IOException;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.mock;
diff --git
a/tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java
b/tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java
index d1c5adea..0bdf3703 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestReplyProcessor.java
@@ -35,8 +35,8 @@ import org.testng.annotations.Test;
import com.lmax.disruptor.BlockingWaitStrategy;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.*;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
diff --git
a/tso-server/src/test/java/org/apache/omid/tso/TestRequestProcessor.java
b/tso-server/src/test/java/org/apache/omid/tso/TestRequestProcessor.java
index f5836dd5..77fd5d88 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestRequestProcessor.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestRequestProcessor.java
@@ -35,9 +35,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.timeout;
diff --git
a/tso-server/src/test/java/org/apache/omid/tso/TestRetryProcessor.java
b/tso-server/src/test/java/org/apache/omid/tso/TestRetryProcessor.java
index a5fdba82..84421d75 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestRetryProcessor.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestRetryProcessor.java
@@ -35,7 +35,7 @@ import org.testng.Assert;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
import static org.testng.Assert.assertEquals;
diff --git
a/tso-server/src/test/java/org/apache/omid/tso/TestTSOChannelHandlerNetty.java
b/tso-server/src/test/java/org/apache/omid/tso/TestTSOChannelHandlerNetty.java
index 269594f0..d71bd85a 100644
---
a/tso-server/src/test/java/org/apache/omid/tso/TestTSOChannelHandlerNetty.java
+++
b/tso-server/src/test/java/org/apache/omid/tso/TestTSOChannelHandlerNetty.java
@@ -55,11 +55,11 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyBoolean;
-import static org.mockito.Matchers.anyCollectionOf;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.ArgumentMatchers.anyCollection;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.reset;
import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
@@ -283,7 +283,7 @@ public class TestTSOChannelHandlerNetty {
channel.writeAndFlush(tsBuilder.build()).await();
verify(requestProcessor,
timeout(100).times(1)).timestampRequest(any(), any(MonitoringContext.class));
verify(requestProcessor, timeout(100).times(0))
- .commitRequest(anyLong(), anyCollectionOf(Long.class),
anyCollectionOf(Long.class), anyBoolean(), any(), any(MonitoringContext.class));
+ .commitRequest(anyLong(), anyCollection(), anyCollection(),
anyBoolean(), any(), any(MonitoringContext.class));
}
private void testWritingCommitRequest(Channel channel) throws
InterruptedException {
@@ -300,7 +300,7 @@ public class TestTSOChannelHandlerNetty {
channel.writeAndFlush(commitBuilder.build()).await();
verify(requestProcessor,
timeout(100).times(0)).timestampRequest(any(), any(MonitoringContext.class));
verify(requestProcessor, timeout(100).times(1))
- .commitRequest(eq(666L), anyCollectionOf(Long.class),
anyCollectionOf(Long.class), eq(false), any(), any(MonitoringContext.class));
+ .commitRequest(eq(666L), anyCollection(), anyCollection(),
eq(false), any(), any(MonitoringContext.class));
}
private void testWritingFenceRequest(Channel channel) throws
InterruptedException {
diff --git
a/tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java
b/tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java
index 9d87e793..05cf3a29 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestTSOStateManager.java
@@ -24,7 +24,7 @@ import org.testng.annotations.Test;
import java.io.IOException;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.timeout;
diff --git
a/tso-server/src/test/java/org/apache/omid/tso/TestTimestampOracle.java
b/tso-server/src/test/java/org/apache/omid/tso/TestTimestampOracle.java
index b7c7232f..b317e8d2 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestTimestampOracle.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestTimestampOracle.java
@@ -32,9 +32,9 @@ import org.testng.annotations.Test;
import java.util.concurrent.CountDownLatch;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.verify;
diff --git
a/tso-server/src/test/java/org/apache/omid/tso/TestWorldTimeOracle.java
b/tso-server/src/test/java/org/apache/omid/tso/TestWorldTimeOracle.java
index dd4e2be9..2f29137c 100644
--- a/tso-server/src/test/java/org/apache/omid/tso/TestWorldTimeOracle.java
+++ b/tso-server/src/test/java/org/apache/omid/tso/TestWorldTimeOracle.java
@@ -31,9 +31,9 @@ import org.testng.annotations.Test;
import java.util.concurrent.CountDownLatch;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyLong;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.atLeastOnce;
import static org.mockito.Mockito.doAnswer;
import static org.mockito.Mockito.verify;
diff --git
a/tso-server/src/test/java/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.java
b/tso-server/src/test/java/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.java
index b581b6f2..b1f9ff53 100644
---
a/tso-server/src/test/java/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.java
+++
b/tso-server/src/test/java/org/apache/omid/tso/client/TestIntegrationOfTSOClientServerBasicFunctionality.java
@@ -42,7 +42,7 @@ import java.util.HashSet;
import java.util.Set;
import java.util.concurrent.ExecutionException;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.*;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertFalse;
