From a2879be8d7fe9afe6dfc4f88b2b13260af383b5a Mon Sep 17 00:00:00 2001
From: Stephan Schnabel <stephan.schnabel@posteo.de>
Date: Mon, 24 Apr 2023 14:30:07 +0200
Subject: [PATCH] Bump versions and include previous versions in build (#27)

---
 .github/workflows/ci.yaml      | 22 +++++++++++++++++++---
 .github/workflows/release.yaml |  1 -
 README.md                      |  2 +-
 pom.xml                        | 12 ++++++++++--
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f0a851e..8c6aab0 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -33,7 +33,6 @@ jobs:
           distribution: temurin
           java-version: 17
           cache: maven
-      - run: mvn -B -ntp dependency:go-offline
       - run: mvn -B -ntp javadoc:javadoc-no-fork -Ddoclint=all
 
   checkstyle:
@@ -45,7 +44,6 @@ jobs:
           distribution: temurin
           java-version: 17
           cache: maven
-      - run: mvn -B -ntp dependency:go-offline
       - run: mvn -B -ntp checkstyle:check
 
   build:
@@ -60,7 +58,6 @@ jobs:
           server-id: sonatype-nexus
           server-username: SERVER_USERNAME
           server-password: SERVER_PASSWORD
-      - run: mvn -B -ntp dependency:go-offline
       - run: mvn -B -ntp verify -Dcheckstyle.skip -Dmaven.test.redirectTestOutputToFile=false
         if: ${{ github.ref != 'refs/heads/main' }}
       - run: mvn -B -ntp deploy -Dcheckstyle.skip -Dmaven.test.redirectTestOutputToFile=false
@@ -68,3 +65,22 @@ jobs:
         env:
           SERVER_USERNAME: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
           SERVER_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+
+  versions:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - 21.0.0
+          - 21.0.1
+          - 21.0.2
+          - 21.1.0
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-java@v3
+        with:
+          distribution: temurin
+          java-version: 17
+          cache: maven
+      - run: mvn -B -ntp verify -Dcheckstyle.skip -Dmaven.test.redirectTestOutputToFile=false -Dversion.org.keycloak=${{ matrix.version }}
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 653e10d..8329bb7 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -25,7 +25,6 @@ jobs:
           server-password: SERVER_PASSWORD
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
           gpg-passphrase: GPG_PASSPHRASE
-      - run: mvn -B -ntp dependency:go-offline
       - run: mvn -B -ntp release:prepare
       - run: mvn -B -ntp release:perform
         env:
diff --git a/README.md b/README.md
index 23a4180..6bddad3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Keycloak Event Metrics
 
-Provides metrics for Keycloak user/admin events.
+Provides metrics for Keycloak user/admin events. Tested on Keycloak [20-21](.github/workflows/ci.yaml#L74-L77).
 
 [![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 0e52d09..bc195ae 100644
--- a/pom.xml
+++ b/pom.xml
@@ -98,7 +98,7 @@
 
 		<!-- dependencies -->
 
-		<version.org.keycloak>21.0.2</version.org.keycloak>
+		<version.org.keycloak>21.1.0</version.org.keycloak>
 		<version.org.mockito>5.2.0</version.org.mockito>
 		<version.org.testcontainers>1.18.0</version.org.testcontainers>
 
@@ -159,6 +159,14 @@
 					<groupId>com.openshift</groupId>
 					<artifactId>openshift-restclient-java</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.keycloak</groupId>
+					<artifactId>keycloak-admin-ui</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.keycloak</groupId>
+					<artifactId>keycloak-account-ui</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -374,7 +382,7 @@
 							</execution>
 						</executions>
 					</plugin>
-		
+
 					<!-- add javadoc for downstream projects -->
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>