update to kc22. jakarta dep changes. (#42)

pom.xml

@@ -30,7 +30,7 @@
  <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
  <main.java.package>io.phasetwo.keycloak.magic</main.java.package>
  <junit.version>4.13.2</junit.version>
- <keycloak.version>21.1.2</keycloak.version>
+ <keycloak.version>22.0.0</keycloak.version>
  <lombok.version>1.18.28</lombok.version>
  <auto-service.version>1.1.1</auto-service.version>
  <ossrh.url>https://s01.oss.sonatype.org</ossrh.url>
@@ -160,15 +160,15 @@
  <scope>provided</scope>
  </dependency>
  <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.1.1</version>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ <version>3.1.0</version>
  <scope>provided</scope>
  </dependency>
  <dependency>
- <groupId>javax.validation</groupId>
- <artifactId>validation-api</artifactId>
- <version>1.1.0.Final</version>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>3.0.2</version>
  <scope>provided</scope>
  </dependency>
 

src/main/java/io/phasetwo/keycloak/magic/MagicLink.java

@@ -4,14 +4,14 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Maps;
 import io.phasetwo.keycloak.magic.auth.token.MagicLinkActionToken;
+import jakarta.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.UriInfo;
 import java.net.URI;
 import java.util.List;
 import java.util.Map;
 import java.util.OptionalInt;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
-import javax.ws.rs.core.UriBuilder;
-import javax.ws.rs.core.UriInfo;
 import lombok.extern.jbosslog.JBossLog;
 import org.keycloak.Config;
 import org.keycloak.authentication.Authenticator;

src/main/java/io/phasetwo/keycloak/magic/auth/EmailOtpAuthenticator.java

@@ -2,9 +2,9 @@
 
 import com.google.common.collect.ImmutableList;
 import io.phasetwo.keycloak.magic.MagicLink;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
 import java.util.concurrent.ThreadLocalRandom;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
 import lombok.extern.jbosslog.JBossLog;
 import org.keycloak.authentication.AuthenticationFlowContext;
 import org.keycloak.authentication.Authenticator;

src/main/java/io/phasetwo/keycloak/magic/auth/MagicLinkAuthenticator.java

@@ -4,12 +4,12 @@
 
 import io.phasetwo.keycloak.magic.MagicLink;
 import io.phasetwo.keycloak.magic.auth.token.MagicLinkActionToken;
+import jakarta.mail.internet.AddressException;
+import jakarta.mail.internet.InternetAddress;
+import jakarta.ws.rs.core.MultivaluedMap;
+import jakarta.ws.rs.core.Response;
 import java.util.Map;
 import java.util.OptionalInt;
-import javax.mail.internet.AddressException;
-import javax.mail.internet.InternetAddress;
-import javax.ws.rs.core.MultivaluedMap;
-import javax.ws.rs.core.Response;
 import lombok.extern.jbosslog.JBossLog;
 import org.keycloak.authentication.AuthenticationFlowContext;
 import org.keycloak.authentication.AuthenticationFlowError;

src/main/java/io/phasetwo/keycloak/magic/auth/token/MagicLinkActionTokenHandler.java

@@ -1,6 +1,6 @@
 package io.phasetwo.keycloak.magic.auth.token;
 
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.core.Response;
 import lombok.extern.jbosslog.JBossLog;
 import org.keycloak.OAuth2Constants;
 import org.keycloak.authentication.actiontoken.AbstractActionTokenHandler;

src/main/java/io/phasetwo/keycloak/magic/resources/AbstractAdminResource.java

@@ -1,10 +1,10 @@
 package io.phasetwo.keycloak.magic.resources;
 
-import javax.validation.constraints.*;
-import javax.ws.rs.*;
-import javax.ws.rs.NotAuthorizedException;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.core.HttpHeaders;
+import jakarta.validation.constraints.*;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.NotAuthorizedException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.core.HttpHeaders;
 import lombok.extern.jbosslog.JBossLog;
 import org.keycloak.common.ClientConnection;
 import org.keycloak.events.EventBuilder;

src/main/java/io/phasetwo/keycloak/magic/resources/CorsResource.java

@@ -1,7 +1,7 @@
 package io.phasetwo.keycloak.magic.resources;
 
-import javax.ws.rs.*;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.core.Response;
 import lombok.extern.jbosslog.JBossLog;
 import org.keycloak.http.HttpRequest;
 import org.keycloak.http.HttpResponse;

src/main/java/io/phasetwo/keycloak/magic/resources/MagicLinkResource.java

@@ -4,14 +4,14 @@
 import io.phasetwo.keycloak.magic.auth.token.MagicLinkActionToken;
 import io.phasetwo.keycloak.magic.representation.MagicLinkRequest;
 import io.phasetwo.keycloak.magic.representation.MagicLinkResponse;
+import jakarta.ws.rs.*;
+import jakarta.ws.rs.Consumes;
+import jakarta.ws.rs.ForbiddenException;
+import jakarta.ws.rs.NotFoundException;
+import jakarta.ws.rs.POST;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.core.MediaType;
 import java.util.OptionalInt;
-import javax.ws.rs.*;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.ForbiddenException;
-import javax.ws.rs.NotFoundException;
-import javax.ws.rs.POST;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 import lombok.extern.jbosslog.JBossLog;
 import org.keycloak.models.ClientModel;
 import org.keycloak.models.KeycloakSession;