From b2888b57a517604f7d58367b750c75c0f99b6908 Mon Sep 17 00:00:00 2001
From: Mathieu Boisnard <mathieu.boisnard@lacombedulionvert.fr>
Date: Fri, 16 Dec 2022 00:31:55 +0100
Subject: [PATCH 1/3] Update Github Action

Signed-off-by: Mathieu Boisnard <mathieu.boisnard@lacombedulionvert.fr>
---
 .github/workflows/ci.yml  |  8 +++---
 .github/workflows/tag.yml | 55 ++++++++++-----------------------------
 2 files changed, 19 insertions(+), 44 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3b3b667..6df117b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,10 +13,10 @@ jobs:
     name: Build
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -24,9 +24,11 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: 11
+          java-package: 'jdk'
 
       - name: Build with Maven
         run: ./mvnw -B clean verify
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
index 8e0a001..90b0454 100644
--- a/.github/workflows/tag.yml
+++ b/.github/workflows/tag.yml
@@ -12,10 +12,10 @@ jobs:
     outputs:
       version: ${{ steps.get_version.outputs.VERSION }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Cache local Maven repository
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: ~/.m2/repository
           key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
@@ -23,12 +23,14 @@ jobs:
             ${{ runner.os }}-maven-
 
       - name: Set up JDK 11
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: 11
+          java-package: 'jdk'
 
       - id: get_version
-        run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
+        run: echo "VERSION=$(echo $GITHUB_REF | cut -d / -f 3)" >> $GITHUB_OUTPUT
 
       - name: Set current version
         run: ./mvnw -B versions:set -DnewVersion=${{ steps.get_version.outputs.VERSION }}
@@ -37,7 +39,7 @@ jobs:
         run: ./mvnw -B clean verify
 
       - name: Upload jar
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: jar
           path: target/*.jar
@@ -48,50 +50,21 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v3
         with:
           name: jar
           path: target
 
       - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        uses: softprops/action-gh-release@v1
         with:
           tag_name: ${{ needs.build.outputs.version }}
-          release_name: ${{ needs.build.outputs.version }}
+          name: ${{ needs.build.outputs.version }}
           body: |
             ${{github.event.head_commit.message}}
           draft: false
           prerelease: false
-
-      - name: Upload Release javadoc
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./target/keycloak-franceconnect-${{ needs.build.outputs.version }}-javadoc.jar
-          asset_name: keycloak-franceconnect-${{ needs.build.outputs.version }}-javadoc.jar
-          asset_content_type: jar
-
-      - name: Upload Release sources
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./target/keycloak-franceconnect-${{ needs.build.outputs.version }}-sources.jar
-          asset_name: keycloak-franceconnect-${{ needs.build.outputs.version }}-sources.jar
-          asset_content_type: jar
-
-      - name: Upload Release
-        uses: actions/upload-release-asset@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./target/keycloak-franceconnect-${{ needs.build.outputs.version }}.jar
-          asset_name: keycloak-franceconnect-${{ needs.build.outputs.version }}.jar
-          asset_content_type: jar
+          files: |
+            ./target/keycloak-franceconnect-${{ needs.build.outputs.version }}-javadoc.jar
+            ./target/keycloak-franceconnect-${{ needs.build.outputs.version }}-sources.jar
+            ./target/keycloak-franceconnect-${{ needs.build.outputs.version }}.jar

From 985c7b4f6e3b38d5a53686584c5afd7980386285 Mon Sep 17 00:00:00 2001
From: Mathieu Boisnard <mathieu.boisnard@lacombedulionvert.fr>
Date: Tue, 27 Jun 2023 21:45:54 +0200
Subject: [PATCH 2/3] Update maven plugins dependencies

Signed-off-by: Mathieu Boisnard <mathieu.boisnard@lacombedulionvert.fr>
---
 pom.xml | 39 ++++++++++++---------------------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index 9e099d8..f388f86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,25 +59,24 @@
     <maven.compiler.source>11</maven.compiler.source>
     <maven.compiler.target>11</maven.compiler.target>
 
-    <maven.clean.plugin.version>3.1.0</maven.clean.plugin.version>
-    <maven.compiler.plugin.version>3.8.1</maven.compiler.plugin.version>
-    <maven.resources.plugin.version>3.2.0</maven.resources.plugin.version>
-    <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
-    <maven.jar.plugin.version>3.2.0</maven.jar.plugin.version>
-    <maven.install.plugin.version>3.0.0-M1</maven.install.plugin.version>
-    <maven.source.plugin.version>3.2.1</maven.source.plugin.version>
-    <maven.javadoc.plugin.version>3.3.1</maven.javadoc.plugin.version>
-    <wildfly.maven.plugin.version>2.1.0.Final</wildfly.maven.plugin.version>
+    <maven.clean.plugin.version>3.3.1</maven.clean.plugin.version>
+    <maven.compiler.plugin.version>3.11.0</maven.compiler.plugin.version>
+    <maven.resources.plugin.version>3.3.1</maven.resources.plugin.version>
+    <maven.surefire.plugin.version>3.1.2</maven.surefire.plugin.version>
+    <maven.jar.plugin.version>3.3.0</maven.jar.plugin.version>
+    <maven.install.plugin.version>3.1.1</maven.install.plugin.version>
+    <maven.source.plugin.version>3.3.0</maven.source.plugin.version>
+    <maven.javadoc.plugin.version>3.5.0</maven.javadoc.plugin.version>
 
     <keycloak.version>21.0.1</keycloak.version>
 
     <!-- Testing Tools -->
-    <junit.jupiter.version>5.8.1</junit.jupiter.version>
-    <assertj.version>3.21.0</assertj.version>
-    <mockito.version>4.0.0</mockito.version>
+    <junit.jupiter.version>5.9.3</junit.jupiter.version>
+    <assertj.version>3.24.2</assertj.version>
+    <mockito.version>5.4.0</mockito.version>
 
     <!-- Helper to build public/private keys for testing -->
-    <nimbus.jose-jwt.version>9.15.2</nimbus.jose-jwt.version>
+    <nimbus.jose-jwt.version>9.31</nimbus.jose-jwt.version>
   </properties>
 
   <build>
@@ -124,24 +123,10 @@
           <version>${maven.javadoc.plugin.version}</version>
         </plugin>
 
-        <plugin>
-          <groupId>org.wildfly.plugins</groupId>
-          <artifactId>wildfly-maven-plugin</artifactId>
-          <version>${wildfly.maven.plugin.version}</version>
-        </plugin>
-
       </plugins>
     </pluginManagement>
 
     <plugins>
-      <plugin>
-        <groupId>org.wildfly.plugins</groupId>
-        <artifactId>wildfly-maven-plugin</artifactId>
-        <configuration>
-          <skip>false</skip>
-        </configuration>
-      </plugin>
-
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-source-plugin</artifactId>

From c8d55e5f22275af342fb58b9dff5476c3f8b15e5 Mon Sep 17 00:00:00 2001
From: Mathieu Boisnard <mathieu.boisnard@lacombedulionvert.fr>
Date: Tue, 27 Jun 2023 21:46:06 +0200
Subject: [PATCH 3/3] Clean readme

Signed-off-by: Mathieu Boisnard <mathieu.boisnard@lacombedulionvert.fr>
---
 README.en.md | 5 ++---
 README.md    | 6 ++----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/README.en.md b/README.en.md
index 48c8d9b..b59ca22 100644
--- a/README.en.md
+++ b/README.en.md
@@ -91,9 +91,8 @@ Mappers examples:
 
 #### Theme
 
-This plugin provides 2 themes:
-* `fc-theme`
-* `iron-theme`
+This plugin provides 1 theme:
+* `fc-ac-theme`
 
 Choose your theme and go to the following url: `https://<keycloak-url>/auth/realms/<realm>/account`
 
diff --git a/README.md b/README.md
index ed15a0e..7b2a78f 100644
--- a/README.md
+++ b/README.md
@@ -163,10 +163,8 @@ Exemples de mappers :
 
 ### Thème
 
-Cette extension fournit 2 thèmes :
-* `fc-theme`
-* `iron-theme`
-* `ac-theme` 
+Cette extension fournit 1 thème :
+* `fc-ac-theme`
 
 Utilisez le thème de votre choix (selon le service que vous utilisez), et rendez-vous à l'adresse suivante : `https://<keycloak-url>/auth/realms/<realm>/account`