From c0b8a1cd98553e973b35b4f82475f8c899022b48 Mon Sep 17 00:00:00 2001
From: Hari kumar <40484996+Hari-stackroute@users.noreply.github.com>
Date: Thu, 2 May 2024 16:20:44 +0530
Subject: [PATCH] Issue #LR-327 merge: Upgraded the keycloak from 6.0 to 21.0

---
 .../sunbird-util/sunbird-platform-core/common-util/pom.xml  | 4 ++--
 .../common/models/util/KeyCloakConnectionProvider.java      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml b/course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml
index a5d1a4c18..d2f8d8e76 100644
--- a/course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml
+++ b/course-mw/sunbird-util/sunbird-platform-core/common-util/pom.xml
@@ -71,7 +71,7 @@
         <dependency>
             <groupId>org.keycloak</groupId>
             <artifactId>keycloak-admin-client</artifactId>
-            <version>6.0.1</version>
+            <version>21.1.2</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -81,7 +81,7 @@
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-client</artifactId>
-            <version>3.11.3.Final</version>
+            <version>4.7.9.Final</version>
         </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.velocity/velocity-tools -->
         <dependency>
diff --git a/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/KeyCloakConnectionProvider.java b/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/KeyCloakConnectionProvider.java
index f2cc75a9c..5120a1be7 100644
--- a/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/KeyCloakConnectionProvider.java
+++ b/course-mw/sunbird-util/sunbird-platform-core/common-util/src/main/java/org/sunbird/common/models/util/KeyCloakConnectionProvider.java
@@ -2,9 +2,9 @@
 package org.sunbird.common.models.util;
 
 import org.apache.commons.lang3.StringUtils;
-import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder;
 import org.keycloak.admin.client.Keycloak;
 import org.keycloak.admin.client.KeycloakBuilder;
+import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl;
 
 /**
  * @author Manzarul This class will connect to key cloak server and provide the connection to do
@@ -48,7 +48,7 @@ public static Keycloak initialiseConnection() throws Exception {
             .password(cache.getProperty(JsonKey.SSO_PASSWORD))
             .clientId(cache.getProperty(JsonKey.SSO_CLIENT_ID))
             .resteasyClient(
-                new ResteasyClientBuilder()
+                new ResteasyClientBuilderImpl()
                     .connectionPoolSize(Integer.parseInt(cache.getProperty(JsonKey.SSO_POOL_SIZE)))
                     .build());
     if (cache.getProperty(JsonKey.SSO_CLIENT_SECRET) != null
@@ -98,7 +98,7 @@ private static Keycloak initialiseEnvConnection() throws Exception {
             .password(password)
             .clientId(cleintId)
             .resteasyClient(
-                new ResteasyClientBuilder()
+                new ResteasyClientBuilderImpl()
                     .connectionPoolSize(Integer.parseInt(cache.getProperty(JsonKey.SSO_POOL_SIZE)))
                     .build());