From 7bc74abe7253cff000a53e9c4d110dbaf2d9a8f6 Mon Sep 17 00:00:00 2001
From: Martin <git@mail.de>
Date: Wed, 12 Mar 2025 18:10:39 +0100
Subject: [PATCH] adjust versions; fix version conflict
---
ozgcloud-keycloak-operator/pom.xml | 18 +++++++++++++-----
pom.xml | 22 +++++++++++++++++++++-
2 files changed, 34 insertions(+), 6 deletions(-)
diff --git a/ozgcloud-keycloak-operator/pom.xml b/ozgcloud-keycloak-operator/pom.xml
index 0238e03..957ac8a 100644
--- a/ozgcloud-keycloak-operator/pom.xml
+++ b/ozgcloud-keycloak-operator/pom.xml
@@ -57,16 +57,24 @@
<!-- keycloak -->
<dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-admin-client</artifactId>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-admin-client</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-core</artifactId>
+ </dependency>
+
<!-- tools -->
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
</dependency>
-
+
<!-- javax -->
<dependency>
<groupId>javax.validation</groupId>
@@ -88,7 +96,7 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
-
+
<!-- test -->
<dependency>
<groupId>org.springframework.boot</groupId>
diff --git a/pom.xml b/pom.xml
index 3dde8f3..a8af87f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -55,7 +55,7 @@
<commons-beanutils.version>1.9.4</commons-beanutils.version>
<lorem.version>2.2</lorem.version>
<lombok.version>1.18.30</lombok.version>
- <keycloak-adapter.version>26.0.4</keycloak-adapter.version>
+ <keycloak-adapter.version>24.0.5</keycloak-adapter.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<junit-jupiter.version>5.10.1</junit-jupiter.version>
<license-maven-plugin.version>4.1</license-maven-plugin.version>
@@ -149,6 +149,26 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
<version>${keycloak-adapter.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-common</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-core</artifactId>
+ <version>${keycloak-adapter.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.keycloak</groupId>
+ <artifactId>keycloak-common</artifactId>
+ <version>${keycloak-adapter.version}</version>
</dependency>
<!-- tools -->
--
GitLab