From bc9a2d1f967cbd399a35ca1c75360f38abff13c8 Mon Sep 17 00:00:00 2001 From: Martin <git@mail.de> Date: Wed, 12 Mar 2025 18:35:14 +0100 Subject: [PATCH] OZG-7922 adjust keycloak versions --- ozgcloud-keycloak-operator/pom.xml | 32 +++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/ozgcloud-keycloak-operator/pom.xml b/ozgcloud-keycloak-operator/pom.xml index 0238e03..4a41190 100644 --- a/ozgcloud-keycloak-operator/pom.xml +++ b/ozgcloud-keycloak-operator/pom.xml @@ -43,6 +43,7 @@ <properties> <spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-keycloak-operator:build-latest</spring-boot.build-image.imageName> + <keycloak.version>24.0.5</keycloak.version> </properties> <dependencies> @@ -57,16 +58,37 @@ <!-- keycloak --> <dependency> - <groupId>org.keycloak</groupId> - <artifactId>keycloak-admin-client</artifactId> + <groupId>org.keycloak</groupId> + <artifactId>keycloak-admin-client</artifactId> + <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.version}</version> + </dependency> + <dependency> + <groupId>org.keycloak</groupId> + <artifactId>keycloak-common</artifactId> + <version>${keycloak.version}</version> + </dependency> + + <!-- tools --> <dependency> <groupId>org.mapstruct</groupId> <artifactId>mapstruct</artifactId> </dependency> - + <!-- javax --> <dependency> <groupId>javax.validation</groupId> @@ -88,7 +110,7 @@ <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> </dependency> - + <!-- test --> <dependency> <groupId>org.springframework.boot</groupId> -- GitLab