Merge pull request #950 from jmini/update-mockito

Update Mockito and JUnit

Author: jabby

pom.xml

@@ -55,9 +55,9 @@
 		<servlet.version>6.0.0</servlet.version>
 		<activation.version>2.1.1</activation.version>
 
-		<junit.version>5.8.2</junit.version>
+		<junit.version>5.9.2</junit.version>
 		<testcontainers.version>1.15.3</testcontainers.version>
-		<mockito.version>4.4.0</mockito.version>
+		<mockito.version>5.2.0</mockito.version>
 		<hamcrest.version>1.3</hamcrest.version>
 		<systemRules.version>1.19.0</systemRules.version>
 
@@ -432,7 +432,7 @@
 		<dependency>
 			<groupId>uk.org.webcompere</groupId>
 			<artifactId>system-stubs-jupiter</artifactId>
-			<version>1.2.0</version>
+			<version>2.0.2</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

src/test/java/org/gitlab4j/api/TestCommitDiscussionsApi.java

@@ -35,7 +35,7 @@ public void setUp() throws Exception {
         response = new MockResponse(Discussion.class,  null,  "commit-discussions.json");
         when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient);
         when(gitLabApiClient.validateSecretToken(any())).thenReturn(true);
-        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.<Object>any())).thenReturn(response);
+        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response);
     }
 
     @Test

src/test/java/org/gitlab4j/api/TestEpicDiscussionsApi.java

@@ -34,7 +34,7 @@ public void setUp() throws Exception {
         response = new MockResponse(Discussion.class,  null,  "epic-discussions.json");
         when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient);
         when(gitLabApiClient.validateSecretToken(any())).thenReturn(true);
-        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.<Object>any())).thenReturn(response);
+        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response);
     }
 
     @Test

src/test/java/org/gitlab4j/api/TestExternalStatusCheckApi.java

@@ -64,7 +64,7 @@ private void initGetExternalStatusChecks() throws Exception, IOException {
         response = new MockResponse(ExternalStatusCheck.class, null, "external-status-checks.json");
         when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient);
         when(gitLabApiClient.validateSecretToken(any())).thenReturn(true);
-        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.<Object>any())).thenReturn(response);
+        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response);
     }
 
     @Test
@@ -96,6 +96,6 @@ private void initGetExternalStatusCheckStatuses() throws Exception, IOException
         response = new MockResponse(ExternalStatusCheckStatus.class, null, "external-status-check-statuses.json");
         when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient);
         when(gitLabApiClient.validateSecretToken(any())).thenReturn(true);
-        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.<Object>any())).thenReturn(response);
+        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response);
     }
 }

src/test/java/org/gitlab4j/api/TestIssueDiscussionsApi.java

@@ -34,7 +34,7 @@ public void setUp() throws Exception {
         response = new MockResponse(Discussion.class,  null,  "issue-discussions.json");
         when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient);
         when(gitLabApiClient.validateSecretToken(any())).thenReturn(true);
-        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.<Object>any())).thenReturn(response);
+        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response);
     }
 
     @Test

src/test/java/org/gitlab4j/api/TestMergeRequestDiscussionsApi.java

@@ -34,7 +34,7 @@ public void setUp() throws Exception {
         response = new MockResponse(Discussion.class,  null,  "merge-request-discussions.json");
         when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient);
         when(gitLabApiClient.validateSecretToken(any())).thenReturn(true);
-        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.<Object>any())).thenReturn(response);
+        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response);
     }
 
     @Test

src/test/java/org/gitlab4j/api/TestReleaseLinksApi.java

@@ -63,6 +63,6 @@ private void initGetLinks() throws Exception, IOException {
         response = new MockResponse(Link.class, null, "links.json");
         when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient);
         when(gitLabApiClient.validateSecretToken(any())).thenReturn(true);
-        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.<Object>any())).thenReturn(response);
+        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response);
     }
 }

src/test/java/org/gitlab4j/api/TestRepositorySubmodulesApi.java

@@ -43,6 +43,6 @@ private void init() throws Exception, IOException {
         response = new MockResponse(Commit.class, "commit.json", null);
         when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient);
         when(gitLabApiClient.validateSecretToken(any())).thenReturn(true);
-        when(gitLabApiClient.put(attributeCaptor.capture(), Mockito.<Object>any())).thenReturn(response);
+        when(gitLabApiClient.put(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response);
     }
 }

src/test/java/org/gitlab4j/api/TestSnippetDiscussionsApi.java

@@ -34,7 +34,7 @@ public void setUp() throws Exception {
         response = new MockResponse(Discussion.class,  null, "snippet-discussions.json");
         when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient);
         when(gitLabApiClient.validateSecretToken(any())).thenReturn(true);
-        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.<Object>any())).thenReturn(response);
+        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response);
     }
 
     @Test

src/test/java/org/gitlab4j/api/TestStreams.java

@@ -48,7 +48,7 @@ public void setup() throws Exception {
         response = new MockResponse(User.class, null, "user-list.json");
         when(gitLabApi.getApiClient()).thenReturn(gitLabApiClient);
         when(gitLabApiClient.validateSecretToken(any())).thenReturn(true);
-        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.<Object>any())).thenReturn(response);
+        when(gitLabApiClient.get(attributeCaptor.capture(), Mockito.any(Object[].class))).thenReturn(response);
     }
 
     @Test

src/test/java/org/gitlab4j/api/TestUnitMergeRequestApi.java

@@ -33,7 +33,7 @@ public void setUp() throws Exception {
         when(mockGitLabApi.getApiClient()).thenReturn(mockedGitLabApiClient);
 
         when(mockedGitLabApiClient.validateSecretToken(any())).thenReturn(true);
-        when(mockedGitLabApiClient.put(attributeCaptor.capture(), Mockito.<Object>any()))
+        when(mockedGitLabApiClient.put(attributeCaptor.capture(), Mockito.any(Object[].class)))
                 .thenReturn(mockedResponse);
     }