diff --git a/fiat-ldap/fiat-ldap.gradle b/fiat-ldap/fiat-ldap.gradle index ddda357f6..db69da7de 100644 --- a/fiat-ldap/fiat-ldap.gradle +++ b/fiat-ldap/fiat-ldap.gradle @@ -22,4 +22,5 @@ dependencies { implementation "org.springframework.boot:spring-boot-autoconfigure" implementation "org.springframework.security:spring-security-ldap" implementation "com.google.guava:guava" + implementation "org.slf4j:slf4j-api" } diff --git a/fiat-roles/src/test/groovy/com/netflix/spinnaker/fiat/permissions/DefaultPermissionsResolverSpec.groovy b/fiat-roles/src/test/groovy/com/netflix/spinnaker/fiat/permissions/DefaultPermissionsResolverSpec.groovy index 33d376130..3e96302ac 100644 --- a/fiat-roles/src/test/groovy/com/netflix/spinnaker/fiat/permissions/DefaultPermissionsResolverSpec.groovy +++ b/fiat-roles/src/test/groovy/com/netflix/spinnaker/fiat/permissions/DefaultPermissionsResolverSpec.groovy @@ -340,10 +340,10 @@ class DefaultPermissionsResolverSpec extends Specification { ] when: - applicationProvider.getAllRestricted("user1", HashSet.of(role1), false) >> [testApp1].toSet() - applicationProvider.getAllRestricted("user2", HashSet.of(role1, role2), false) >> [testApp2].toSet() - applicationProvider.getAllRestricted("user3", HashSet.of(role1, roleAdmin), true) >> [testAppAdmin].toSet() - applicationProvider.getAllRestricted("abc@managed-service-accounts", HashSet.of(role1), false) >> [testApp1].toSet() + applicationProvider.getAllRestricted("user1", Set.of(role1), false) >> [testApp1].toSet() + applicationProvider.getAllRestricted("user2", Set.of(role1, role2), false) >> [testApp2].toSet() + applicationProvider.getAllRestricted("user3", Set.of(role1, roleAdmin), true) >> [testAppAdmin].toSet() + applicationProvider.getAllRestricted("abc@managed-service-accounts", Set.of(role1), false) >> [testApp1].toSet() def result = resolver.resolveResources(userToRoles) then: diff --git a/fiat-roles/src/test/groovy/com/netflix/spinnaker/fiat/providers/DefaultApplicationProviderSpec.groovy b/fiat-roles/src/test/groovy/com/netflix/spinnaker/fiat/providers/DefaultApplicationProviderSpec.groovy index be7e0bfdd..f394603dc 100644 --- a/fiat-roles/src/test/groovy/com/netflix/spinnaker/fiat/providers/DefaultApplicationProviderSpec.groovy +++ b/fiat-roles/src/test/groovy/com/netflix/spinnaker/fiat/providers/DefaultApplicationProviderSpec.groovy @@ -167,19 +167,19 @@ class DefaultApplicationProviderSpec extends Specification { setup: def front50Apps = [ new Application().setName("front50App1") - .setDetails(HashMap.of("foo", "bar", "xyz", "pqr")) + .setDetails(Map.of("foo", "bar", "xyz", "pqr")) .setPermissions(new Permissions.Builder().add(Authorization.READ, "role").build()), new Application().setName("front50App2") - .setDetails(HashMap.of("foo", "bar", "xyz", "pqr")) + .setDetails(Map.of("foo", "bar", "xyz", "pqr")) .setPermissions(new Permissions.Builder().add(Authorization.READ, "role").build()) ] def clouddriverApps = [ new Application().setName("clouddriverApp1") - .setDetails(HashMap.of("foo", "bar", "xyz", "pqr")) + .setDetails(Map.of("foo", "bar", "xyz", "pqr")) .setPermissions(new Permissions.Builder().add(Authorization.READ, "role").build()), new Application().setName("clouddriverApp2") - .setDetails(HashMap.of("foo", "bar", "xyz", "pqr")) + .setDetails(Map.of("foo", "bar", "xyz", "pqr")) .setPermissions(new Permissions.Builder().add(Authorization.READ, "role").build()) ] @@ -224,22 +224,22 @@ class DefaultApplicationProviderSpec extends Specification { setup: def testApps = [ new Application().setName("front50App1") - .setDetails(HashMap.of("foo", "bar", "xyz", "pqr")) + .setDetails(Map.of("foo", "bar", "xyz", "pqr")) .setPermissions(new Permissions.Builder().add(Authorization.READ, "role").build()), new Application().setName("front50App2") - .setDetails(HashMap.of("foo", "bar", "xyz", "pqr")) + .setDetails(Map.of("foo", "bar", "xyz", "pqr")) .setPermissions(new Permissions.Builder().add(Authorization.READ, "role").build()) ] Set expectedApps = [ new Application().setName("front50App1") - .setDetails(HashMap.of("foo", "bar", "xyz", "pqr")) + .setDetails(Map.of("foo", "bar", "xyz", "pqr")) .setPermissions(new Permissions.Builder() .add(Authorization.READ, "role") .add(Authorization.EXECUTE, "role") .build()), new Application().setName("front50App2") - .setDetails(HashMap.of("foo", "bar", "xyz", "pqr")) + .setDetails(Map.of("foo", "bar", "xyz", "pqr")) .setPermissions(new Permissions.Builder() .add(Authorization.READ, "role") .add(Authorization.EXECUTE, "role") diff --git a/fiat-sql-mysql/fiat-sql-mysql.gradle b/fiat-sql-mysql/fiat-sql-mysql.gradle index 32aaca5e7..c7b3a4bac 100644 --- a/fiat-sql-mysql/fiat-sql-mysql.gradle +++ b/fiat-sql-mysql/fiat-sql-mysql.gradle @@ -1,3 +1,3 @@ dependencies { - runtimeOnly("mysql:mysql-connector-java") + runtimeOnly("com.mysql:mysql-connector-j") } diff --git a/fiat-sql/fiat-sql.gradle b/fiat-sql/fiat-sql.gradle index 377caba75..5e7fe80d1 100644 --- a/fiat-sql/fiat-sql.gradle +++ b/fiat-sql/fiat-sql.gradle @@ -42,7 +42,7 @@ dependencies { testImplementation "dev.minutest:minutest" testImplementation "org.junit.jupiter:junit-jupiter-api" - testImplementation "mysql:mysql-connector-java" + testImplementation "com.mysql:mysql-connector-j" testImplementation "org.testcontainers:mysql" testImplementation "org.testcontainers:postgresql" diff --git a/gradle.properties b/gradle.properties index 3b98426ae..bac0e0d38 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ includeProviders=file,github,google-groups,ldap -korkVersion=7.229.0 +korkVersion=7.230.0 org.gradle.parallel=true spinnakerGradleVersion=8.32.1 targetJava11=true