This is an automated email from the ASF dual-hosted git repository. dimuthuupe pushed a commit to branch keycloak-upgrade in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 223480ac5ceff6e336e441cac7b7b7ae6c8a468d Author: Dimuthu Wannipurage <[email protected]> AuthorDate: Fri Sep 13 18:18:18 2024 -0400 Upgrading keycloak to v24 --- .../profile-service/iam-admin-services-core/pom.xml | 10 ++-------- .../admin/services/core/impl/TenantManagementKeycloakImpl.java | 5 +++-- pom.xml | 2 ++ tools/load-client/pom.xml | 4 ++-- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/airavata-services/profile-service/iam-admin-services-core/pom.xml b/airavata-services/profile-service/iam-admin-services-core/pom.xml index 7028f7b2d0..35c4d94594 100644 --- a/airavata-services/profile-service/iam-admin-services-core/pom.xml +++ b/airavata-services/profile-service/iam-admin-services-core/pom.xml @@ -46,17 +46,11 @@ <artifactId>httpclient</artifactId> <version>4.5.2</version> </dependency> - <!-- https://mvnrepository.com/artifact/javax.ws.rs/javax.ws.rs-api --> - <dependency> - <groupId>javax.ws.rs</groupId> - <artifactId>javax.ws.rs-api</artifactId> - <version>2.0.1</version> - </dependency> <!-- https://mvnrepository.com/artifact/org.jboss.resteasy/resteasy-client --> <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-client</artifactId> - <version>3.0.14.Final</version> + <version>${rest.easy.client.version}</version> </dependency> <!-- https://mvnrepository.com/artifact/org.jboss.resteasy/resteasy-jackson2-provider --> <dependency> @@ -74,7 +68,7 @@ <dependency> <groupId>org.keycloak</groupId> <artifactId>keycloak-admin-client</artifactId> - <version>2.5.5.Final</version> + <version>${keycloak.admin.client.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId> diff --git a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java index 030eec3155..2bd46d5c88 100644 --- a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java +++ b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java @@ -19,6 +19,7 @@ */ package org.apache.airavata.service.profile.iam.admin.services.core.impl; +import jakarta.ws.rs.core.Response; import org.apache.airavata.common.exception.ApplicationSettingsException; import org.apache.airavata.common.utils.SecurityUtil; import org.apache.airavata.common.utils.ServerSettings; @@ -30,6 +31,7 @@ import org.apache.airavata.service.profile.iam.admin.services.core.interfaces.Te import org.apache.airavata.service.profile.iam.admin.services.cpi.exception.IamAdminServicesException; import org.jboss.resteasy.client.jaxrs.ResteasyClient; import org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder; +import org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl; import org.keycloak.admin.client.Keycloak; import org.keycloak.admin.client.KeycloakBuilder; import org.keycloak.admin.client.resource.RoleResource; @@ -43,7 +45,6 @@ import org.keycloak.representations.idm.UserRepresentation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.ws.rs.core.Response; import java.io.File; import java.io.FileInputStream; import java.io.IOException; @@ -86,7 +87,7 @@ public class TenantManagementKeycloakImpl implements TenantManagementInterface { private static ResteasyClient getResteasyClient() { - ResteasyClientBuilder builder = new ResteasyClientBuilder().connectionPoolSize(10); + ResteasyClientBuilder builder = new ResteasyClientBuilderImpl().connectionPoolSize(10); try { if (ServerSettings.isTrustStorePathDefined()) { builder.trustStore(loadKeyStore()); diff --git a/pom.xml b/pom.xml index 168975501d..5c3eb04522 100644 --- a/pom.xml +++ b/pom.xml @@ -150,6 +150,8 @@ <commons.lang.version>2.6</commons.lang.version> <org.apache.commons.pool2.version>2.7.0</org.apache.commons.pool2.version> <helix.version>0.9.7</helix.version> + <keycloak.admin.client.version>24.0.4</keycloak.admin.client.version> + <rest.easy.client.version>6.2.8.Final</rest.easy.client.version> </properties> <dependencies> diff --git a/tools/load-client/pom.xml b/tools/load-client/pom.xml index ed540c14e0..499eb83329 100644 --- a/tools/load-client/pom.xml +++ b/tools/load-client/pom.xml @@ -22,12 +22,12 @@ <dependency> <groupId>org.jboss.resteasy</groupId> <artifactId>resteasy-client</artifactId> - <version>3.0.14.Final</version> + <version>${rest.easy.client.version}</version> </dependency> <dependency> <groupId>org.keycloak</groupId> <artifactId>keycloak-admin-client</artifactId> - <version>2.5.5.Final</version> + <version>${keycloak.admin.client.version}</version> </dependency> <dependency> <groupId>org.apache.airavata</groupId>
