Merge pull request #47 from wmedvede/remove-keycloack-dep-9.102.x-prod

[9.102.x-prod] Remove un-needed dependency to keycloak-common
kiegroup · Nov 22, 2024 · 9803366 · 9803366
2 parents 31b49af + c426368
commit 9803366
Show file tree

Hide file tree

Showing 21 changed files with 6 additions and 86 deletions.
diff --git a/...on-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml b/...on-tests/integration-tests-trusty-service/integration-tests-trusty-service-common/pom.xml
@@ -87,10 +87,6 @@
       <artifactId>kogito-test-utils</artifactId>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-    </dependency>
   </dependencies>
 
 </project>
diff --git a/...-common/src/main/java/org/kie/kogito/it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java b/...-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
@@ -141,11 +141,6 @@
       <artifactId>json-unit-assertj</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.kie.kogito</groupId>
       <artifactId>kogito-quarkus-test-utils</artifactId>

diff --git a/.../test/java/org/kie/kogito/index/service/AbstractKeycloakIntegrationIndexingServiceIT.java b/.../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
@@ -101,11 +101,6 @@
       <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>

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
@@ -89,11 +89,6 @@
       <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>

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
@@ -95,11 +95,6 @@
       <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>

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
@@ -94,11 +94,6 @@
       <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.awaitility</groupId>
       <artifactId>awaitility</artifactId>

diff --git a/explainability/explainability-service-rest/pom.xml b/explainability/explainability-service-rest/pom.xml
@@ -86,11 +86,6 @@
       <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>

diff --git a/...est/src/test/java/org/kie/kogito/explainability/rest/KeycloakExplainabilityServiceIT.java b/...est/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
@@ -163,11 +163,6 @@
       <artifactId>rest-assured</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-junit-jupiter</artifactId>

diff --git a/...common/src/test/java/org/kie/kogito/jobs/service/resource/BaseKeycloakJobServiceTest.java b/...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
@@ -114,11 +114,6 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>

diff --git a/jobs-service/jobs-service-inmemory/pom.xml b/jobs-service/jobs-service-inmemory/pom.xml
@@ -107,11 +107,6 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>

diff --git a/jobs-service/jobs-service-mongodb/pom.xml b/jobs-service/jobs-service-mongodb/pom.xml
@@ -101,11 +101,6 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>

diff --git a/jobs-service/jobs-service-postgresql-common/pom.xml b/jobs-service/jobs-service-postgresql-common/pom.xml
@@ -99,11 +99,6 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>

diff --git a/jobs-service/jobs-service-storage-jpa/pom.xml b/jobs-service/jobs-service-storage-jpa/pom.xml
@@ -113,11 +113,6 @@
             <artifactId>rest-assured</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.keycloak</groupId>
-            <artifactId>keycloak-core</artifactId>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>com.github.tomakehurst</groupId>
             <artifactId>wiremock-jre8</artifactId>

diff --git a/security-commons/pom.xml b/security-commons/pom.xml
@@ -53,11 +53,6 @@
       <artifactId>kogito-quarkus-test-utils</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>io.quarkus</groupId>
       <artifactId>quarkus-junit5</artifactId>

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
@@ -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
@@ -124,11 +124,6 @@
       <artifactId>awaitility</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.keycloak</groupId>
-      <artifactId>keycloak-core</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>org.skyscreamer</groupId>
       <artifactId>jsonassert</artifactId>

diff --git a/...ce-common/src/test/java/org/kie/kogito/trusty/service/common/KeycloakTrustyServiceIT.java b/...ce-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");
     }
 }