Merge pull request #166 from p2-inc/xgp/25

Update to Keycloak 25
daniel-frak · Jul 16, 2024 · db2732f · db2732f
2 parents b18c840 + 0fbcc4b
commit db2732f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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             | 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)                                                                 |
 | 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
@@ -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

diff --git a/docker/e2e/cypress/e2e/migrating_users.cy.js b/docker/e2e/cypress/e2e/migrating_users.cy.js
@@ -75,6 +75,7 @@ describe('user migration plugin', () => {
                     .as("saveForgotPassword");
                 cy.wrap($checkbox).check({ force: true });
                 cy.wait("@saveForgotPassword");
+
             }
         });
     }
@@ -356,4 +357,4 @@ describe('user migration plugin', () => {
         cy.get('#password-confirm').type("pa$$word");
         cy.get("input").contains("Submit").click();
     }
-});
+});
diff --git a/pom.xml b/pom.xml
@@ -8,8 +8,8 @@
     <artifactId>keycloak-rest-provider</artifactId>
     <version>4.0.1-SNAPSHOT</version>
     <properties>
-        <java.version>17</java.version>
-        <keycloak.version>24.0.5</keycloak.version>
+        <java.version>21</java.version>
+        <keycloak.version>25.0.0</keycloak.version>
         <mockito.version>5.12.0</mockito.version>
 
         <maven.compiler.target>${java.version}</maven.compiler.target>
@@ -54,10 +54,9 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- https://mvnrepository.com/artifact/org.keycloak/keycloak-model-legacy-->
         <dependency>
             <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-model-legacy</artifactId>
+            <artifactId>keycloak-model-storage</artifactId>
             <version>${keycloak.version}</version>
             <scope>provided</scope>
         </dependency>