Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update keycloak-admin-client to v24 #17

Merged
merged 1 commit into from
Apr 13, 2024
Merged

fix: update keycloak-admin-client to v24 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
186 changes: 176 additions & 10 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,38 +174,164 @@
</build>

<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
<version>24.0.2</version>
</dependency>
</dependencies>
</dependencyManagement>

<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
<version>20.0.2</version>
<!-- <exclusions>-->
<!-- <exclusion>-->
<!-- <groupId>org.slf4j</groupId>-->
<!-- <artifactId>slf4j-api</artifactId>-->
<!-- </exclusion>-->
<!-- </exclusions>-->
</dependency>
</dependencies>

<profiles>
<profile>
<id>midpoint</id>
<id>midpoint48</id>
<dependencies>
<dependency>
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui</artifactId>
<version>4.8.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.tirasa.connid</groupId>
<artifactId>connector-framework</artifactId>
<version>1.5.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.tirasa.connid</groupId>
<artifactId>connector-framework-internal</artifactId>
<version>1.5.2.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.tirasa.connid</groupId>
<artifactId>connector-framework-contract</artifactId>
<version>1.5.2.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>1.14.9</version>
<scope>provided</scope>
</dependency>
</dependencies>
</profile>
<profile>
<id>midpoint44</id>
<dependencies>
<dependency>
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui</artifactId>
<type>jar</type>
<classifier>classes</classifier>
<version>4.4.8</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.tirasa.connid</groupId>
<artifactId>connector-framework</artifactId>
<version>1.5.1.10</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.tirasa.connid</groupId>
<artifactId>connector-framework-internal</artifactId>
<version>1.5.1.10</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.tirasa.connid</groupId>
<artifactId>connector-framework-contract</artifactId>
<version>1.5.1.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson2-provider</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>
<profile>
<id>midpoint40</id>
<repositories>
<repository>
<id>evolveum-nexus-releases</id>
<name>Internal Releases</name>
<url>https://nexus.evolveum.com/nexus/content/repositories/releases/</url>
</repository>
<repository>
<id>evolveum-nexus-snapshots</id>
<name>Internal Releases</name>
<url>https://nexus.evolveum.com/nexus/content/repositories/snapshots/</url>
</repository>
<repository>
<!-- Jasper references old http repository which fails with 308. -->
<id>jaspersoft-third-party</id>
<url>https://jaspersoft.jfrog.io/jaspersoft/third-party-ce-artifacts</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>com.evolveum.midpoint.gui</groupId>
<artifactId>admin-gui</artifactId>
<version>4.0.2</version>
<type>jar</type>
<classifier>classes</classifier>
<version>4.0.4</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
<version>6.8</version>
<scope>test</scope>
<exclusions>
<exclusion>
Expand All @@ -214,6 +340,46 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>net.tirasa.connid</groupId>
<artifactId>connector-framework</artifactId>
<version>1.5.0.10</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.tirasa.connid</groupId>
<artifactId>connector-framework-internal</artifactId>
<version>1.5.0.10</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.tirasa.connid</groupId>
<artifactId>connector-framework-contract</artifactId>
<version>1.5.0.10</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-client</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-multipart-provider</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jackson2-provider</artifactId>
</exclusion>
<exclusion>
<groupId>org.jboss.resteasy</groupId>
<artifactId>resteasy-jaxb-provider</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</profile>
</profiles>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/jp/openstandia/connector/keycloak/KeycloakConnector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import org.identityconnectors.framework.spi.PoolableConnector;
import org.identityconnectors.framework.spi.operations.*;

import javax.ws.rs.*;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.*;
import jakarta.ws.rs.core.Response;
import java.util.Set;

import static jp.openstandia.connector.keycloak.KeycloakClientHandler.CLIENT_OBJECT_CLASS;
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/jp/openstandia/connector/keycloak/rest/KeycloakAdminRESTAdminClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.representations.info.ServerInfoRepresentation;

import javax.ws.rs.ProcessingException;
import javax.ws.rs.ext.RuntimeDelegate;
import jakarta.ws.rs.ProcessingException;
import jakarta.ws.rs.ext.RuntimeDelegate;

import static jp.openstandia.connector.keycloak.KeycloakUtils.getRootCause;

Expand All @@ -57,7 +57,7 @@ public KeycloakAdminRESTAdminClient(String instanceName, KeycloakConfiguration c

try {
RuntimeDelegate.getInstance();
} catch (RuntimeException e) {
} catch (Throwable t) {
// Set the implementation directly as a workaround
RuntimeDelegate.setInstance(new ResteasyProviderFactoryImpl());
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/jp/openstandia/connector/keycloak/rest/KeycloakAdminRESTClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@
import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.representations.idm.ClientRepresentation;

import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.core.Response;
import java.util.*;
import java.util.stream.Collectors;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/jp/openstandia/connector/keycloak/rest/KeycloakAdminRESTClientRole.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.keycloak.representations.idm.ClientRepresentation;
import org.keycloak.representations.idm.RoleRepresentation;

import javax.ws.rs.NotFoundException;
import jakarta.ws.rs.NotFoundException;
import java.util.*;

import static jp.openstandia.connector.keycloak.KeycloakClientHandler.ATTR_CLIENT_UUID;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/jp/openstandia/connector/keycloak/rest/KeycloakAdminRESTGroup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
import org.keycloak.admin.client.resource.RealmResource;
import org.keycloak.representations.idm.GroupRepresentation;

import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.core.Response;
import java.util.*;
import java.util.stream.Collectors;

Expand Down
6 changes: 3 additions & 3 deletions src/main/java/jp/openstandia/connector/keycloak/rest/KeycloakAdminRESTUser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@
import org.keycloak.representations.idm.GroupRepresentation;
import org.keycloak.representations.idm.UserRepresentation;

import javax.ws.rs.BadRequestException;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.BadRequestException;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.core.Response;
import java.util.*;
import java.util.stream.Collectors;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/jp/openstandia/connector/keycloak/rest/KeycloakRESTUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
import org.identityconnectors.framework.common.exceptions.AlreadyExistsException;
import org.identityconnectors.framework.common.exceptions.ConnectorException;

import javax.ws.rs.NotFoundException;
import javax.ws.rs.core.Response;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.core.Response;

/**
* Utilities for Keycloak Admin REST client.
Expand Down
Loading