From 992962d918283d912929b0162875cf958f7a86d8 Mon Sep 17 00:00:00 2001 From: oadham Date: Tue, 3 Mar 2026 13:29:16 +0100 Subject: [PATCH 1/4] .gitignore .idea folder entirely --- .gitignore | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index db75fcc..f581ce9 100644 --- a/.gitignore +++ b/.gitignore @@ -98,12 +98,7 @@ local.properties # When using Gradle or Maven with auto-import, you should exclude module files, # since they will be recreated, and may cause churn. Uncomment if using # auto-import. -.idea/artifacts -.idea/compiler.xml -.idea/jarRepositories.xml -.idea/modules.xml -.idea/*.iml -.idea/modules +.idea *.iml *.ipr From 4148d1ebe638dd6577606e775a33fda04531edfa Mon Sep 17 00:00:00 2001 From: oadham Date: Tue, 24 Mar 2026 15:11:08 +0100 Subject: [PATCH 2/4] .gitignore .logs folder --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f581ce9..91334ae 100644 --- a/.gitignore +++ b/.gitignore @@ -168,3 +168,5 @@ buildNumber.properties # End of https://www.toptal.com/developers/gitignore/api/maven,intellij+all,eclipse /patch-tool/.work/ + +.logs From 44365aed52ad70fef96b7af9c066bfede4e70f6b Mon Sep 17 00:00:00 2001 From: oadham Date: Thu, 16 Apr 2026 08:35:42 +0200 Subject: [PATCH 3/4] Clearer wording for the upgrade process that was already in the Readme --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e5b9110..adf915f 100644 --- a/README.md +++ b/README.md @@ -28,14 +28,14 @@ with a custom frontend. The steps are as follows: -1. Before you start make sure the latest release available in the plugin repo is up to date with master. +1. Pull the latest release available in the plugin repo, which should be the default branch. -2. Checkout the SAML-extended plugin and go to the `keycloak` branch +2. Make a branch called `keycloak`, only locally. Also, check it out. 3. Checkout the Keycloak source code and go to the correct release branch -4. For every class in the keycloak branch of the SAML-plugin, look up this class in the keycloak source code and paste it in the plugin. -Note that the packages in de saml plugin are the packages from the Keycloak codebase. For those that can run bash scripts there is an script that can do this for you. Simply run it with: +4. For every class in the keycloak branch of the SAML-plugin, look up this class in the keycloak source code and paste it in the plugin, +either manually or by running the script as below: ``` ./copy-source.sh -k -d @@ -43,7 +43,7 @@ Note that the packages in de saml plugin are the packages from the Keycloak code *Note: both dirs should not end in a /* -5. Next, rebase the `keycloak` branch onto `main` and address conflicts if they arise. +5. Next, rebase the `keycloak` branch onto the default branch (=latest release branch) and address conflicts if they arise. ``` git checkout master @@ -58,6 +58,7 @@ git rebase keycloak git checkout -b release/.x ``` +8. Remove your local `keycloak` branch. ## Building From 8067aeaf4e23d5a7396d1f0e880208b13ff9b12d Mon Sep 17 00:00:00 2001 From: oadham Date: Thu, 16 Apr 2026 08:43:11 +0200 Subject: [PATCH 4/4] KEYC-1143: (Readme) Expanded the Upgrade process with more explicit Testing. --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index adf915f..3d14dbc 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,14 @@ git checkout -b release/.x 8. Remove your local `keycloak` branch. +### Pull Request Reviews + +9. Run the new code from the PR through Test classes, not only `` but also ``. + +10. Also manually test ``&``. + + * Once that works, also test with mappers and encryption. + ## Building ```mvn clean package```