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 extraCon ); final HttpAsyncClientBuilder hacb = mock(HttpAsyncClientBuilder.class); - doReturn(hacb).when(hacb).setDefaultCredentialsProvider(anyObject()); + doReturn(hacb).when(hacb).setDefaultCredentialsProvider(any()); hccc.customizeHttpClient(hacb); final ArgumentCaptor 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 f6d31e27a36..3e3f0eb8959 100644 --- a/pom.xml +++ b/pom.xml @@ -59,7 +59,7 @@ 3.5.3 1.8.2 5.8.2 - 3.12.4 + 4.6.1 0.3.0 4.1.18 1.7.35