Merge pull request #171 from OpenNMS/dependabot/maven/release-3.x/org…

….mockito-mockito-core-5.11.0 build(deps): bump org.mockito:mockito-core from 1.10.19 to 5.11.0
OpenNMS · Mar 4, 2024 · 6304560 · 6304560
2 parents 51012ab + 6cdc7f4
commit 6304560
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 10 deletions.
diff --git 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/...andra/search/src/test/java/org/opennms/newts/cassandra/search/CassandraIndexerITCase.java b/...andra/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
@@ -60,7 +60,7 @@
     <junitVersion>4.13.2</junitVersion>
     <logbackVersion>1.2.13</logbackVersion>
     <metricsVersion>4.2.25</metricsVersion>
-    <mockitoVersion>1.10.19</mockitoVersion>
+    <mockitoVersion>4.11.0</mockitoVersion>
     <nettyVersion>4.1.107.Final</nettyVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
     <snappyJavaVersion>1.1.10.5</snappyJavaVersion>

diff --git 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
@@ -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
@@ -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());
 
     }