This is an automated email from the ASF dual-hosted git repository.
wmedvedeo pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-kie-kogito-apps.git
The following commit(s) were added to refs/heads/main by this push:
new 37add7227 kie-kogito-apps-2146: Remove un-needed dependency to
keycloak-common (#2147)
37add7227 is described below
commit 37add72279d1b34388bca76622c2ec912885fa2e
Author: Walter Medvedeo <[email protected]>
AuthorDate: Fri Nov 22 09:17:35 2024 +0100
kie-kogito-apps-2146: Remove un-needed dependency to keycloak-common (#2147)
---
.../integration-tests-trusty-service-common/pom.xml | 4 ----
.../kie/kogito/it/trusty/AbstractTrustyExplainabilityEnd2EndIT.java | 3 +--
data-index/data-index-service/data-index-service-common/pom.xml | 5 -----
.../index/service/AbstractKeycloakIntegrationIndexingServiceIT.java | 3 +--
data-index/data-index-service/data-index-service-infinispan/pom.xml | 5 -----
data-index/data-index-service/data-index-service-inmemory/pom.xml | 5 -----
data-index/data-index-service/data-index-service-mongodb/pom.xml | 5 -----
data-index/data-index-service/data-index-service-postgresql/pom.xml | 5 -----
explainability/explainability-service-rest/pom.xml | 5 -----
.../kogito/explainability/rest/KeycloakExplainabilityServiceIT.java | 3 +--
jobs-service/jobs-service-common/pom.xml | 5 -----
.../kie/kogito/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 -----
.../org/kie/kogito/security/KeycloakSecurityCommonsServiceIT.java | 3 +--
trusty/trusty-service/trusty-service-common/pom.xml | 5 -----
.../kie/kogito/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 1ad411f35..9aafdb5da 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 @@
<artifactId>kogito-test-utils</artifactId>
<scope>compile</scope>
</dependency>
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-core</artifactId>
- </dependency>
</dependencies>
</project>
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 4207ff9ae..0ce911613 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.function.BiFunction;
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 abstract class AbstractTrustyExplainabilityEnd2EndIT
{
.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 a3eb73abd..4abb945f1 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 @@
<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/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 f2fcd37cd..c91e5195a 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 @@ package org.kie.kogito.index.service;
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 @@ public abstract class
AbstractKeycloakIntegrationIndexingServiceIT {
.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 d9134e9ce..375cdf8cc 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 @@
<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
index 9b1586fbc..4dd51a953 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 @@
<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
index 118314743..7c2ead365 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 @@
<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
index 4db0252d0..43f999c6f 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 @@
<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
index 6f0e7f1d0..cb1f02781 100644
--- 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/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 ee532e915..d014777d8 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 @@ package org.kie.kogito.explainability.rest;
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 @@ class KeycloakExplainabilityServiceIT {
.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 cdfc82a41..6b19b74d5 100644
--- 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/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 617efe207..1a2d56764 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.eclipse.microprofile.config.inject.ConfigProperty;
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 @@ public abstract class BaseKeycloakJobServiceTest {
.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 a5bfaed24..df8231b83 100644
--- 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
index 70d047a98..8ab200e96 100644
--- 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
index 3830fcb19..45018a9d4 100644
--- 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
index ab5b3eac6..a88b981d0 100644
--- 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
index b49d36ce7..99de15074 100644
--- 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
index 4e1705ec5..a26cb5abd 100644
--- 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
index a013593b8..9e238e7fe 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 @@ class KeycloakSecurityCommonsServiceIT {
.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 f58205a87..8c53ec2e9 100644
--- 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/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 c860f3784..6fb21ddff 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 java.util.ArrayList;
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 @@ class KeycloakTrustyServiceIT {
.param("client_secret", KogitoKeycloakContainer.CLIENT_SECRET)
.when()
.post(keycloakURL + "/protocol/openid-connect/token")
- .as(AccessTokenResponse.class).getToken();
+ .jsonPath().get("access_token");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
