diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0ce2653..8d8c4d4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -24,10 +24,17 @@ jobs:
restore-keys: |
${{ runner.os }}-maven-
- - name: Set up JDK 8
+ - name: Set up JDK 17
uses: actions/setup-java@v1
with:
- java-version: 8
+ java-version: 17
+
+ - name: get-pom-version
+ id: pom-version
+ uses: entimaniac/read-pom-version-action@1.0.0
+
+ - name: Print the version
+ run: echo "The version we just got is ${{ steps.pom-version.outputs.version }}"
- 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.*;