Merge remote-tracking branch 'adorsys/main'

# Conflicts: # CHANGELOG.md
adorsys · Jan 15, 2024 · 3cbcb41 · 3cbcb41
2 parents 1b3b63e + efc3bfa
commit 3cbcb41
Show file tree

Hide file tree

Showing 119 changed files with 4,995 additions and 1,545 deletions.
diff --git a/.env b/.env
@@ -1,3 +1,3 @@
 # Used in docker-compose
 # shellcheck disable=SC2034
-KEYCLOAK_VERSION=22.0.0
+KEYCLOAK_VERSION=23.0.1
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -29,12 +29,12 @@ 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.0
+          - KEYCLOAK_VERSION: 22.0.4
+          - KEYCLOAK_VERSION: 23.0.1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -50,10 +50,15 @@ 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
+        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: |
-          echo "JAVAX_PROFILE=-Pjavax" >> $GITHUB_ENV
+          echo "JAVAX_PROFILE=-Ppre-keycloak22" >> $GITHUB_ENV
           echo "ADJUSTED_RESTEASY_VERSION=-Dresteasy.version=4.7.7.Final" >> $GITHUB_ENV
 
       - name: Build & Test
@@ -70,22 +75,22 @@ jobs:
         run: echo "::set-output name=VERSION::$(tail -n1 .env | cut -d= -f2)"
 
       - name: Login to Docker Hub
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.0
         if: startsWith(github.event.ref, 'refs/tags/v')
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
       - name: Login to Quay.io
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.0
         if: startsWith(github.event.ref, 'refs/tags/v')
         with:
           registry: quay.io
           username: ${{ secrets.QUAYIO_USERNAME }}
           password: ${{ secrets.QUAYIO_PASSWORD }}
 
       - name: Expose GitHub Runtime
-        uses: crazy-max/ghaction-github-runtime@v2
+        uses: crazy-max/ghaction-github-runtime@v3
 
       - name: Set up Docker Build Metadata
         id: docker_meta
@@ -145,7 +150,7 @@ jobs:
       matrix:
         java: [11, 17]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup java
         uses: actions/setup-java@v3
@@ -159,10 +164,15 @@ 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
+        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: |
-          echo "JAVAX_PROFILE=-Pjavax" >> $GITHUB_ENV
+          echo "JAVAX_PROFILE=-Ppre-keycloak22" >> $GITHUB_ENV
           echo "ADJUSTED_RESTEASY_VERSION=-Dresteasy.version=4.7.7.Final" >> $GITHUB_ENV
 
       - name: Build & Test
@@ -177,7 +187,7 @@ jobs:
         env:
           - KEYCLOAK_VERSION: 21.1.1
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup java
         uses: actions/setup-java@v3
@@ -192,10 +202,15 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-maven-keycloak-legacy
 
+      - name: Adapt sources for Keycloak versions < 23.0.0
+        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: |
-          echo "JAVAX_PROFILE=-Pjavax" >> $GITHUB_ENV
+          echo "JAVAX_PROFILE=-Ppre-keycloak22" >> $GITHUB_ENV
           echo "ADJUSTED_RESTEASY_VERSION=-Dresteasy.version=4.7.7.Final" >> $GITHUB_ENV
 
       - name: Build & Test
@@ -205,7 +220,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 10
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Lint .github/workflows/*.yaml files
         uses: ibiqlik/action-yamllint@v3.1
@@ -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
@@ -6,10 +6,27 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## [5.10.0] - 2023-12-12
+- Updated CI to use Keycloak 23.0.1
+- Added correct spelling of "authenticatorFlow" in all import files
+- Treating default-roles-${realm} as default role even with changed description
+- Supporting new group handling, also loading sub groups manually
+- Supporting new user profile configuration (UPConfig)
+- Removed deprecated authenticator "registration-profile-action" from tests
+- Extended maven-replacer-plugin with breaking changes
+- Using util classes as replacement strategy for breaking changes (GroupUtil, SubGroupUtil)
+
+## [5.9.0] - 2023-10-13
+- Updated CI to use Keycloak 22.0.4
+
 ### Added
 - Support for managing `Client Authorization Policies` like other resources by configuring `import.managed.client-authorization-policies=<full|no-delete>`. This prevents deletion of remote managed policies.
 - Support for managing `Client Authorization Scopes` like other resources by configuring `import.managed.client-authorization-scopes=<full|no-delete>`. This prevents deletion of remote managed scopes.
 
+### Changed
+- Fix issue [#907](/adorsys/keycloak-config-cli/issues/907):
+  - add missing dependency jakarta.xml.bind-api
+  - lower logstash version from 7.4 to 7.2: 7.2 is the last version to support logback 1.2, which is the version required for Spring and other components used here
 ## [5.8.0] - 2023-07-14
 
 ### Added
@@ -704,7 +721,9 @@ A lot of import properties are added over the years. this major release of keycl
 
 <!-- @formatter:off -->
 
-[Unreleased]: https://github.com/adorsys/keycloak-config-cli/compare/v5.8.0...HEAD
+[Unreleased]: https://github.com/adorsys/keycloak-config-cli/compare/v5.10.0...HEAD
+[5.10.0]: https://github.com/adorsys/keycloak-config-cli/compare/v5.9.0...v5.10.0
+[5.9.0]: https://github.com/adorsys/keycloak-config-cli/compare/v5.8.0...v5.9.0
 [5.8.0]: https://github.com/adorsys/keycloak-config-cli/compare/v5.7.0...v5.8.0
 [5.7.0]: https://github.com/adorsys/keycloak-config-cli/compare/v5.6.1...v5.7.0
 [5.6.1]: https://github.com/adorsys/keycloak-config-cli/compare/v5.6.0...v5.6.1

diff --git a/Dockerfile b/Dockerfile
@@ -6,7 +6,7 @@ FROM ${BUILDER_IMAGE} AS BUILDER
 
 WORKDIR /app/
 
-ARG KEYCLOAK_VERSION=22.0.0
+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.0 -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

diff --git a/contrib/charts/keycloak-config-cli/Chart.yaml b/contrib/charts/keycloak-config-cli/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: keycloak-config-cli
 description: Import JSON-formatted configuration files into Keycloak - Configuration as Code for Keycloak.
 home: https://github.com/adorsys/keycloak-config-cli
-version: 5.8.1-SNAPSHOT
-appVersion: 5.8.1-SNAPSHOT
+version: 5.10.1-SNAPSHOT
+appVersion: 5.10.1-SNAPSHOT
 maintainers:
   - name: jkroepke
     email: joe@adorsys.de