diff --git a/pom.xml b/pom.xml
index d998f3d53d8f209b823bf6dc3311d28e54c613e8..ec49cf724de88a72dc6f654f8c12471d7d5f66d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,10 +28,12 @@
<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>21.1.1</keycloak-adapter.version>
+ <keycloak-adapter.version>20.0.5</keycloak-adapter.version>
- <resteasy-legacy.version>5.0.7.Final</resteasy-legacy.version>
- <resteasy.version>5.0.7.Final</resteasy.version>
+ <resteasy.version>4.7.7.Final</resteasy.version>
+
+<!-- <resteasy-legacy.version>5.0.7.Final</resteasy-legacy.version>-->
+<!-- <resteasy.version>5.0.7.Final</resteasy.version>-->
<resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
</properties>
<dependencies>
@@ -43,24 +45,24 @@
<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>
+<!-- <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>
@@ -74,76 +76,80 @@
<version>${operator-sdk.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.resteasy</groupId>
- <artifactId>resteasy-jaxrs</artifactId>
- <version>3.15.6.Final</version>
- </dependency>
+<!-- <dependency>-->
+<!-- <groupId>org.jboss.resteasy</groupId>-->
+<!-- <artifactId>resteasy-jaxrs</artifactId>-->
+<!-- <version>3.15.6.Final</version> -->
+<!-- </dependency>-->
<!-- Thanks for using https://jar-download.com -->
- <!-- https://mvnrepository.com/artifact/javax.validation/validation-api -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>2.0.1.Final</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>
+ <groupId>jakarta.xml.bind</groupId>
+ <artifactId>jakarta.xml.bind-api</artifactId>
+ </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 -->
diff --git a/src/main/java/de/ozgcloud/operator/Config.java b/src/main/java/de/ozgcloud/operator/Config.java
index a73b483fc8d518166a0921766a1614bf1eec66a4..3814657d2876483961619567bd62d95560ec3c01 100644
--- a/src/main/java/de/ozgcloud/operator/Config.java
+++ b/src/main/java/de/ozgcloud/operator/Config.java
@@ -2,7 +2,6 @@ package de.ozgcloud.operator;
import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -14,11 +13,8 @@ import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@Configuration
public class Config {
- @Autowired
- private KeycloakUserService keycloakUserService;
-
@Bean
- KeycloakUserReconciler customServiceController() {
+ KeycloakUserReconciler customServiceController(KeycloakUserService keycloakUserService) {
return new KeycloakUserReconciler(keycloakUserService);
}
diff --git a/src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java b/src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java
index cdb26920a5aa70c13664edfd140ae59fbe1e5b26..0821029eb2a2f9c72937896818b8ff490809abc3 100644
--- a/src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java
+++ b/src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java
@@ -58,16 +58,24 @@ public class SpringNativeConfiguration {
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.resteasy_jaxrs.i18n.Messages_$bundle.class);
combined.add(org.jboss.resteasy.resteasy_jaxrs.i18n.LogMessages.class);
+ combined.add(org.jboss.resteasy.resteasy_jaxrs.i18n.LogMessages_$logger.class);
combined.addAll(reflections.getSubTypesOf(org.jboss.resteasy.resteasy_jaxrs.i18n.LogMessages.class));
+ combined.add(org.jboss.resteasy.client.jaxrs.i18n.LogMessages.class);
+ combined.addAll(reflections.getSubTypesOf(org.jboss.resteasy.client.jaxrs.i18n.LogMessages.class));
+
+ combined.add(org.jboss.resteasy.plugins.providers.jaxb.i18n.LogMessages.class);
+ combined.add(org.jboss.resteasy.plugins.providers.jaxb.i18n.LogMessages_$logger.class);
+
combined.add(org.jboss.resteasy.plugins.providers.RegisterBuiltin.class);
combined.add(org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl.class);
combined.add(org.keycloak.admin.client.Keycloak.class);
-// combined.add(javax.vali)
+ combined.add(org.keycloak.admin.client.JacksonProvider.class);
try {
combined.add(Class.forName("io.fabric8.kubernetes.client.okhttp.OkHttpClientBuilderImpl"));