From 457f4001b1e59215a025a16b8b7fda2d1a1cdc99 Mon Sep 17 00:00:00 2001
From: Djeumen Rolain Bonaventure <uprightech@gmail.com>
Date: Wed, 6 Dec 2023 14:53:27 +0100
Subject: [PATCH] chore(keycloak-integration): fix broken build due to version
 bump (#6971)

* chore(keycloak-integration):  renamed maven property containing keycloak version
renamed the maven property containing the keycloak version to keep things
consistent #6390

Signed-off-by: Rolain Djeumen <uprightech@gmail.com>

* chore(keycloak-integration): fix build errors caused by kc version bump

Signed-off-by: Rolain Djeumen <uprightech@gmail.com>

---------

Signed-off-by: Rolain Djeumen <uprightech@gmail.com>
Co-authored-by: mo-auto <54212639+mo-auto@users.noreply.github.com>
Signed-off-by: Mustafa Baser <mbaser@mail.com>
---
 .../io/jans/kc/spi/auth/JansAuthenticator.java   |  4 ++--
 .../rest/JansAuthResponseResourceProvider.java   | 12 ++++++------
 jans-keycloak-integration/pom.xml                | 16 ++++++++--------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/jans-keycloak-integration/authenticator/src/main/java/io/jans/kc/spi/auth/JansAuthenticator.java b/jans-keycloak-integration/authenticator/src/main/java/io/jans/kc/spi/auth/JansAuthenticator.java
index eb5bf90378a..93d27a818bc 100644
--- a/jans-keycloak-integration/authenticator/src/main/java/io/jans/kc/spi/auth/JansAuthenticator.java
+++ b/jans-keycloak-integration/authenticator/src/main/java/io/jans/kc/spi/auth/JansAuthenticator.java
@@ -12,8 +12,8 @@
 import java.util.Random;
 import java.util.ArrayList;
 
-import javax.ws.rs.core.Response;
-import javax.ws.rs.core.UriBuilder;
+import jakarta.ws.rs.core.Response;
+import jakarta.ws.rs.core.UriBuilder;
 
 import org.jboss.logging.Logger;
 
diff --git a/jans-keycloak-integration/authenticator/src/main/java/io/jans/kc/spi/rest/JansAuthResponseResourceProvider.java b/jans-keycloak-integration/authenticator/src/main/java/io/jans/kc/spi/rest/JansAuthResponseResourceProvider.java
index e5a7482b727..478a4d59fa6 100644
--- a/jans-keycloak-integration/authenticator/src/main/java/io/jans/kc/spi/rest/JansAuthResponseResourceProvider.java
+++ b/jans-keycloak-integration/authenticator/src/main/java/io/jans/kc/spi/rest/JansAuthResponseResourceProvider.java
@@ -10,12 +10,12 @@
 import java.util.Map;
 import java.util.HashMap;
 
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import jakarta.ws.rs.GET;
+import jakarta.ws.rs.Path;
+import jakarta.ws.rs.Produces;
+import jakarta.ws.rs.QueryParam;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
 
 import org.jboss.logging.Logger;
 import org.jboss.resteasy.annotations.cache.NoCache;
diff --git a/jans-keycloak-integration/pom.xml b/jans-keycloak-integration/pom.xml
index 8bff5ba87e7..228d2b326f1 100644
--- a/jans-keycloak-integration/pom.xml
+++ b/jans-keycloak-integration/pom.xml
@@ -18,9 +18,9 @@
 
     <properties>
       <maven.min-version>3.3.9</maven.min-version>
-      <maven.compiler.source>11</maven.compiler.source>
-      <maven.compiler.target>11</maven.compiler.target>
-      <keycloak-server-spi.version>23.0.1</keycloak-server-spi.version>
+      <maven.compiler.source>17</maven.compiler.source>
+      <maven.compiler.target>17</maven.compiler.target>
+      <keycloak-server.version>23.0.1</keycloak-server.version>
       <nimbus.oauth-sdk.version>10.11</nimbus.oauth-sdk.version>
       <nimbus.oauth2-oidc-sdk.version>10.11</nimbus.oauth2-oidc-sdk.version>
       <jackson.coreutils.version>1.8</jackson.coreutils.version>
@@ -81,35 +81,35 @@
           <groupId>org.keycloak</groupId>
           <artifactId>keycloak-core</artifactId>
           <scope>provided</scope>
-          <version>${keycloak-server-spi.version}</version>
+          <version>${keycloak-server.version}</version>
         </dependency>
 
         <dependency>
           <groupId>org.keycloak</groupId>
           <artifactId>keycloak-server-spi</artifactId>
           <scope>provided</scope>
-          <version>${keycloak-server-spi.version}</version>
+          <version>${keycloak-server.version}</version>
         </dependency>
 
         <dependency>
           <groupId>org.keycloak</groupId>
           <artifactId>keycloak-server-spi-private</artifactId>
           <scope>provided</scope>
-          <version>${keycloak-server-spi.version}</version>
+          <version>${keycloak-server.version}</version>
         </dependency>
 
         <dependency>
           <groupId>org.keycloak</groupId>
           <artifactId>keycloak-services</artifactId>
           <scope>provided</scope>
-          <version>${keycloak-server-spi.version}</version>
+          <version>${keycloak-server.version}</version>
         </dependency>
 
         <dependency>
           <groupId>org.keycloak</groupId>
           <artifactId>keycloak-model-legacy</artifactId>
           <scope>provided</scope>
-          <version>${keycloak-server-spi.version}</version>
+          <version>${keycloak-server.version}</version>
         </dependency>
 
         <!-- end keycloak dependencies-->