Remove kc20-compat which would become problematic to implement due to import changes

Author: wouterh-dev

.github/workflows/maven-publish.yml

@@ -11,10 +11,10 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - name: Set up JDK 8
+      - name: Set up JDK 17
         uses: actions/setup-java@v3
         with:
-          java-version: '8'
+          java-version: '17'
           distribution: 'temurin'
           settings-path: ${{ github.workspace }}
           cache: 'maven'

compat-kc20/pom.xml

@@ -10,18 +10,17 @@
 
   <modules>
     <module>spi</module>
-    <module>compat-kc20</module>
   </modules>
 
   <name>keycloak-spi-trusted-device</name>
   <url>https://github.com/wouterh-dev/keycloak-spi-trusted-device</url>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>17</maven.compiler.source>
+    <maven.compiler.target>17</maven.compiler.target>
     <keycloak.version>22.0.3</keycloak.version>
-    <lombok.version>1.18.24</lombok.version>
+    <lombok.version>1.18.30</lombok.version>
     <reproducible-build-maven-plugin.version>0.16</reproducible-build-maven-plugin.version>
     <maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
     <auto-service.version>1.0.1</auto-service.version>

compat-kc20/src/main/java/nl/wouterh/keycloak/trusteddevice/compat/kc20/KC20CookieHelper.java

@@ -15,11 +15,6 @@
   <packaging>jar</packaging>
 
   <dependencies>
-    <dependency>
-      <groupId>com.github.wouterh-dev</groupId>
-      <artifactId>compat-kc20</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.keycloak</groupId>
       <artifactId>keycloak-core</artifactId>

pom.xml

@@ -1,7 +1,7 @@
 package nl.wouterh.keycloak.trusteddevice.util;
 
-import java.util.Set;
 import jakarta.ws.rs.core.UriBuilder;
+import java.util.Set;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -17,6 +17,7 @@
 import org.keycloak.models.RealmModel;
 import org.keycloak.models.UserModel;
 import org.keycloak.representations.JsonWebToken;
+import org.keycloak.services.util.CookieHelper;
 
 @Getter
 @Setter
@@ -40,7 +41,7 @@ private static void addCookie(KeycloakSession session, RealmModel realm, String
 
     ServerCookie.SameSiteAttributeValue sameSiteValue =
         secure ? ServerCookie.SameSiteAttributeValue.NONE : null;
-    CompatCookieHelper.addCookie(
+    CookieHelper.addCookie(
         COOKIE_NAME,
         value,
         path,
@@ -55,7 +56,7 @@ private static void addCookie(KeycloakSession session, RealmModel realm, String
   }
 
   public static TrustedDeviceToken getCookie(KeycloakSession session) {
-    Set<String> cookieValues = CompatCookieHelper.getCookieValue(session, COOKIE_NAME);
+    Set<String> cookieValues = CookieHelper.getCookieValue(session, COOKIE_NAME);
     long time = Time.currentTime();
 
     for (String cookieValue : cookieValues) {