From da73c9d2f105e87effbca5b989f6231b2050d4c0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 24 Jun 2024 09:17:28 +0200 Subject: [PATCH] Bump org.keycloak:keycloak-quarkus-server from 24.0.5 to 25.0.1 (#87) * Bump org.keycloak:keycloak-quarkus-server from 24.0.5 to 25.0.1 Bumps org.keycloak:keycloak-quarkus-server from 24.0.5 to 25.0.1. --- updated-dependencies: - dependency-name: org.keycloak:keycloak-quarkus-server dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * fix build --------- Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stephan Schnabel --- .github/workflows/pr.yaml | 3 ++- README.md | 5 ++--- pom.xml | 7 ++++++- .../kokuwa/keycloak/metrics/junit/KeycloakExtension.java | 3 ++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 86076da..f7def1a 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -51,7 +51,8 @@ jobs: - 21.1.2 - 22.0.5 - 23.0.7 - - 24.0.0 + - 24.0.5 + - 25.0.1 steps: - uses: actions/checkout@v4 - uses: actions/setup-java@v4 diff --git a/README.md b/README.md index 8ecb716..7a0a58b 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Keycloak Metrics -Provides metrics for Keycloak user/admin events and user/client/session count. Tested on Keycloak [21-24](.github/workflows/pr.yaml#L50-L54). +Provides metrics for Keycloak user/admin events and user/client/session count. Tested on Keycloak [21-25](.github/workflows/pr.yaml#L50-L55). [![Apache License, Version 2.0, January 2004](https://img.shields.io/github/license/kokuwaio/keycloak-event-metrics.svg?label=License)](http://www.apache.org/licenses/) [![Maven Central](https://img.shields.io/maven-central/v/io.kokuwa.keycloak/keycloak-event-metrics.svg?label=Maven%20Central)](https://central.sonatype.com/search?namespace=io.kokuwa.keycloak&q=keycloak-event-metrics) @@ -149,13 +149,12 @@ RUN mv ${METRICS_FILE} /opt/keycloak/providers ### build keycloak with metrics ### -FROM quay.io/keycloak/keycloak:23.0.7 +FROM quay.io/keycloak/keycloak:25.0.1 ENV KEYCLOAK_ADMIN=admin ENV KEYCLOAK_ADMIN_PASSWORD=password ENV KC_HEALTH_ENABLED=true ENV KC_METRICS_ENABLED=true -ENV KC_LOG_CONSOLE_COLOR=true COPY --from=metrics /opt/keycloak/providers /opt/keycloak/providers RUN /opt/keycloak/bin/kc.sh build diff --git a/pom.xml b/pom.xml index f9d03e7..9c8a3ec 100644 --- a/pom.xml +++ b/pom.xml @@ -69,7 +69,7 @@ - 24.0.5 + 25.0.1 ${version.org.keycloak} 1.18.3 @@ -127,6 +127,11 @@ jboss-logging provided + + org.jboss.logging + commons-logging-jboss-logging + test + org.hibernate.orm hibernate-core diff --git a/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java b/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java index c06c8f3..e2b1175 100644 --- a/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java +++ b/src/test/java/io/kokuwa/keycloak/metrics/junit/KeycloakExtension.java @@ -54,8 +54,9 @@ public class KeycloakExtension implements BeforeAllCallback, ParameterResolver { var container = new GenericContainer<>("quay.io/keycloak/keycloak:" + version) .withEnv("KEYCLOAK_ADMIN", "admin") .withEnv("KEYCLOAK_ADMIN_PASSWORD", "password") - .withEnv("KC_LOG_CONSOLE_COLOR", "true") .withEnv("KC_LOG_LEVEL", "io.kokuwa:trace") + // otherwise port 9000 will be used, with this config we can test different keycloak versions + .withEnv("KC_LEGACY_OBSERVABILITY_INTERFACE", "true") .withEnv("KC_HEALTH_ENABLED", "true") .withEnv("KC_METRICS_ENABLED", "true") .withEnv("KC_METRICS_STATS_ENABLED", "true")