From 94fae0544f7c941ba870ae184568d5f473e3c01c Mon Sep 17 00:00:00 2001
From: Garth <244253+xgp@users.noreply.github.com>
Date: Wed, 9 Feb 2022 20:12:54 +0100
Subject: [PATCH 1/6] bumped kc version
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3e2aa5a0..20d69af6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -9,8 +9,8 @@
1.0-SNAPSHOT
11
- 15.0.2
- 3.13.2.Final
+ 16.1.1
+ 3.15.1.Final
3.9.0
${java.version}
From c6172f5e57e153b5e86045b9bb1cc62517d6bf51 Mon Sep 17 00:00:00 2001
From: Garth <244253+xgp@users.noreply.github.com>
Date: Wed, 12 Jun 2024 20:34:29 +0200
Subject: [PATCH 2/6] update deps to 25. changed from model-legacy to
model-storage.
---
pom.xml | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a68dc19f..c92a0a4b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,8 +8,8 @@
keycloak-rest-provider
4.0.1-SNAPSHOT
- 17
- 24.0.5
+ 21
+ 25.0.0
5.12.0
${java.version}
@@ -54,10 +54,9 @@
provided
-
org.keycloak
- keycloak-model-legacy
+ keycloak-model-storage
${keycloak.version}
provided
From 2a21e8124c5f40fab1c6ee0eba6cbb878885b5c3 Mon Sep 17 00:00:00 2001
From: Garth <244253+xgp@users.noreply.github.com>
Date: Sat, 15 Jun 2024 16:40:57 +0200
Subject: [PATCH 3/6] requested updates to .env, README and github actions
---
.github/workflows/maven.yml | 4 ++--
.github/workflows/release.yml | 2 +-
README.md | 3 ++-
docker/.env | 6 +++---
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index a631cf9f..24d05f37 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -17,11 +17,11 @@ jobs:
# Disabling shallow clone is recommended for improving relevancy of reporting
fetch-depth: 0
- - name: Set up JDK 17
+ - name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
- java-version: 17
+ java-version: 21
- name: Cache SonarCloud packages
uses: actions/cache@v4
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 23db4192..46ae738c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
uses: actions/setup-java@v4
with:
distribution: adopt
- java-version: 17
+ java-version: 21
- name: Setup Git user
run: |
git config --local user.email "actions@github.com"
diff --git a/README.md b/README.md
index 45a8cb35..17dea7d2 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,8 @@ https://codesoapbox.dev/keycloak-user-migration
| Keycloak Version | Version/Commit |
|------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|
-| 24.X | [4.0.0](https://github.com/daniel-frak/keycloak-user-migration/releases/tag/4.0.0) |
+| 25.X | [5.0.0](https://github.com/daniel-frak/keycloak-user-migration/releases/tag/5.0.0) |
+| 24.X | [4.0.0](https://github.com/daniel-frak/keycloak-user-migration/releases/tag/4.0.0) |
| 23.X | [3.0.0](https://github.com/daniel-frak/keycloak-user-migration/releases/tag/3.0.0) |
| 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) |
diff --git a/docker/.env b/docker/.env
index f7c7a337..3800182c 100644
--- a/docker/.env
+++ b/docker/.env
@@ -1,7 +1,7 @@
COMPOSE_PROJECT_NAME=keycloak_migration_demo
-KEYCLOAK_IMAGE=quay.io/keycloak/keycloak:24.0.2
-MAVEN_IMAGE=maven:3.9.2-eclipse-temurin-17
-OPENJDK_IMAGE=openjdk:17-jdk-slim
+KEYCLOAK_IMAGE=quay.io/keycloak/keycloak:25.0.0
+MAVEN_IMAGE=maven:3.9.7-eclipse-temurin-21
+OPENJDK_IMAGE=openjdk:21-jdk-slim
SONAR_VERSION=9.4.0-community
SONAR_CONFIG_VERSION=3.13.5
From 2aa78a9b5957f22815991fc36ba5976a5e9d8e58 Mon Sep 17 00:00:00 2001
From: Garth <244253+xgp@users.noreply.github.com>
Date: Sun, 16 Jun 2024 21:38:29 +0200
Subject: [PATCH 4/6] changed version in readme to snapshot
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 17dea7d2..f3cb8185 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ https://codesoapbox.dev/keycloak-user-migration
| Keycloak Version | Version/Commit |
|------------------|----------------------------------------------------------------------------------------------------------------------------------------------------|
-| 25.X | [5.0.0](https://github.com/daniel-frak/keycloak-user-migration/releases/tag/5.0.0) |
+| 25.X | SNAPSHOT
| 24.X | [4.0.0](https://github.com/daniel-frak/keycloak-user-migration/releases/tag/4.0.0) |
| 23.X | [3.0.0](https://github.com/daniel-frak/keycloak-user-migration/releases/tag/3.0.0) |
| 22.X | [2.0.0](https://github.com/daniel-frak/keycloak-user-migration/releases/tag/2.0.0) |
From 0424bf3ebb79473fe911484dc49941af571b16bd Mon Sep 17 00:00:00 2001
From: Garth <244253+xgp@users.noreply.github.com>
Date: Mon, 15 Jul 2024 17:44:04 +0200
Subject: [PATCH 5/6] updated styles to pf5
---
docker/e2e/cypress/e2e/migrating_users.cy.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker/e2e/cypress/e2e/migrating_users.cy.js b/docker/e2e/cypress/e2e/migrating_users.cy.js
index 30c29502..05957d2c 100644
--- a/docker/e2e/cypress/e2e/migrating_users.cy.js
+++ b/docker/e2e/cypress/e2e/migrating_users.cy.js
@@ -69,7 +69,7 @@ describe('user migration plugin', () => {
cy.get('#kc-forgot-pw-switch').then(($checkbox) => {
if (!$checkbox.prop('checked')) {
cy.wrap($checkbox).check({ force: true });
- cy.get('.pf-c-alert__title').should('contain', "Forgot password changed successfully");
+ cy.get('.pf-v5-c-alert__title').should('contain', "Forgot password changed successfully");
}
});
}
@@ -81,7 +81,7 @@ describe('user migration plugin', () => {
.type('RESTclientprovider');
cy.get('#URI').clear().type(LEGACY_SYSTEM_URL);
cy.get('button').contains('Save').click()
- cy.get('.pf-c-alert__title').should('contain', "User federation provider successfully");
+ cy.get('.pf-v5-c-alert__title').should('contain', "User federation provider successfully");
}
/**
@@ -143,7 +143,7 @@ describe('user migration plugin', () => {
cy.get('button').contains('Save').click();
- cy.get('.pf-c-alert__title').should('contain', "Your account has been updated");
+ cy.get('.pf-v5-c-alert__title').should('contain', "Your account has been updated");
}
function configureSmtpSettings() {
@@ -154,7 +154,7 @@ describe('user migration plugin', () => {
cy.get('#kc-sender-email-address').clear().type(SMTP_FROM);
cy.get('button').contains('Test connection').click();
- cy.get('.pf-c-alert__title').should('contain', "Success! SMTP connection successful. E-mail was sent!");
+ cy.get('.pf-v5-c-alert__title').should('contain', "Success! SMTP connection successful. E-mail was sent!");
cy.get('button').contains('Save').click();
}
@@ -213,7 +213,7 @@ describe('user migration plugin', () => {
}
cy.wrap(btn).click({multiple: true});
cy.get('button[data-testid="save"]').contains('Save').click();
- cy.get('.pf-c-alert__title').should('contain', "Password policies successfully updated");
+ cy.get('.pf-v5-c-alert__title').should('contain', "Password policies successfully updated");
});
} else {
return 'OK';
@@ -342,7 +342,7 @@ describe('user migration plugin', () => {
cy.get('.pf-c-select__toggle').click()
cy.get('button[role="option"]').contains('Special Characters').click();
cy.get('button[data-testid="save"]').contains('Save').click();
- cy.get('.pf-c-alert__title').should('contain', "Password policies successfully updated");
+ cy.get('.pf-v5-c-alert__title').should('contain', "Password policies successfully updated");
}
function provideNewPassword() {
From 0fbcc4b71e97ec74ba7ca140f642226e5a20ac8c Mon Sep 17 00:00:00 2001
From: Garth <244253+xgp@users.noreply.github.com>
Date: Tue, 16 Jul 2024 20:54:30 +0200
Subject: [PATCH 6/6] revert to .pf-c-alert__title
---
docker/e2e/cypress/e2e/migrating_users.cy.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/docker/e2e/cypress/e2e/migrating_users.cy.js b/docker/e2e/cypress/e2e/migrating_users.cy.js
index dbc7ceec..9cca7b24 100644
--- a/docker/e2e/cypress/e2e/migrating_users.cy.js
+++ b/docker/e2e/cypress/e2e/migrating_users.cy.js
@@ -87,7 +87,7 @@ describe('user migration plugin', () => {
.type('RESTclientprovider');
cy.get('#URI').clear().type(LEGACY_SYSTEM_URL);
cy.get('button').contains('Save').click()
- cy.get('.pf-v5-c-alert__title').should('contain', "User federation provider successfully");
+ cy.get('.pf-c-alert__title').should('contain', "User federation provider successfully");
}
/**
@@ -149,7 +149,7 @@ describe('user migration plugin', () => {
cy.get('button').contains('Save').click();
- cy.get('.pf-v5-c-alert__title').should('contain', "Your account has been updated");
+ cy.get('.pf-c-alert__title').should('contain', "Your account has been updated");
}
function configureSmtpSettings() {
@@ -160,7 +160,7 @@ describe('user migration plugin', () => {
cy.get('#kc-sender-email-address').clear().type(SMTP_FROM);
cy.get('button').contains('Test connection').click();
- cy.get('.pf-v5-c-alert__title').should('contain', "Success! SMTP connection successful. E-mail was sent!");
+ cy.get('.pf-c-alert__title').should('contain', "Success! SMTP connection successful. E-mail was sent!");
cy.get('button').contains('Save').click();
}
@@ -220,7 +220,7 @@ describe('user migration plugin', () => {
}
cy.wrap(btn).click({multiple: true});
cy.get('button[data-testid="save"]').contains('Save').click();
- cy.get('.pf-v5-c-alert__title').should('contain', "Password policies successfully updated");
+ cy.get('.pf-c-alert__title').should('contain', "Password policies successfully updated");
});
} else {
return 'OK';
@@ -349,7 +349,7 @@ describe('user migration plugin', () => {
cy.get('.pf-c-select__toggle').click()
cy.get('button[role="option"]').contains('Special Characters').click();
cy.get('button[data-testid="save"]').contains('Save').click();
- cy.get('.pf-v5-c-alert__title').should('contain', "Password policies successfully updated");
+ cy.get('.pf-c-alert__title').should('contain', "Password policies successfully updated");
}
function provideNewPassword() {
@@ -357,4 +357,4 @@ describe('user migration plugin', () => {
cy.get('#password-confirm').type("pa$$word");
cy.get("input").contains("Submit").click();
}
-});
\ No newline at end of file
+});