From 7045caf0fc6489d3a5b95324ba8f99e69cc2765e Mon Sep 17 00:00:00 2001
From: Sergey Beryozkin <sberyozkin@gmail.com>
Date: Tue, 7 Sep 2021 17:47:48 +0100
Subject: [PATCH] Bump Keycloak version to 15.0.2

---
 bom/application/pom.xml                                         | 2 +-
 build-parent/pom.xml                                            | 2 +-
 .../keycloak/pep/deployment/KeycloakReflectionBuildStep.java    | 2 ++
 .../oidc/deployment/devservices/keycloak/DevServicesConfig.java | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index 80b32b51984ac..f1b4c0b64622f 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -180,7 +180,7 @@
         <jna.version>5.8.0</jna.version><!-- should satisfy both testcontainers and mongodb -->
         <antlr.version>4.9.2</antlr.version>
         <quarkus-security.version>1.1.4.Final</quarkus-security.version>
-        <keycloak.version>14.0.0</keycloak.version>
+        <keycloak.version>15.0.2</keycloak.version>
         <logstash-gelf.version>1.14.1</logstash-gelf.version>
         <jsch.version>0.1.55</jsch.version>
         <jzlib.version>1.1.3</jzlib.version>
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 605cba756dbd3..bbc3cf2376a75 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -92,7 +92,7 @@
 
         <!-- The image to use for tests that run Keycloak -->
         <!-- IMPORTANT: If this is changed you must also update bom/application/pom.xml and KeycloakBuildTimeConfig/DevServicesConfig in quarkus-oidc/deployment to match the version -->
-        <keycloak.docker.image>quay.io/keycloak/keycloak:14.0.0</keycloak.docker.image>
+        <keycloak.docker.image>quay.io/keycloak/keycloak:15.0.2</keycloak.docker.image>
 
         <unboundid-ldap.version>4.0.13</unboundid-ldap.version>
 
diff --git a/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakReflectionBuildStep.java b/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakReflectionBuildStep.java
index ba4cb1ac6fc27..a549fdf7fa8a9 100644
--- a/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakReflectionBuildStep.java
+++ b/extensions/keycloak-authorization/deployment/src/main/java/io/quarkus/keycloak/pep/deployment/KeycloakReflectionBuildStep.java
@@ -13,6 +13,7 @@
 import org.keycloak.jose.jws.JWSHeader;
 import org.keycloak.json.StringListMapDeserializer;
 import org.keycloak.json.StringOrArrayDeserializer;
+import org.keycloak.protocol.oidc.representations.MTLSEndpointAliases;
 import org.keycloak.protocol.oidc.representations.OIDCConfigurationRepresentation;
 import org.keycloak.representations.AccessToken;
 import org.keycloak.representations.AccessTokenResponse;
@@ -63,6 +64,7 @@ public void registerReflectionItems(BuildProducer<ReflectiveClassBuildItem> refl
                 ResourceOwnerRepresentation.class.getName(),
                 StringListMapDeserializer.class.getName(),
                 StringOrArrayDeserializer.class.getName(),
+                MTLSEndpointAliases.class.getName(),
                 OIDCConfigurationRepresentation.class.getName()));
     }
 
diff --git a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/DevServicesConfig.java b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/DevServicesConfig.java
index b3a31eef22a25..1dea0497af6fc 100644
--- a/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/DevServicesConfig.java
+++ b/extensions/oidc/deployment/src/main/java/io/quarkus/oidc/deployment/devservices/keycloak/DevServicesConfig.java
@@ -24,7 +24,7 @@ public class DevServicesConfig {
     /**
      * The container image name to use, for container based DevServices providers.
      */
-    @ConfigItem(defaultValue = "quay.io/keycloak/keycloak:14.0.0")
+    @ConfigItem(defaultValue = "quay.io/keycloak/keycloak:15.0.2")
     public String imageName;
 
     /**