From f46dcde9d4096c29a9b4f383ab7593423cf694a3 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 19 Jun 2023 10:05:45 +0200
Subject: [PATCH] OZG-3961 - spring native config, new keycloak version, new
resteasy version
---
pom.xml | 90 ++++++++++++++++++-
.../operator/SpringNativeConfiguration.java | 10 +++
2 files changed, 97 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index a45e243..b15adc3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,8 +28,11 @@
<spring-boot.build-image.imageName>docker.ozg-sh.de/ozg-operator:build-latest</spring-boot.build-image.imageName>
<mapstruct.version>1.5.5.Final</mapstruct.version>
- <keycloak-adapter.version>18.0.0</keycloak-adapter.version>
+ <keycloak-adapter.version>20.0.5</keycloak-adapter.version>
+ <resteasy-legacy.version>6.2.4.Final</resteasy-legacy.version>
+ <resteasy.version>6.2.4.Final</resteasy.version>
+ <resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
</properties>
<dependencies>
<dependency>
@@ -40,19 +43,100 @@
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
<version>${keycloak-adapter.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-multipart-provider</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson2-provider</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxb-provider</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>${mapstruct.version}</version>
</dependency>
-
-
+
<dependency>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>operator-framework-spring-boot-starter</artifactId>
<version>${operator-sdk.version}</version>
</dependency>
+
+ <!-- start https://github.com/keycloak/keycloak/blob/main/pom.xml -->
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-core</artifactId>
+ <version>${resteasy.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-multipart-provider</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jackson2-provider</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-jaxb-provider</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-client</artifactId>
+ <version>${resteasy.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.resteasy</groupId>
+ <artifactId>resteasy-undertow</artifactId>
+ <version>${resteasy.undertow.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-servlet</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>io.undertow</groupId>
+ <artifactId>undertow-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <!-- ende https://github.com/keycloak/keycloak/blob/main/pom.xml -->
+
+
+<!-- <dependency>-->
+<!-- <groupId>io.javaoperatorsdk</groupId>-->
+<!-- <artifactId>operator-framework-spring-boot-starter</artifactId>-->
+<!-- <version>${operator-sdk.version}</version>-->
+<!-- </dependency>-->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
diff --git a/src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java b/src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java
index e050ad3..d737c41 100644
--- a/src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java
+++ b/src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java
@@ -5,6 +5,7 @@ import java.util.Objects;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.ThreadPoolExecutor;
+import org.keycloak.admin.client.Keycloak;
import org.reflections.Reflections;
import org.springframework.aot.hint.MemberCategory;
import org.springframework.aot.hint.RuntimeHints;
@@ -50,6 +51,15 @@ public class SpringNativeConfiguration {
combined.add(KeycloakUserSpec.KeycloakUserSpecUserGroup.class);
combined.add(KeycloakUserStatus.class);
+ combined.add(Keycloak.class);
+ combined.add(org.keycloak.admin.client.spi.ResteasyClientClassicProvider.class);
+ combined.add(org.jboss.resteasy.client.jaxrs.ResteasyClientBuilder.class);
+ combined.addAll(subtypesOfKubernetesResource);
+
+ combined.add(org.jboss.resteasy.resteasy_jaxrs.i18n.Messages.class);
+ combined.addAll(reflections.getSubTypesOf(org.jboss.resteasy.resteasy_jaxrs.i18n.Messages.class));
+ combined.add(org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl.class);
+
combined.add(org.keycloak.admin.client.Keycloak.class);
try {
--
GitLab