diff --git a/.github/.scala-steward.conf b/.scala-steward.conf similarity index 56% rename from .github/.scala-steward.conf rename to .scala-steward.conf index de87e1776e..e84fad127e 100644 --- a/.github/.scala-steward.conf +++ b/.scala-steward.conf @@ -4,7 +4,8 @@ pullRequests.grouping = [ { name = "all", title = "build: scala-steward dependency updates", "filter" = [{"group" = "*"}] } ] -# updates.ignore = [ -# { groupId = "dev.zio", artifactId = "zio-json" }, #TODO +updates.ignore = [ # { groupId = "com.softwaremill.sttp.tapir", artifactId = "tapir-json-zio" }, #TODO -# ] + { groupId = "com.github.dasniko", artifactId = "testcontainers-keycloak" }, #TODO + { groupId = "org.keycloak", artifactId = "keycloak-authz-client" } #TODO +] diff --git a/build.sbt b/build.sbt index 81f073acbd..055dc9d2a2 100644 --- a/build.sbt +++ b/build.sbt @@ -68,7 +68,7 @@ lazy val V = new { val typesafeConfig = "1.4.3" val protobuf = "3.1.9" val testContainersScala = "0.41.3" - val testContainersJavaKeycloak = "3.3.0" // scala-steward:off + val testContainersJavaKeycloak = "3.2.0" // scala-steward:off val doobie = "1.0.0-RC5" val quill = "4.8.3" @@ -92,7 +92,7 @@ lazy val V = new { val micrometer = "1.11.11" val nimbusJwt = "10.0.0" - val keycloak = "23.0.7" // scala-steward:off + val keycloak = "23.0.7" // scala-steward:off //TODO 24.0.3 // update all quay.io/keycloak/keycloak } diff --git a/cloud-agent/service/server/src/test/scala/org/hyperledger/identus/iam/authorization/keycloak/admin/KeycloakPermissionManagementServiceSpec.scala b/cloud-agent/service/server/src/test/scala/org/hyperledger/identus/iam/authorization/keycloak/admin/KeycloakPermissionManagementServiceSpec.scala index cd8e01ba95..d27892b017 100644 --- a/cloud-agent/service/server/src/test/scala/org/hyperledger/identus/iam/authorization/keycloak/admin/KeycloakPermissionManagementServiceSpec.scala +++ b/cloud-agent/service/server/src/test/scala/org/hyperledger/identus/iam/authorization/keycloak/admin/KeycloakPermissionManagementServiceSpec.scala @@ -31,6 +31,7 @@ import zio.test.TestAspect.* import java.util.UUID +/* testOnly org.hyperledger.identus.iam.authorization.keycloak.admin.KeycloakPermissionManagementServiceSpec */ object KeycloakPermissionManagementServiceSpec extends ZIOSpecDefault with KeycloakTestContainerSupport diff --git a/infrastructure/shared/docker-compose-mt-keycloak.yml b/infrastructure/shared/docker-compose-mt-keycloak.yml index 788b16bae3..ea7f76d8b5 100644 --- a/infrastructure/shared/docker-compose-mt-keycloak.yml +++ b/infrastructure/shared/docker-compose-mt-keycloak.yml @@ -147,7 +147,7 @@ services: - swagger-ui keycloak: - image: quay.io/keycloak/keycloak:24.0.3 + image: quay.io/keycloak/keycloak:23.0.7 ports: - "9980:8080" environment: diff --git a/shared/test/src/test/scala/io/iohk/atala/sharedtest/containers/KeycloakTestContainer.scala b/shared/test/src/test/scala/io/iohk/atala/sharedtest/containers/KeycloakTestContainer.scala index e162fad07c..b8568422d9 100644 --- a/shared/test/src/test/scala/io/iohk/atala/sharedtest/containers/KeycloakTestContainer.scala +++ b/shared/test/src/test/scala/io/iohk/atala/sharedtest/containers/KeycloakTestContainer.scala @@ -4,7 +4,7 @@ import org.testcontainers.utility.DockerImageName object KeycloakTestContainer { def keycloakContainer( - imageName: String = "quay.io/keycloak/keycloak:24.0.3", + imageName: String = "quay.io/keycloak/keycloak:23.0.7", ): KeycloakContainerCustom = { val isOnGithubRunner = sys.env.contains("GITHUB_NETWORK") val container = diff --git a/tests/integration-tests/src/test/resources/containers/keycloak.yml b/tests/integration-tests/src/test/resources/containers/keycloak.yml index d07f1d69da..cbf9f72495 100644 --- a/tests/integration-tests/src/test/resources/containers/keycloak.yml +++ b/tests/integration-tests/src/test/resources/containers/keycloak.yml @@ -2,9 +2,8 @@ version: "3.8" services: - keycloak: - image: quay.io/keycloak/keycloak:24.0.3 + image: quay.io/keycloak/keycloak:23.0.7 ports: - "${KEYCLOAK_HTTP_PORT}:8080" environment: