From c4263688c7f72149d809e29933eadbd6e6c0bd72 Mon Sep 17 00:00:00 2001 From: Walter Medvedeo Date: Tue, 19 Nov 2024 10:04:18 +0100 Subject: [PATCH] Remove un-needed dependency to keycloak-common --- .../integration-tests-trusty-service-common/pom.xml | 4 ---- .../it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java | 3 +-- .../data-index-service/data-index-service-common/pom.xml | 5 ----- .../AbstractKeycloakIntegrationIndexingServiceIT.java | 3 +-- .../data-index-service/data-index-service-infinispan/pom.xml | 5 ----- .../data-index-service/data-index-service-inmemory/pom.xml | 5 ----- .../data-index-service/data-index-service-mongodb/pom.xml | 5 ----- .../data-index-service/data-index-service-postgresql/pom.xml | 5 ----- explainability/explainability-service-rest/pom.xml | 5 ----- .../explainability/rest/KeycloakExplainabilityServiceIT.java | 3 +-- jobs-service/jobs-service-common/pom.xml | 5 ----- .../jobs/service/resource/BaseKeycloakJobServiceTest.java | 3 +-- jobs-service/jobs-service-infinispan/pom.xml | 5 ----- jobs-service/jobs-service-inmemory/pom.xml | 5 ----- jobs-service/jobs-service-mongodb/pom.xml | 5 ----- jobs-service/jobs-service-postgresql-common/pom.xml | 5 ----- jobs-service/jobs-service-storage-jpa/pom.xml | 5 ----- security-commons/pom.xml | 5 ----- .../kogito/security/KeycloakSecurityCommonsServiceIT.java | 3 +-- trusty/trusty-service/trusty-service-common/pom.xml | 5 ----- .../trusty/service/common/KeycloakTrustyServiceIT.java | 3 +-- 21 files changed, 6 insertions(+), 86 deletions(-) diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml index 712560ffc6..4832e02162 100644 --- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml +++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml @@ -87,10 +87,6 @@ kogito-test-utils compile - - org.keycloak - keycloak-core - diff --git a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java index 4207ff9ae6..0ce911613a 100644 --- a/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java +++ b/apps-integration-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/src/main/java/org/kie/kogito/it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java @@ -29,7 +29,6 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.Test; -import org.keycloak.representations.AccessTokenResponse; import org.kie.kogito.explainability.api.CounterfactualSearchDomain; import org.kie.kogito.explainability.api.CounterfactualSearchDomainCollectionValue; import org.kie.kogito.explainability.api.CounterfactualSearchDomainStructureValue; @@ -183,7 +182,7 @@ public void doTest() { .param(KEYCLOAK_CLIENT_SECRET_PARAM_NAME, KEYCLOAK_CLIENT_SECRET_PARAM_VALUE) .when() .post(KEYCLOAK_ACCESS_TOKEN_PATH) - .as(AccessTokenResponse.class).getToken(); + .jsonPath().get("access_token"); assertNotNull(accessToken); diff --git a/data-index/data-index-service/data-index-service-common/pom.xml b/data-index/data-index-service/data-index-service-common/pom.xml index e0ff1738e9..3c90f2e269 100644 --- a/data-index/data-index-service/data-index-service-common/pom.xml +++ b/data-index/data-index-service/data-index-service-common/pom.xml @@ -141,11 +141,6 @@ json-unit-assertj test - - org.keycloak - keycloak-core - test - org.kie.kogito kogito-quarkus-test-utils diff --git a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractKeycloakIntegrationIndexingServiceIT.java b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractKeycloakIntegrationIndexingServiceIT.java index f2fcd37cd0..c91e5195a5 100644 --- a/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractKeycloakIntegrationIndexingServiceIT.java +++ b/data-index/data-index-service/data-index-service-common/src/test/java/org/kie/kogito/index/service/AbstractKeycloakIntegrationIndexingServiceIT.java @@ -20,7 +20,6 @@ import org.eclipse.microprofile.config.inject.ConfigProperty; import org.junit.jupiter.api.Test; -import org.keycloak.representations.AccessTokenResponse; import org.kie.kogito.testcontainers.KogitoKeycloakContainer; import org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource; @@ -97,6 +96,6 @@ private String getAccessToken(String userName) { .param("client_secret", KogitoKeycloakContainer.CLIENT_SECRET) .when() .post(keycloakURL + "/protocol/openid-connect/token") - .as(AccessTokenResponse.class).getToken(); + .jsonPath().get("access_token"); } } diff --git a/data-index/data-index-service/data-index-service-infinispan/pom.xml b/data-index/data-index-service/data-index-service-infinispan/pom.xml index fda151f3d8..ddbcdcaebe 100644 --- a/data-index/data-index-service/data-index-service-infinispan/pom.xml +++ b/data-index/data-index-service/data-index-service-infinispan/pom.xml @@ -101,11 +101,6 @@ kogito-quarkus-test-utils test - - org.keycloak - keycloak-core - test - org.awaitility awaitility diff --git a/data-index/data-index-service/data-index-service-inmemory/pom.xml b/data-index/data-index-service/data-index-service-inmemory/pom.xml index bffc0aaf9c..f2d282d835 100644 --- a/data-index/data-index-service/data-index-service-inmemory/pom.xml +++ b/data-index/data-index-service/data-index-service-inmemory/pom.xml @@ -89,11 +89,6 @@ kogito-quarkus-test-utils test - - org.keycloak - keycloak-core - test - org.awaitility awaitility diff --git a/data-index/data-index-service/data-index-service-mongodb/pom.xml b/data-index/data-index-service/data-index-service-mongodb/pom.xml index b6e69e550a..73e237e95a 100644 --- a/data-index/data-index-service/data-index-service-mongodb/pom.xml +++ b/data-index/data-index-service/data-index-service-mongodb/pom.xml @@ -95,11 +95,6 @@ kogito-quarkus-test-utils test - - org.keycloak - keycloak-core - test - org.awaitility awaitility diff --git a/data-index/data-index-service/data-index-service-postgresql/pom.xml b/data-index/data-index-service/data-index-service-postgresql/pom.xml index 30998dc08e..d75fa7238f 100644 --- a/data-index/data-index-service/data-index-service-postgresql/pom.xml +++ b/data-index/data-index-service/data-index-service-postgresql/pom.xml @@ -94,11 +94,6 @@ kogito-quarkus-test-utils test - - org.keycloak - keycloak-core - test - org.awaitility awaitility diff --git a/explainability/explainability-service-rest/pom.xml b/explainability/explainability-service-rest/pom.xml index 7a45981ef0..cb8852ffb0 100644 --- a/explainability/explainability-service-rest/pom.xml +++ b/explainability/explainability-service-rest/pom.xml @@ -86,11 +86,6 @@ kogito-quarkus-test-utils test - - org.keycloak - keycloak-core - test - diff --git a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/KeycloakExplainabilityServiceIT.java b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/KeycloakExplainabilityServiceIT.java index ee532e9153..d014777d8f 100644 --- a/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/KeycloakExplainabilityServiceIT.java +++ b/explainability/explainability-service-rest/src/test/java/org/kie/kogito/explainability/rest/KeycloakExplainabilityServiceIT.java @@ -20,7 +20,6 @@ import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; -import org.keycloak.representations.AccessTokenResponse; import org.kie.kogito.test.quarkus.QuarkusTestProperty; import org.kie.kogito.testcontainers.KogitoKeycloakContainer; import org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource; @@ -65,6 +64,6 @@ private String getAccessToken(String userName) { .param("client_secret", KogitoKeycloakContainer.CLIENT_SECRET) .when() .post(keycloakURL + "/protocol/openid-connect/token") - .as(AccessTokenResponse.class).getToken(); + .jsonPath().get("access_token"); } } diff --git a/jobs-service/jobs-service-common/pom.xml b/jobs-service/jobs-service-common/pom.xml index 104fdd5469..13cf861eeb 100644 --- a/jobs-service/jobs-service-common/pom.xml +++ b/jobs-service/jobs-service-common/pom.xml @@ -163,11 +163,6 @@ rest-assured test - - org.keycloak - keycloak-core - test - org.mockito mockito-junit-jupiter diff --git a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java index 617efe207c..1a2d56764e 100644 --- a/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java +++ b/jobs-service/jobs-service-common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java @@ -24,7 +24,6 @@ import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.keycloak.representations.AccessTokenResponse; import org.kie.kogito.jobs.api.Job; import org.kie.kogito.jobs.api.JobBuilder; import org.kie.kogito.jobs.service.model.JobStatus; @@ -234,6 +233,6 @@ private String getAccessToken(String userName) { .param("client_secret", KogitoKeycloakContainer.CLIENT_SECRET) .when() .post(keycloakURL + "/protocol/openid-connect/token") - .as(AccessTokenResponse.class).getToken(); + .jsonPath().get("access_token"); } } diff --git a/jobs-service/jobs-service-infinispan/pom.xml b/jobs-service/jobs-service-infinispan/pom.xml index e86053720f..e0e329099f 100644 --- a/jobs-service/jobs-service-infinispan/pom.xml +++ b/jobs-service/jobs-service-infinispan/pom.xml @@ -114,11 +114,6 @@ rest-assured test - - org.keycloak - keycloak-core - test - com.github.tomakehurst wiremock-jre8 diff --git a/jobs-service/jobs-service-inmemory/pom.xml b/jobs-service/jobs-service-inmemory/pom.xml index 9e9adba1ee..85f0658218 100644 --- a/jobs-service/jobs-service-inmemory/pom.xml +++ b/jobs-service/jobs-service-inmemory/pom.xml @@ -107,11 +107,6 @@ rest-assured test - - org.keycloak - keycloak-core - test - com.github.tomakehurst wiremock-jre8 diff --git a/jobs-service/jobs-service-mongodb/pom.xml b/jobs-service/jobs-service-mongodb/pom.xml index 0430e508f7..9356928e43 100644 --- a/jobs-service/jobs-service-mongodb/pom.xml +++ b/jobs-service/jobs-service-mongodb/pom.xml @@ -101,11 +101,6 @@ rest-assured test - - org.keycloak - keycloak-core - test - com.github.tomakehurst wiremock-jre8 diff --git a/jobs-service/jobs-service-postgresql-common/pom.xml b/jobs-service/jobs-service-postgresql-common/pom.xml index 5b3097c524..54811f5228 100644 --- a/jobs-service/jobs-service-postgresql-common/pom.xml +++ b/jobs-service/jobs-service-postgresql-common/pom.xml @@ -99,11 +99,6 @@ rest-assured test - - org.keycloak - keycloak-core - test - com.github.tomakehurst wiremock-jre8 diff --git a/jobs-service/jobs-service-storage-jpa/pom.xml b/jobs-service/jobs-service-storage-jpa/pom.xml index e280899b05..b3eaddc098 100644 --- a/jobs-service/jobs-service-storage-jpa/pom.xml +++ b/jobs-service/jobs-service-storage-jpa/pom.xml @@ -113,11 +113,6 @@ rest-assured test - - org.keycloak - keycloak-core - test - com.github.tomakehurst wiremock-jre8 diff --git a/security-commons/pom.xml b/security-commons/pom.xml index 8ed91ff4ee..08b69bb569 100644 --- a/security-commons/pom.xml +++ b/security-commons/pom.xml @@ -53,11 +53,6 @@ kogito-quarkus-test-utils test - - org.keycloak - keycloak-core - test - io.quarkus quarkus-junit5 diff --git a/security-commons/src/test/java/org/kie/kogito/security/KeycloakSecurityCommonsServiceIT.java b/security-commons/src/test/java/org/kie/kogito/security/KeycloakSecurityCommonsServiceIT.java index a013593b8c..9e238e7fed 100644 --- a/security-commons/src/test/java/org/kie/kogito/security/KeycloakSecurityCommonsServiceIT.java +++ b/security-commons/src/test/java/org/kie/kogito/security/KeycloakSecurityCommonsServiceIT.java @@ -19,7 +19,6 @@ package org.kie.kogito.security; import org.junit.jupiter.api.Test; -import org.keycloak.representations.AccessTokenResponse; import org.kie.kogito.test.quarkus.QuarkusTestProperty; import org.kie.kogito.testcontainers.KogitoKeycloakContainer; import org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource; @@ -74,6 +73,6 @@ private String getAccessToken(String userName) { .param("client_secret", KogitoKeycloakContainer.CLIENT_SECRET) .when() .post(keycloakURL + "/protocol/openid-connect/token") - .as(AccessTokenResponse.class).getToken(); + .jsonPath().get("access_token"); } } diff --git a/trusty/trusty-service/trusty-service-common/pom.xml b/trusty/trusty-service/trusty-service-common/pom.xml index ef501aa69e..a495bd0842 100644 --- a/trusty/trusty-service/trusty-service-common/pom.xml +++ b/trusty/trusty-service/trusty-service-common/pom.xml @@ -124,11 +124,6 @@ awaitility test - - org.keycloak - keycloak-core - test - org.skyscreamer jsonassert diff --git a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/KeycloakTrustyServiceIT.java b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/KeycloakTrustyServiceIT.java index c860f37841..6fb21ddff6 100644 --- a/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/KeycloakTrustyServiceIT.java +++ b/trusty/trusty-service/trusty-service-common/src/test/java/org/kie/kogito/trusty/service/common/KeycloakTrustyServiceIT.java @@ -24,7 +24,6 @@ import org.apache.http.HttpStatus; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import org.keycloak.representations.AccessTokenResponse; import org.kie.kogito.test.quarkus.QuarkusTestProperty; import org.kie.kogito.testcontainers.KogitoKeycloakContainer; import org.kie.kogito.testcontainers.quarkus.KeycloakQuarkusTestResource; @@ -77,6 +76,6 @@ private String getAccessToken(String userName) { .param("client_secret", KogitoKeycloakContainer.CLIENT_SECRET) .when() .post(keycloakURL + "/protocol/openid-connect/token") - .as(AccessTokenResponse.class).getToken(); + .jsonPath().get("access_token"); } }