feat: keycloak version upgrade

.github/workflows/auto-assign.yml

@@ -12,7 +12,7 @@ jobs:
       pull-requests: write
     steps:
       - name: 'Auto-assign issue'
-        uses: pozil/auto-assign-issue@v1
+        uses: pozil/auto-assign-issue@v2
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           assignees: stephane-segning

.github/workflows/ci.yml

@@ -12,15 +12,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v3
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
-          arguments: shadow
+          arguments: shadow

.github/workflows/releases.yml

@@ -9,20 +9,20 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up JDK 17
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: '17'
           distribution: 'temurin'
       - name: Validate Gradle wrapper
-        uses: gradle/wrapper-validation-action@v1
+        uses: gradle/wrapper-validation-action@v3
       - name: Build with Gradle
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/gradle-build-action@v3
         with:
           arguments: shadow
       - name: Archive Artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: target-jar
           path: build/libs/*.jar
@@ -34,13 +34,13 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Download Build Artifacts
-        uses: actions/download-artifact@v4.1.7
+        uses: actions/download-artifact@v4
         with:
           name: target-jar
 
       # Upload as an artifact of the current workflow
       - name: Upload build zip artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Release artifacts
           path: '*.jar'
@@ -55,4 +55,4 @@ jobs:
           prerelease: false
           allowUpdates: true
           bodyFile: CHANGELOG.md
-          tag: v0.5.0
+          tag: v0.6.0

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.6.0
+
+- Upgraded to Keycloak 26.0.7
+
 ## v0.5.0
 
-- Upgraded to Keycloak 23.0.6
+- Upgraded to Keycloak 23.0.6

Dev.Dockerfile

@@ -1,8 +1,8 @@
-ARG TAG=23.0.6
+ARG TAG=26.0.7
 
 FROM quay.io/keycloak/keycloak:${TAG}
 
-ENV WEBHOOK_PLUGIN_VERSION 0.5.0
+ENV WEBHOOK_PLUGIN_VERSION 0.6.0
 
 ENV KEYCLOAK_DIR /opt/keycloak
 ENV KC_PROXY edge

Dockerfile

@@ -1,5 +1,5 @@
-ARG TAG=23.0.6
-ARG PLUGIN_VERSION=0.5.0
+ARG TAG=26.0.7
+ARG PLUGIN_VERSION=0.6.0
 
 FROM curlimages/curl AS DOWNLOADER
 

build.gradle.kts

@@ -2,19 +2,19 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 
 plugins {
-    kotlin("jvm") version "1.9.0"
-    id("org.openapi.generator") version "6.5.0"
+    kotlin("jvm") version "2.0.21"
+    id("org.openapi.generator") version "7.10.0"
     id("com.github.johnrengelman.shadow") version "8.1.1"
     id("groovy")
 }
 
 group = "com.vymalo.keycloak.webhook"
-version = "0.5.0"
+version = "0.6.0"
 
-val gsonVersion = "2.10.1"
-val amqpVersion = "5.20.0"
+val gsonVersion = "2.11.0"
+val amqpVersion = "5.23.0"
 val okhttp3Version = "4.12.0"
-val okioVersion = "3.6.0"
+val okioVersion = "3.9.1"
 
 repositories {
     mavenCentral()
@@ -23,19 +23,19 @@ repositories {
 dependencies {
     testImplementation(kotlin("test"))
 
-    api("org.apache.commons", "commons-lang3", "3.14.0")
+    api("org.apache.commons", "commons-lang3", "3.17.0")
 
     implementation(kotlin("stdlib"))
 
-    implementation("org.keycloak", "keycloak-services", "23.0.6")
-    implementation("org.keycloak", "keycloak-server-spi", "23.0.6")
-    implementation("org.keycloak", "keycloak-server-spi-private", "23.0.6")
+    implementation("org.keycloak", "keycloak-services", "26.0.7")
+    implementation("org.keycloak", "keycloak-server-spi", "26.0.7")
+    implementation("org.keycloak", "keycloak-server-spi-private", "26.0.7")
 
     api("com.squareup.okhttp3", "okhttp", okhttp3Version)
     api("com.rabbitmq", "amqp-client", amqpVersion)
     api("com.google.code.gson", "gson", gsonVersion)
 
-    api("org.slf4j", "slf4j-log4j12", "2.0.12")
+    api("org.slf4j", "slf4j-log4j12", "2.0.16")
     api("com.squareup.okio", "okio-jvm", okioVersion)
 }
 
@@ -97,4 +97,4 @@ tasks {
         }
         dependsOn(build)
     }
-}
+}

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
+#Wed Dec 04 15:52:41 CET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
+zipStorePath=wrapper/dists

openapi/webhook.open-api.yml

@@ -9,7 +9,7 @@ info:
     email: dev@ssegning.com
   license:
     name: MIT
-  version: 0.5.0
+  version: 0.6.0
 externalDocs:
   description: Find out more about calling setting up an external service to verify phone number
   url: https://blog.ssegning.com
@@ -85,4 +85,4 @@ components:
     bearer_auth:
       type: http
       scheme: bearer
-      bearerFormat: JWT
+      bearerFormat: JWT

src/main/kotlin/com/vymalo/keycloak/webhook/WebhookEventListenerProviderFactory.kt

@@ -104,6 +104,6 @@ class WebhookEventListenerProviderFactory : EventListenerProviderFactory, Server
 
     override fun getId(): String = PROVIDER_ID
 
-    override fun getOperationalInfo() = mapOf("version" to "0.5.0")
+    override fun getOperationalInfo() = mapOf("version" to "0.6.0")
 
 }

src/main/kotlin/com/vymalo/keycloak/webhook/service/AmqpWebhookHandler.kt

@@ -15,7 +15,7 @@ class AmqpWebhookHandler(
 ) : WebhookHandler {
     private var channel: Channel
     private var connection: Connection
-    private val exchange: String
+    private val exchange: String = amqp.exchange
 
     companion object {
         @JvmStatic
@@ -39,7 +39,6 @@ class AmqpWebhookHandler(
     }
 
     init {
-        exchange = amqp.exchange
 
         val connectionFactory = ConnectionFactory()
         connectionFactory.username = amqp.username