From 24eaa49086ccfd2630e53332830d3db5eff564e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Fr=C4=85k?= Date: Sun, 14 Apr 2024 09:57:16 +0200 Subject: [PATCH] chore: Update to Keycloak 23 --- CONTRIBUTING.md | 2 +- README.md | 3 ++- docker/.env | 2 +- docker/e2e/cypress/e2e/migrating_users.cy.js | 6 +----- pom.xml | 2 +- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index d64cbe7..37b6eda 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -76,7 +76,7 @@ Make sure your test cases are reasonable, readable and maintainable. Don't forge When updating the code to work with newer versions of Keycloak, remember to update the following: * `keycloak.version` in [pom.xml](pom.xml) (from https://mvnrepository.com/artifact/org.keycloak.bom/keycloak-spi-bom) * `KEYCLOAK_IMAGE` in [docker/.env](docker/.env) (from https://quay.io/repository/keycloak/keycloak?tab=tags) -* `Compatibility history` table in [README.md](README.md) +* `Compatibility history` table in [README.md](README.md) - the plugin version should be `SNAPSHOT` To check if the plugin works correctly after the upgrade: 1) Run `mvn clean package` in the project's root directory to run unit tests and build the plugin diff --git a/README.md b/README.md index bb041d1..02d6369 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,8 @@ https://codesoapbox.dev/keycloak-user-migration | Keycloak Version | Version/Commit | |------------------|----------------------------------------------------------------------------------------------------------------------------------------------------| -| 22.X | [2.0.0](https://github.com/daniel-frak/keycloak-user-migration/releases/tag/2.0.0) | +| 23.X | SNAPSHOT | +| 22.X | [2.0.0](https://github.com/daniel-frak/keycloak-user-migration/releases/tag/2.0.0) | | 21.X | [1.0.0](https://github.com/daniel-frak/keycloak-user-migration/releases/tag/1.0.0) | | 20.X | [f4836a26aff16009738d5f6c74af0f8e69ba8d26](https://github.com/daniel-frak/keycloak-user-migration/commit/64e2fb30b7eac94ca944a5ef2759dcc5417ad9b2) | | 19.X | [f4836a26aff16009738d5f6c74af0f8e69ba8d26](https://github.com/daniel-frak/keycloak-user-migration/commit/f4836a26aff16009738d5f6c74af0f8e69ba8d26) | diff --git a/docker/.env b/docker/.env index 310c075..b1b3c51 100644 --- a/docker/.env +++ b/docker/.env @@ -1,5 +1,5 @@ COMPOSE_PROJECT_NAME=keycloak_migration_demo -KEYCLOAK_IMAGE=quay.io/keycloak/keycloak:22.0.5 +KEYCLOAK_IMAGE=quay.io/keycloak/keycloak:23.0.7 MAVEN_IMAGE=maven:3.9.2-eclipse-temurin-17 OPENJDK_IMAGE=openjdk:17-jdk-slim diff --git a/docker/e2e/cypress/e2e/migrating_users.cy.js b/docker/e2e/cypress/e2e/migrating_users.cy.js index 567e352..afb65f7 100644 --- a/docker/e2e/cypress/e2e/migrating_users.cy.js +++ b/docker/e2e/cypress/e2e/migrating_users.cy.js @@ -48,16 +48,12 @@ describe('user migration plugin', () => { } function signOutViaUI() { - cy.get('#pf-dropdown-toggle-id-8').click() + cy.get('#pf-dropdown-toggle-id-6').click() cy.get('#sign-out').get('a').contains('Sign out').click({force: true}); } function configureLoginSettings() { cy.visit('/admin/master/console/#/master/realm-settings/login'); - - cy.get('#kc-forgot-pw-switch') - .uncheck({force: true}); - cy.wait(500); cy.get('#kc-forgot-pw-switch') .check({force: true}); cy.get('.pf-c-alert__title').should('contain', "Forgot password changed successfully"); diff --git a/pom.xml b/pom.xml index bb00dfb..9de230c 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ 2.0.1-SNAPSHOT 17 - 22.0.5 + 23.0.7 5.11.0 ${java.version}