From b6aece1728ad724b07d8b6dec98a50f95b16f172 Mon Sep 17 00:00:00 2001
From: Stephan Schnabel <stephan.schnabel@posteo.de>
Date: Thu, 19 Dec 2024 08:55:51 +0100
Subject: [PATCH] Fix build, align keycloak dependencies to avoid mockito
 classpath issues

---
 .github/workflows/dependabot-auto-merge.yaml | 13 -------------
 .github/workflows/pr.yaml                    |  4 +---
 README.md                                    |  2 +-
 pom.xml                                      |  2 ++
 4 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 .github/workflows/dependabot-auto-merge.yaml

diff --git a/.github/workflows/dependabot-auto-merge.yaml b/.github/workflows/dependabot-auto-merge.yaml
deleted file mode 100644
index 1509e34..0000000
--- a/.github/workflows/dependabot-auto-merge.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: dependabot-auto-merge
-
-on: pull_request
-
-jobs:
-  auto-merge:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: ahmadnassri/action-dependabot-auto-merge@v2
-        with:
-          github-token: ${{ secrets.GIT_ACTION_TOKEN }}
-          target: minor
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 3ef129f..dd84d43 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -46,13 +46,11 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - 21.0.2
-          - 21.1.2
           - 22.0.5
           - 23.0.7
           - 24.0.5
           - 25.0.6
-          - 26.0.2
+          - 26.0.7
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-java@v4
diff --git a/README.md b/README.md
index 2eb12ed..d57d9b6 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-25](.github/workflows/pr.yaml#L50-L55).
+Provides metrics for Keycloak user/admin events and user/client/session count. Tested on Keycloak [22-26](.github/workflows/pr.yaml#L48-L53).
 
 [![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)
diff --git a/pom.xml b/pom.xml
index 9f03bc3..2bef6be 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,11 +100,13 @@
 		<dependency>
 			<groupId>org.keycloak</groupId>
 			<artifactId>keycloak-server-spi</artifactId>
+			<version>${version.org.keycloak.test}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.keycloak</groupId>
 			<artifactId>keycloak-server-spi-private</artifactId>
+			<version>${version.org.keycloak.test}</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-- 
2.47.2