From 229550bfb6416b7ca6f47868312a16c3a4f4030a Mon Sep 17 00:00:00 2001 From: dej Date: Wed, 2 Aug 2023 09:40:16 +0200 Subject: [PATCH] fix: upgrade to keycloak 22.0.x version --- .github/workflows/ci.yml | 33 --------- .../workflows/{tag.yml => create-release.yml} | 8 +-- .github/workflows/create-tag.yml | 43 ++++++++++++ .github/workflows/test-pr.yml | 33 +++++++++ docker-compose.yml | 5 +- pom.xml | 69 +++++++------------ .../requiredactions/VerifyEmailByCode.java | 6 +- .../VerifyEmailByCodeTest.java | 7 +- 8 files changed, 115 insertions(+), 89 deletions(-) delete mode 100644 .github/workflows/ci.yml rename .github/workflows/{tag.yml => create-release.yml} (96%) create mode 100644 .github/workflows/create-tag.yml create mode 100644 .github/workflows/test-pr.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml deleted file mode 100644 index 0ce2653..0000000 --- a/.github/workflows/ci.yml +++ /dev/null @@ -1,33 +0,0 @@ -name: Keycloak Verify email by code RedFroggy CI - -on: - push: - branches: - - "master" - - "main" - tags-ignore: - - "**" - pull_request: - -jobs: - build: - name: Build - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - - name: Cache local Maven repository - uses: actions/cache@v2 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} - restore-keys: | - ${{ runner.os }}-maven- - - - name: Set up JDK 8 - uses: actions/setup-java@v1 - with: - java-version: 8 - - - name: Build with Maven - run: mvn -B clean test diff --git a/.github/workflows/tag.yml b/.github/workflows/create-release.yml similarity index 96% rename from .github/workflows/tag.yml rename to .github/workflows/create-release.yml index 0efa3a8..5d88507 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/create-release.yml @@ -22,10 +22,10 @@ jobs: restore-keys: | ${{ runner.os }}-maven- - - name: Set up JDK 8 - uses: actions/setup-java@v1 - with: - java-version: 8 + - name: Set up JDK 17 + uses: actions/setup-java@v1 + with: + java-version: 17 - id: get_version run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3) diff --git a/.github/workflows/create-tag.yml b/.github/workflows/create-tag.yml new file mode 100644 index 0000000..f3d434b --- /dev/null +++ b/.github/workflows/create-tag.yml @@ -0,0 +1,43 @@ +name: CreateTag + +on: + workflow_dispatch: + +jobs: + build: + name: Build + runs-on: ubuntu-latest + outputs: + version: ${{ steps.get_version.outputs.VERSION }} + steps: + - uses: actions/checkout@v2 + + - name: Cache local Maven repository + uses: actions/cache@v2 + 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 + with: + java-version: 17 + + - name: Build with Maven + run: mvn -B clean verify + + - name: Set Release version + run: | + mvn versions:set -DremoveSnapshot -DgenerateBackupPoms=false + + - name: Get pom version + id: get_version + run: | + echo ::set-output name=VERSION::$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + + - uses: rickstaa/action-create-tag@v1 + id: "tag_create" + with: + tag: ${{ steps.get_version.outputs.VERSION }} diff --git a/.github/workflows/test-pr.yml b/.github/workflows/test-pr.yml new file mode 100644 index 0000000..fba7dd2 --- /dev/null +++ b/.github/workflows/test-pr.yml @@ -0,0 +1,33 @@ +name: Keycloak Verify email by code Red Froggy CI + +on: + push: + branches: + - "master" + - "main" + tags-ignore: + - "**" + pull_request: + +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Cache local Maven repository + uses: actions/cache@v2 + 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 + with: + java-version: 17 + + - name: Build with Maven + run: mvn -B clean test diff --git a/docker-compose.yml b/docker-compose.yml index 9f01020..689e83b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,18 +1,19 @@ version: '3.8' services: keycloak: - image: quay.io/keycloak/keycloak:21.0 + image: quay.io/keycloak/keycloak:22.0 command: [ 'start-dev --import-realm', '--debug', '--spi-required-action-VERIFY_EMAIL_CODE-code-length=5' ] volumes: - ./realm-config/local:/opt/keycloak/data/import - - ./target/keycloak-verify-email-by-code-21.0.0-SNAPSHOT.jar:/opt/keycloak/providers/keycloak-verify-email-by-code.jar + - ./target/keycloak-verify-email-by-code-22.0.0-SNAPSHOT.jar:/opt/keycloak/providers/keycloak-verify-email-by-code.jar environment: - KC_DB=dev-file - KEYCLOAK_ADMIN=admin - KEYCLOAK_ADMIN_PASSWORD=admin - DEBUG=true + - KC_LOG_LEVEL=debug - KC_FEATURES=scripts - KC_HTTP_PORT=9080 - KC_HTTPS_PORT=9443 diff --git a/pom.xml b/pom.xml index 50a72c0..a0a6510 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ fr.redfroggy.keycloak keycloak-verify-email-by-code - 21.0.1-SNAPSHOT + 22.0.0-SNAPSHOT ${project.groupId}:${project.artifactId} Action to verify email by code for Keycloak @@ -41,55 +41,52 @@ UTF-8 - 1.8 - 1.8 + 17 + 17 - 3.1.0 - 3.8.1 - 3.1.0 + 3.2.0 + 3.11.0 + 3.3.1 3.0.0-M4 - 3.2.0 - 3.0.0-M1 - 3.2.1 - 3.1.1 - 2.0.2.Final + 3.3.0 + 3.1.1 + 3.3.0 + 3.5.0 + + 22.0.1 + 3.5.3.Final - 21.0.1 5.9.1 4.8.0 3.23.1 - + + - org.apache.maven.plugins maven-clean-plugin ${maven.clean.plugin.version} + - org.apache.maven.plugins - maven-compiler-plugin - ${maven.compiler.plugin.version} - - - org.apache.maven.plugins maven-resources-plugin ${maven.resources.plugin.version} - org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.plugin.version} + + maven-surefire-plugin ${maven.surefire.plugin.version} - org.apache.maven.plugins maven-jar-plugin ${maven.jar.plugin.version} - org.apache.maven.plugins maven-install-plugin ${maven.install.plugin.version} @@ -99,29 +96,12 @@ ${maven.source.plugin.version} - org.apache.maven.plugins maven-javadoc-plugin ${maven.javadoc.plugin.version} - - - org.wildfly.plugins - wildfly-maven-plugin - ${wildfly.maven.plugin.version} - - - - - org.wildfly.plugins - wildfly-maven-plugin - - false - - - org.apache.maven.plugins maven-source-plugin @@ -156,27 +136,30 @@ ${keycloak.version} provided - org.keycloak keycloak-services ${keycloak.version} provided - org.keycloak keycloak-server-spi ${keycloak.version} provided - org.keycloak keycloak-server-spi-private ${keycloak.version} provided + + org.jboss.logging + jboss-logging + ${jboss-logging.version} + provided + org.junit.jupiter junit-jupiter-engine diff --git a/src/main/java/fr/redfroggy/keycloak/requiredactions/VerifyEmailByCode.java b/src/main/java/fr/redfroggy/keycloak/requiredactions/VerifyEmailByCode.java index b4a4a54..47fdfa7 100644 --- a/src/main/java/fr/redfroggy/keycloak/requiredactions/VerifyEmailByCode.java +++ b/src/main/java/fr/redfroggy/keycloak/requiredactions/VerifyEmailByCode.java @@ -17,6 +17,9 @@ package fr.redfroggy.keycloak.requiredactions; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; +import jakarta.ws.rs.core.UriBuilderException; import org.jboss.logging.Logger; import org.jboss.resteasy.spi.HttpRequest; import org.keycloak.Config; @@ -43,9 +46,6 @@ import org.keycloak.services.validation.Validation; import org.keycloak.sessions.AuthenticationSessionModel; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriBuilderException; import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; diff --git a/src/test/java/fr/redfroggy/keycloak/requiredactions/VerifyEmailByCodeTest.java b/src/test/java/fr/redfroggy/keycloak/requiredactions/VerifyEmailByCodeTest.java index 2ee4cfd..04bc8b3 100644 --- a/src/test/java/fr/redfroggy/keycloak/requiredactions/VerifyEmailByCodeTest.java +++ b/src/test/java/fr/redfroggy/keycloak/requiredactions/VerifyEmailByCodeTest.java @@ -1,5 +1,8 @@ package fr.redfroggy.keycloak.requiredactions; +import jakarta.ws.rs.core.MultivaluedHashMap; +import jakarta.ws.rs.core.MultivaluedMap; +import jakarta.ws.rs.core.Response; import org.jboss.resteasy.spi.HttpRequest; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -23,10 +26,6 @@ import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; -import javax.ws.rs.core.MultivaluedHashMap; -import javax.ws.rs.core.MultivaluedMap; -import javax.ws.rs.core.Response; - import static fr.redfroggy.keycloak.requiredactions.VerifyEmailByCode.*; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.*;