diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 6fb3680a..d1b6506f 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -34,3 +34,16 @@ updates: include: "scope" schedule: interval: "daily" + + - package-ecosystem: "maven" + directory: "/" + target-branch: "main" + reviewers: + - "rangerrick" + labels: + - "dependencies" + commit-message: + prefix: "build" + include: "scope" + schedule: + interval: "weekly" diff --git a/cassandra/search/src/test/java/org/opennms/newts/cassandra/search/CassandraIndexerITCase.java b/cassandra/search/src/test/java/org/opennms/newts/cassandra/search/CassandraIndexerITCase.java index d5ee796f..cdfb7987 100644 --- a/cassandra/search/src/test/java/org/opennms/newts/cassandra/search/CassandraIndexerITCase.java +++ b/cassandra/search/src/test/java/org/opennms/newts/cassandra/search/CassandraIndexerITCase.java @@ -19,8 +19,8 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -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.atLeast; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; diff --git a/pom.xml b/pom.xml index f9df0521..9ad81041 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 4.13.2 1.2.13 4.2.25 - 1.10.19 + 4.11.0 4.1.107.Final 1.7.36 1.1.10.5 diff --git a/rest/src/test/java/org/opennms/newts/rest/HttpBasicAuthenticationFilterTest.java b/rest/src/test/java/org/opennms/newts/rest/HttpBasicAuthenticationFilterTest.java index 6795fec0..e0b0c12f 100644 --- a/rest/src/test/java/org/opennms/newts/rest/HttpBasicAuthenticationFilterTest.java +++ b/rest/src/test/java/org/opennms/newts/rest/HttpBasicAuthenticationFilterTest.java @@ -17,8 +17,8 @@ import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; -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.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/rest/src/test/java/org/opennms/newts/rest/MeasurementsResourceTest.java b/rest/src/test/java/org/opennms/newts/rest/MeasurementsResourceTest.java index 282a4430..79e2e21f 100644 --- a/rest/src/test/java/org/opennms/newts/rest/MeasurementsResourceTest.java +++ b/rest/src/test/java/org/opennms/newts/rest/MeasurementsResourceTest.java @@ -17,8 +17,8 @@ import static org.hamcrest.MatcherAssert.assertThat; -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.mock; import static org.mockito.Mockito.when; diff --git a/rest/src/test/java/org/opennms/newts/rest/SamplesResourceTest.java b/rest/src/test/java/org/opennms/newts/rest/SamplesResourceTest.java index b5575cdd..69047520 100644 --- a/rest/src/test/java/org/opennms/newts/rest/SamplesResourceTest.java +++ b/rest/src/test/java/org/opennms/newts/rest/SamplesResourceTest.java @@ -18,8 +18,8 @@ import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -import static org.mockito.Matchers.anyCollectionOf; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.anyCollection; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -55,7 +55,7 @@ public void testWriteSamples() { assertThat(response.getStatus(), equalTo(Response.Status.CREATED.getStatusCode())); - verify(m_repository).insert(anyCollectionOf(Sample.class)); + verify(m_repository).insert(anyCollection()); }