diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 87b33f2..2d8d940 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,7 +11,7 @@ jobs: if: "!contains(github.event.head_commit.message, '[ci skip]')" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Release uses: qcastel/github-actions-maven-release@master diff --git a/pom.xml b/pom.xml index d409f9a..8c4293b 100644 --- a/pom.xml +++ b/pom.xml @@ -40,10 +40,9 @@ - https://github.com/p2-inc/keycloak-event-metrics - scm:git:https://github.com/p2-inc/keycloak-event-metrics.git - scm:git:https://github.com/p2-inc/keycloak-event-metrics.git - HEAD + https://github.com/p2-inc/keycloak-event-metrics + scm:git:git@github.com:p2-inc/keycloak-event-metrics.git + HEAD github @@ -60,16 +59,16 @@ - 17 - 17 + 21 + 21 - 17 - 24.0.5 + 21 + 25.0.1 ${version.org.keycloak} - 1.18.3 + 1.19.3 @@ -129,6 +128,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 752e1c3..316bdd3 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 void beforeAll(ExtensionContext context) throws Exception { 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_COMMUNITY_EVENTS_METRICS_ENABLED", "true")