Merge pull request #79 from mboisnard/keycloak-20

Update Github Action files & maven dependencies
InseeFr · Aug 19, 2023 · bc44d23 · bc44d23
2 parents e4da9f2 + e0985dd
commit bc44d23
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 57 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,20 +13,22 @@ 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') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: 17
+          java-package: 'jdk'
 
       - name: Build with Maven
         run: ./mvnw -B clean verify
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -12,23 +12,25 @@ 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') }}
           restore-keys: |
             ${{ runner.os }}-maven-
 
       - name: Set up JDK 17
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v3
         with:
+          distribution: 'temurin'
           java-version: 17
+          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
diff --git a/README.en.md b/README.en.md
@@ -92,9 +92,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
@@ -164,10 +164,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`
 

diff --git a/pom.xml b/pom.xml
@@ -123,12 +123,6 @@
           <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>