Skip to content
Snippets Groups Projects
Commit b160242b authored by OZGCloud's avatar OZGCloud
Browse files

OZG-3961 - spring native config

parent b2b5e435
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
pom.xml
+ 88
− 82
View file @ b160242b
...@@ -28,10 +28,12 @@ ...@@ -28,10 +28,12 @@
<spring-boot.build-image.imageName>docker.ozg-sh.de/ozg-operator:build-latest</spring-boot.build-image.imageName> <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> <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>4.7.7.Final</resteasy.version>
<resteasy.version>5.0.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> <resteasy.undertow.version>${resteasy.version}</resteasy.undertow.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -43,24 +45,24 @@ ...@@ -43,24 +45,24 @@
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId> <artifactId>keycloak-admin-client</artifactId>
<version>${keycloak-adapter.version}</version> <version>${keycloak-adapter.version}</version>
<exclusions> <!-- <exclusions>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.jboss.resteasy</groupId> <!-- <groupId>org.jboss.resteasy</groupId>-->
<artifactId>resteasy-client</artifactId> <!-- <artifactId>resteasy-client</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.jboss.resteasy</groupId> <!-- <groupId>org.jboss.resteasy</groupId>-->
<artifactId>resteasy-multipart-provider</artifactId> <!-- <artifactId>resteasy-multipart-provider</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.jboss.resteasy</groupId> <!-- <groupId>org.jboss.resteasy</groupId>-->
<artifactId>resteasy-jackson2-provider</artifactId> <!-- <artifactId>resteasy-jackson2-provider</artifactId>-->
</exclusion> <!-- </exclusion>-->
<exclusion> <!-- <exclusion>-->
<groupId>org.jboss.resteasy</groupId> <!-- <groupId>org.jboss.resteasy</groupId>-->
<artifactId>resteasy-jaxb-provider</artifactId> <!-- <artifactId>resteasy-jaxb-provider</artifactId>-->
</exclusion> <!-- </exclusion>-->
</exclusions> <!-- </exclusions>-->
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.mapstruct</groupId> <groupId>org.mapstruct</groupId>
...@@ -74,76 +76,80 @@ ...@@ -74,76 +76,80 @@
<version>${operator-sdk.version}</version> <version>${operator-sdk.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.jboss.resteasy</groupId> <!-- <groupId>org.jboss.resteasy</groupId>-->
<artifactId>resteasy-jaxrs</artifactId> <!-- <artifactId>resteasy-jaxrs</artifactId>-->
<version>3.15.6.Final</version> <!-- <version>3.15.6.Final</version> -->
</dependency> <!-- </dependency>-->
<!-- Thanks for using https://jar-download.com --> <!-- Thanks for using https://jar-download.com -->
<!-- https://mvnrepository.com/artifact/javax.validation/validation-api -->
<dependency> <dependency>
<groupId>javax.validation</groupId> <groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId> <artifactId>validation-api</artifactId>
<version>2.0.1.Final</version> <version>2.0.1.Final</version>
</dependency> </dependency>
<!-- start https://github.com/keycloak/keycloak/blob/main/pom.xml -->
<dependency> <dependency>
<groupId>org.jboss.resteasy</groupId> <groupId>jakarta.xml.bind</groupId>
<artifactId>resteasy-core</artifactId> <artifactId>jakarta.xml.bind-api</artifactId>
<version>${resteasy.version}</version> </dependency>
<exclusions>
<exclusion>
<groupId>log4j</groupId> <!-- start https://github.com/keycloak/keycloak/blob/main/pom.xml -->
<artifactId>log4j</artifactId> <!-- <dependency>-->
</exclusion> <!-- <groupId>org.jboss.resteasy</groupId>-->
<exclusion> <!-- <artifactId>resteasy-core</artifactId>-->
<groupId>org.slf4j</groupId> <!-- <version>${resteasy.version}</version>-->
<artifactId>slf4j-api</artifactId> <!-- <exclusions>-->
</exclusion> <!-- <exclusion>-->
<exclusion> <!-- <groupId>log4j</groupId>-->
<groupId>org.slf4j</groupId> <!-- <artifactId>log4j</artifactId>-->
<artifactId>slf4j-simple</artifactId> <!-- </exclusion>-->
</exclusion> <!-- <exclusion>-->
</exclusions> <!-- <groupId>org.slf4j</groupId>-->
</dependency> <!-- <artifactId>slf4j-api</artifactId>-->
<dependency> <!-- </exclusion>-->
<groupId>org.jboss.resteasy</groupId> <!-- <exclusion>-->
<artifactId>resteasy-multipart-provider</artifactId> <!-- <groupId>org.slf4j</groupId>-->
<version>${resteasy.version}</version> <!-- <artifactId>slf4j-simple</artifactId>-->
</dependency> <!-- </exclusion>-->
<dependency> <!-- </exclusions>-->
<groupId>org.jboss.resteasy</groupId> <!-- </dependency>-->
<artifactId>resteasy-jackson2-provider</artifactId> <!-- <dependency>-->
<version>${resteasy.version}</version> <!-- <groupId>org.jboss.resteasy</groupId>-->
</dependency> <!-- <artifactId>resteasy-multipart-provider</artifactId>-->
<dependency> <!-- <version>${resteasy.version}</version>-->
<groupId>org.jboss.resteasy</groupId> <!-- </dependency>-->
<artifactId>resteasy-jaxb-provider</artifactId> <!-- <dependency>-->
<version>${resteasy.version}</version> <!-- <groupId>org.jboss.resteasy</groupId>-->
</dependency> <!-- <artifactId>resteasy-jackson2-provider</artifactId>-->
<dependency> <!-- <version>${resteasy.version}</version>-->
<groupId>org.jboss.resteasy</groupId> <!-- </dependency>-->
<artifactId>resteasy-client</artifactId> <!-- <dependency>-->
<version>${resteasy.version}</version> <!-- <groupId>org.jboss.resteasy</groupId>-->
</dependency> <!-- <artifactId>resteasy-jaxb-provider</artifactId>-->
<dependency> <!-- <version>${resteasy.version}</version>-->
<groupId>org.jboss.resteasy</groupId> <!-- </dependency>-->
<artifactId>resteasy-undertow</artifactId> <!-- <dependency>-->
<version>${resteasy.undertow.version}</version> <!-- <groupId>org.jboss.resteasy</groupId>-->
<exclusions> <!-- <artifactId>resteasy-client</artifactId>-->
<exclusion> <!-- <version>${resteasy.version}</version>-->
<groupId>io.undertow</groupId> <!-- </dependency>-->
<artifactId>undertow-servlet</artifactId> <!-- <dependency>-->
</exclusion> <!-- <groupId>org.jboss.resteasy</groupId>-->
<exclusion> <!-- <artifactId>resteasy-undertow</artifactId>-->
<groupId>io.undertow</groupId> <!-- <version>${resteasy.undertow.version}</version>-->
<artifactId>undertow-core</artifactId> <!-- <exclusions>-->
</exclusion> <!-- <exclusion>-->
</exclusions> <!-- <groupId>io.undertow</groupId>-->
</dependency> <!-- <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 --> <!-- ende https://github.com/keycloak/keycloak/blob/main/pom.xml -->
......
src/main/java/de/ozgcloud/operator/Config.java
+ 1
− 5
View file @ b160242b
...@@ -2,7 +2,6 @@ package de.ozgcloud.operator; ...@@ -2,7 +2,6 @@ package de.ozgcloud.operator;
import java.util.List; import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
...@@ -14,11 +13,8 @@ import io.javaoperatorsdk.operator.api.reconciler.Reconciler; ...@@ -14,11 +13,8 @@ import io.javaoperatorsdk.operator.api.reconciler.Reconciler;
@Configuration @Configuration
public class Config { public class Config {
@Autowired
private KeycloakUserService keycloakUserService;
@Bean @Bean
KeycloakUserReconciler customServiceController() { KeycloakUserReconciler customServiceController(KeycloakUserService keycloakUserService) {
return new KeycloakUserReconciler(keycloakUserService); return new KeycloakUserReconciler(keycloakUserService);
} }
......
src/main/java/de/ozgcloud/operator/SpringNativeConfiguration.java
+ 9
− 1
View file @ b160242b
...@@ -58,16 +58,24 @@ public class SpringNativeConfiguration { ...@@ -58,16 +58,24 @@ public class SpringNativeConfiguration {
combined.add(org.jboss.resteasy.resteasy_jaxrs.i18n.Messages.class); combined.add(org.jboss.resteasy.resteasy_jaxrs.i18n.Messages.class);
combined.addAll(reflections.getSubTypesOf(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.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.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.plugins.providers.RegisterBuiltin.class);
combined.add(org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl.class); combined.add(org.jboss.resteasy.client.jaxrs.internal.ResteasyClientBuilderImpl.class);
combined.add(org.keycloak.admin.client.Keycloak.class); combined.add(org.keycloak.admin.client.Keycloak.class);
// combined.add(javax.vali) combined.add(org.keycloak.admin.client.JacksonProvider.class);
try { try {
combined.add(Class.forName("io.fabric8.kubernetes.client.okhttp.OkHttpClientBuilderImpl")); combined.add(Class.forName("io.fabric8.kubernetes.client.okhttp.OkHttpClientBuilderImpl"));
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit