Skip to content

fix: renaming the admin client tests module for use by the operator #51675

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

Open
shawkins wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: renaming the admin client tests module for use by the operator #51675

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
2 changes: 1 addition & 1 deletion distribution/api-docs-dist/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<artifactId>keycloak-admin-client-internal</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
Expand Down
6 changes: 3 additions & 3 deletions integration/admin-client/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>keycloak-admin-client-tests</artifactId>
<name>Keycloak Admin REST Client for tests (Jackson 2)</name>
<description>Jackson 2 provider for the Keycloak Admin REST Client. This module is supposed to be used just in the Keycloak repository for the testsuite. It is NOT supposed to be used by the 3rd party applications.
<artifactId>keycloak-admin-client-internal</artifactId>
<name>Keycloak Admin REST Client (Jackson 2)</name>
<description>Jackson 2 provider for the Keycloak Admin REST Client. This module is supposed to be used just in the Keycloak repository. It is NOT supposed to be used by the 3rd party applications.
For the use by 3rd party applications, please use `org.keycloak:keycloak-admin-client` module.
</description>

Expand Down
13 changes: 1 addition & 12 deletions operator/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,7 @@
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-client-common-synced</artifactId>
</exclusion>
</exclusions>
<artifactId>keycloak-admin-client-internal</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.logging</groupId>
Expand Down Expand Up @@ -188,11 +182,6 @@
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
6 changes: 3 additions & 3 deletions operator/src/main/java/org/keycloak/operator/controllers/KeycloakClientBaseController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
import org.keycloak.OAuth2Constants;
import org.keycloak.admin.api.AdminApi;
import org.keycloak.admin.api.client.ClientApi;
import org.keycloak.admin.client.ClientBuilderWrapper;
import org.keycloak.admin.client.KeycloakBuilder;
import org.keycloak.admin.client.spi.ResteasyClientClassicProvider;
import org.keycloak.operator.Config;
import org.keycloak.operator.Constants;
import org.keycloak.operator.Utils;
Expand Down Expand Up @@ -369,8 +369,8 @@ private static Client createRestEasyClient(KubernetesClient client, Keycloak key
KeyManager[] keyManagers = createKeyManagers(client, keycloak);

sslContext.init(keyManagers, tmf.getTrustManagers(), null);

ClientBuilder clientBuilder = ClientBuilderWrapper.create(sslContext, false);
ClientBuilder clientBuilder = ResteasyClientClassicProvider.createClientBuilder().sslContext(sslContext);

// because we trust only the server cert, disable hostname verification
// - only if the tlsSecret is compromised and traffic to the service hostname can be hijacked,
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -982,7 +982,7 @@
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<artifactId>keycloak-admin-client-internal</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions rest/admin-v2/tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
<exclusions>
<exclusion>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<artifactId>keycloak-admin-client-internal</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand All @@ -81,7 +81,7 @@
<exclusions>
<exclusion>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<artifactId>keycloak-admin-client-internal</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion test-framework/core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<dependencies>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<artifactId>keycloak-admin-client-internal</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak.testframework</groupId>
Expand Down
6 changes: 3 additions & 3 deletions tests/base/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@
<exclusions>
<exclusion>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<artifactId>keycloak-admin-client-internal</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand All @@ -224,7 +224,7 @@
<exclusions>
<exclusion>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<artifactId>keycloak-admin-client-internal</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand All @@ -236,7 +236,7 @@
<exclusions>
<exclusion>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<artifactId>keycloak-admin-client-internal</artifactId>
</exclusion>
</exclusions>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion tests/conformance/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<artifactId>keycloak-admin-client-internal</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Expand Down
2 changes: 1 addition & 1 deletion tests/utils-shared/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<artifactId>keycloak-admin-client-internal</artifactId>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
Expand Down
2 changes: 1 addition & 1 deletion tests/utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<artifactId>keycloak-admin-client-internal</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion testsuite/integration-arquillian/tests/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1587,7 +1587,7 @@

<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<artifactId>keycloak-admin-client-internal</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
Expand Down
2 changes: 1 addition & 1 deletion testsuite/utils/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client-tests</artifactId>
<artifactId>keycloak-admin-client-internal</artifactId>
</dependency>
<dependency>
<groupId>org.keycloak</groupId>
Expand Down
Loading