From edf4052234b664cdc5e58d12750be00b9968a88c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 4 Mar 2024 04:05:32 +0000 Subject: [PATCH 1/4] build(deps): bump org.mockito:mockito-core from 1.10.19 to 5.11.0 Bumps [org.mockito:mockito-core](https://github.com/mockito/mockito) from 1.10.19 to 5.11.0. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](https://github.com/mockito/mockito/compare/v1.10.19...v5.11.0) --- updated-dependencies: - dependency-name: org.mockito:mockito-core dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f9df0521..6e3247e4 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 4.13.2 1.2.13 4.2.25 - 1.10.19 + 5.11.0 4.1.107.Final 1.7.36 1.1.10.5 From 6d56f72ddb733c82c3d866cbe954add4a0ee1613 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Mon, 4 Mar 2024 09:26:52 -0500 Subject: [PATCH 2/4] fix incompatible changes from newer mockito --- .../newts/cassandra/search/CassandraIndexerITCase.java | 4 ++-- .../newts/rest/HttpBasicAuthenticationFilterTest.java | 4 ++-- .../org/opennms/newts/rest/MeasurementsResourceTest.java | 4 ++-- .../java/org/opennms/newts/rest/SamplesResourceTest.java | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) 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/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()); } From e26fc0aa9c65b889b59c8a51e9b755ed0efd2ea3 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Mon, 4 Mar 2024 10:43:53 -0500 Subject: [PATCH 3/4] let main get updated separately from release-3.x --- .github/dependabot.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) 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" From 6cdc7f42cac8fe5ed386a18eb3cafe321fc79bc3 Mon Sep 17 00:00:00 2001 From: Benjamin Reed Date: Mon, 4 Mar 2024 10:44:07 -0500 Subject: [PATCH 4/4] last mockito version that supports jdk8 is 4.x --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 6e3247e4..9ad81041 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ 4.13.2 1.2.13 4.2.25 - 5.11.0 + 4.11.0 4.1.107.Final 1.7.36 1.1.10.5