Merge pull request #10135 from gocd/dependabot/gradle/uk.org.webcompe…

…re-system-stubs-jupiter-2.0.1

Bump system-stubs-jupiter from 1.2.0 to 2.0.1

dependencies.gradle

@@ -99,7 +99,7 @@ final Map<String, String> libraries = [
   spring              : 'org.springframework:spring-core:4.3.30.RELEASE',
   springSecurity      : 'org.springframework.security:spring-security-config:4.2.20.RELEASE',
   springTestJunit5    : 'com.github.sbrannen:spring-test-junit5:1.5.0',
-  systemStubs         : 'uk.org.webcompere:system-stubs-jupiter:1.2.0',
+  systemStubs         : 'uk.org.webcompere:system-stubs-jupiter:2.0.1',
   testcontainers      : 'org.testcontainers:testcontainers:1.17.1',
   tinybundles         : 'org.ops4j.pax.tinybundles:tinybundles:3.0.0',
   tokenBucket         : 'org.isomorphism:token-bucket:1.7',

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=cd5c2958a107ee7f0722004a12d0f8559b4564c34daad7df06cffd4d12a426d0
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
+distributionSha256Sum=e6d864e3b5bc05cc62041842b306383fc1fefcec359e70cebb1d470a6094ca82
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

spark/spark-base/src/test/groovy/com/thoughtworks/go/spark/SecurityServiceTrait.groovy

@@ -27,9 +27,7 @@ import com.thoughtworks.go.spark.util.SecureRandom
 import com.thoughtworks.go.util.SystemEnvironment
 import org.junit.jupiter.api.AfterEach
 
-import static org.mockito.ArgumentMatchers.any
-import static org.mockito.ArgumentMatchers.anyString
-import static org.mockito.ArgumentMatchers.eq
+import static org.mockito.ArgumentMatchers.*
 import static org.mockito.Mockito.mock
 import static org.mockito.Mockito.when
 
@@ -91,7 +89,7 @@ trait SecurityServiceTrait {
 
     when(securityService.isUserAdmin(username)).thenReturn(false)
     when(securityService.isUserGroupAdmin(username)).thenReturn(true)
-    when(securityService.isUserAdminOfGroup(eq(username.username) as CaseInsensitiveString, eq(groupName))).thenReturn(true)
+    when(securityService.isUserAdminOfGroup(eq(username.username) as CaseInsensitiveString, eq(groupName) as String)).thenReturn(true)
     when(securityService.isUserAdminOfGroup(eq(username) as Username, any(String.class))).thenReturn(true)
 
     when(securityService.hasOperatePermissionForGroup(username.username, groupName)).thenReturn(true)
@@ -104,7 +102,7 @@ trait SecurityServiceTrait {
 
     when(securityService.isUserAdmin(username)).thenReturn(false)
     when(securityService.isUserGroupAdmin(username)).thenReturn(false)
-    when(securityService.isUserAdminOfGroup(eq(username.username) as CaseInsensitiveString, eq(groupName))).thenReturn(false)
+    when(securityService.isUserAdminOfGroup(eq(username.username) as CaseInsensitiveString, eq(groupName) as String)).thenReturn(false)
 
     PipelineGroups groups = mock(PipelineGroups.class)
     when(goConfigService.groups()).thenReturn(groups)