Skip to content

Commit 0d8687a

Browse files
Bump mockito-core from 1.10.19 to 3.5.11 (#372)
* Bump mockito-core from 1.10.19 to 3.5.11 Bumps [mockito-core](https://github.com/mockito/mockito) from 1.10.19 to 3.5.11. - [Release notes](https://github.com/mockito/mockito/releases) - [Commits](mockito/mockito@v1.10.19...v3.5.11) Signed-off-by: dependabot[bot] <[email protected]> * Fix mockito match pattern for nullable string * Remove dependency versions provided by bom Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Liam Newman <[email protected]>
1 parent 21932bf commit 0d8687a

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

pom.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,6 @@
119119
<dependency>
120120
<groupId>org.jenkins-ci.plugins</groupId>
121121
<artifactId>jackson2-api</artifactId>
122-
<version>2.10.0</version>
123122
</dependency>
124123
<dependency>
125124
<groupId>org.jenkins-ci.plugins</groupId>
@@ -144,13 +143,11 @@
144143
<dependency>
145144
<groupId>org.mockito</groupId>
146145
<artifactId>mockito-core</artifactId>
147-
<version>1.10.19</version>
148146
<scope>test</scope>
149147
</dependency>
150148
<dependency>
151149
<groupId>org.hamcrest</groupId>
152150
<artifactId>hamcrest-core</artifactId>
153-
<version>2.2</version>
154151
<scope>test</scope>
155152
</dependency>
156153
<dependency>

src/test/java/com/cloudbees/jenkins/plugins/bitbucket/BitbucketClientMockUtils.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
import java.util.List;
4848
import jenkins.model.Jenkins;
4949

50+
import static org.mockito.ArgumentMatchers.nullable;
5051
import static org.mockito.Mockito.any;
5152
import static org.mockito.Mockito.anyString;
5253
import static org.mockito.Mockito.mock;
@@ -57,7 +58,7 @@ public class BitbucketClientMockUtils {
5758
public static BitbucketCloudApiClient getAPIClientMock(BitbucketRepositoryType type, boolean includePullRequests,
5859
boolean includeWebHooks) throws IOException, InterruptedException {
5960
BitbucketCloudApiClient bitbucket = mock(BitbucketCloudApiClient.class);
60-
when(bitbucket.getRepositoryUri(any(BitbucketRepositoryType.class), any(BitbucketRepositoryProtocol.class), anyString(), anyString(), anyString())).thenCallRealMethod();
61+
when(bitbucket.getRepositoryUri(any(BitbucketRepositoryType.class), any(BitbucketRepositoryProtocol.class), nullable(String.class), anyString(), anyString())).thenCallRealMethod();
6162
// mock branch list
6263
List<BitbucketCloudBranch> branches = new ArrayList<>();
6364
branches.add(getBranch("branch1", "52fc8e220d77ec400f7fc96a91d2fd0bb1bc553a"));

0 commit comments

Comments
 (0)