Add Keycloak 23

adorsys · Dec 5, 2023 · 047f6d9 · 047f6d9
1 parent cc36192
commit 047f6d9
Show file tree

Hide file tree

Showing 101 changed files with 3,700 additions and 899 deletions.
diff --git a/.env b/.env
@@ -1,3 +1,3 @@
 # Used in docker-compose
 # shellcheck disable=SC2034
-KEYCLOAK_VERSION=22.0.4
+KEYCLOAK_VERSION=23.0.1
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -29,10 +29,10 @@ jobs:
         env:
           # we keep 18.0.2 for backwards compatibility with RH-SSO 7.6
           - KEYCLOAK_VERSION: 18.0.2
-          - KEYCLOAK_VERSION: 19.0.3
           - KEYCLOAK_VERSION: 20.0.5
           - KEYCLOAK_VERSION: 21.1.1
           - KEYCLOAK_VERSION: 22.0.4
+          - KEYCLOAK_VERSION: 23.0.1
     steps:
       - uses: actions/checkout@v3
         with:
@@ -50,6 +50,11 @@ jobs:
           key: ${{ runner.os }}-maven-${{ matrix.env.KEYCLOAK_VERSION }}-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-maven-${{ matrix.env.KEYCLOAK_VERSION }}
 
+      - name: Adapt sources for Keycloak versions < 23.0.0 (UPConfig -> String)
+        if: ${{ matrix.env.KEYCLOAK_VERSION < '23.0.0' }}
+        run: |
+          echo "JAVAX_PROFILE=-Ppre-keycloak23" >> $GITHUB_ENV
+
       - name: Adapt sources for Keycloak versions < 22.0.0 (jakarta -> javax)
         if: ${{ matrix.env.KEYCLOAK_VERSION < '22.0.0' }}
         run: |
@@ -159,6 +164,11 @@ jobs:
           key: ${{ runner.os }}-${{ matrix.java }}-maven-build-pom-${{ hashFiles('**/pom.xml') }}
           restore-keys: ${{ runner.os }}-${{ matrix.java }}-maven-build-pom
 
+      - name: Adapt sources for Keycloak versions < 23.0.0 (UPConfig -> String)
+        if: ${{ matrix.env.KEYCLOAK_VERSION < '23.0.0' }}
+        run: |
+          echo "JAVAX_PROFILE=-Ppre-keycloak23" >> $GITHUB_ENV
+
       - name: Adapt sources for Keycloak versions < 22.0.0 (jakarta -> javax)
         if: ${{ matrix.env.KEYCLOAK_VERSION < '22.0.0' }}
         run: |
@@ -192,6 +202,11 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-keycloak-legacy
 
+      - name: Adapt sources for Keycloak versions < 23.0.0 (UPConfig -> String)
+        if: ${{ matrix.env.KEYCLOAK_VERSION < '23.0.0' }}
+        run: |
+          echo "JAVAX_PROFILE=-Ppre-keycloak23" >> $GITHUB_ENV
+
       - name: Adapt sources for Keycloak versions < 22.0.0 (jakarta -> javax)
         if: ${{ matrix.env.KEYCLOAK_VERSION < '22.0.0' }}
         run: |
@@ -239,7 +254,7 @@ jobs:
             ${{ runner.os }}-pip-chart-testing-action
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2.6.1
 
       - name: Run chart-testing (lint)
         run: ct lint --config contrib/charts/ct.yaml

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- Updated CI to use Keycloak 23.0.1
 
 ## [5.9.0] - 2023-10-13
 - Updated CI to use Keycloak 22.0.4

diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ FROM ${BUILDER_IMAGE} AS BUILDER
 
 WORKDIR /app/
 
-ARG KEYCLOAK_VERSION=22.0.4
+ARG KEYCLOAK_VERSION=23.0.1
 ARG MAVEN_CLI_OPTS="-ntp -B"
 
 COPY .mvn .mvn

diff --git a/README.md b/README.md
@@ -156,7 +156,7 @@ Additionally, the tag `maven` contains the source code and compile keycloak-conf
 Keycloak versions, that not official supported., e.g.:
 
 ```bash
-docker run --rm -ti -v $PWD:/config/ -eKEYCLOAK_VERSION=22.0.4 -eMAVEN_CLI_OPTS="-B -ntp -q" adorsys/keycloak-config-cli:edge-build
+docker run --rm -ti -v $PWD:/config/ -eKEYCLOAK_VERSION=23.0.1 -eMAVEN_CLI_OPTS="-B -ntp -q" adorsys/keycloak-config-cli:edge-build
 ```
 
 ### Docker run