From 0599c087b08ba51812713627fd0ba6c6140e7ba2 Mon Sep 17 00:00:00 2001
From: Florian Hockmann <fh@florian-hockmann.de>
Date: Wed, 22 Jun 2022 14:47:54 +0200
Subject: [PATCH] Update test dependencies

This updates JUnit, TestContainers, Lombok, and Mockito together as it
wasn't possible to only update TestContainers alone since it also
depends on JUnit, see PR #2972.
The same applies to Mockito.

These changes were necessary to update Mockito to v4:

Import of `org.mockito.Matchers` needed to be changed to
`org.mockito.ArgumentMatchers`. `Matchers` was already only an alias
for `ArgumentMatchers` before as described in the release notes:
https://github.com/mockito/mockito/releases/tag/v4.0.0

`any()` is the replacement for `anyObject()`:
https://github.com/mockito/mockito/pull/1931

Signed-off-by: Florian Hockmann <fh@florian-hockmann.de>
---
 .../diskstorage/es/rest/RestClientSetupTest.java       |  3 +--
 .../inmemory/InMemoryColumnValueStoreTest.java         |  2 +-
 pom.xml                                                | 10 +++++-----
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/rest/RestClientSetupTest.java b/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/rest/RestClientSetupTest.java
index 5df74dd7a01..7b2c8755d89 100644
--- a/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/rest/RestClientSetupTest.java
+++ b/janusgraph-es/src/test/java/org/janusgraph/diskstorage/es/rest/RestClientSetupTest.java
@@ -63,7 +63,6 @@
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.anyBoolean;
 import static org.mockito.Mockito.anyInt;
-import static org.mockito.Mockito.anyObject;
 import static org.mockito.Mockito.anyString;
 import static org.mockito.Mockito.doReturn;
 import static org.mockito.Mockito.eq;
@@ -306,7 +305,7 @@ private CredentialsProvider basicAuthTestBase(final Map<String, String> extraCon
                 );
 
         final HttpAsyncClientBuilder hacb = mock(HttpAsyncClientBuilder.class);
-        doReturn(hacb).when(hacb).setDefaultCredentialsProvider(anyObject());
+        doReturn(hacb).when(hacb).setDefaultCredentialsProvider(any());
         hccc.customizeHttpClient(hacb);
 
         final ArgumentCaptor<BasicCredentialsProvider> cpCaptor = ArgumentCaptor.forClass(BasicCredentialsProvider.class);
diff --git a/janusgraph-inmemory/src/test/java/org/janusgraph/diskstorage/inmemory/InMemoryColumnValueStoreTest.java b/janusgraph-inmemory/src/test/java/org/janusgraph/diskstorage/inmemory/InMemoryColumnValueStoreTest.java
index 19ca6200c98..36e77b61c38 100644
--- a/janusgraph-inmemory/src/test/java/org/janusgraph/diskstorage/inmemory/InMemoryColumnValueStoreTest.java
+++ b/janusgraph-inmemory/src/test/java/org/janusgraph/diskstorage/inmemory/InMemoryColumnValueStoreTest.java
@@ -39,7 +39,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
diff --git a/pom.xml b/pom.xml
index bc973844416..3e3f0eb8959 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,9 +57,9 @@
     <properties>
         <titan.compatible-versions>1.0.0,1.1.0-SNAPSHOT</titan.compatible-versions>
         <tinkerpop.version>3.5.3</tinkerpop.version>
-        <junit-platform.version>1.8.1</junit-platform.version>
-        <junit.version>5.8.1</junit.version>
-        <mockito.version>3.12.4</mockito.version>
+        <junit-platform.version>1.8.2</junit-platform.version>
+        <junit.version>5.8.2</junit.version>
+        <mockito.version>4.6.1</mockito.version>
         <jamm.version>0.3.0</jamm.version>
         <metrics.version>4.1.18</metrics.version>
         <slf4j.version>1.7.35</slf4j.version>
@@ -108,7 +108,7 @@
         <cassandra.version.sha256>bbe772956c841158e3228c3b6c8fc38cece6bceeface695473c59c0573039bf1</cassandra.version.sha256>
         <cassandra-driver.version>4.14.1</cassandra-driver.version>
         <scylladb.version>4.4.0</scylladb.version>
-        <testcontainers.version>1.16.2</testcontainers.version>
+        <testcontainers.version>1.17.2</testcontainers.version>
         <easymock.version>4.3</easymock.version>
         <protobuf.version>3.19.2</protobuf.version>
         <grpc.version>1.42.1</grpc.version>
@@ -1139,7 +1139,7 @@
             <dependency>
                 <groupId>org.projectlombok</groupId>
                 <artifactId>lombok</artifactId>
-                <version>1.18.18</version>
+                <version>1.18.24</version>
             </dependency>
             <dependency>
                 <groupId>org.osgi</groupId>