diff --git a/ozgcloud-elastic-operator/pom.xml b/ozgcloud-elastic-operator/pom.xml
index ed52db99ea016b735c9880255b1be03cbaf012b7..175a048030bf56af8c6f35388752bf9df6f63a57 100644
--- a/ozgcloud-elastic-operator/pom.xml
+++ b/ozgcloud-elastic-operator/pom.xml
@@ -7,51 +7,41 @@
<groupId>de.ozgcloud</groupId>
<artifactId>ozgcloud-operator-parent</artifactId>
<version>2.1.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
<artifactId>ozgcloud-elastic-operator</artifactId>
-
+ <packaging>jar</packaging>
+
<name>OzgCloud Elastic Operator</name>
<description>OzgCloud Elastic Operator</description>
- <packaging>jar</packaging>
- <dependencies>
- <!-- keycloak -->
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-admin-client</artifactId>
- </dependency>
-
- <!-- spring -->
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-test</artifactId>
- </dependency>
-
- <!-- tools -->
- <dependency>
- <groupId>org.mapstruct</groupId>
- <artifactId>mapstruct</artifactId>
- </dependency>
-
- <!-- test -->
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-engine</artifactId>
- <version>5.9.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.junit.jupiter</groupId>
- <artifactId>junit-jupiter-params</artifactId>
- <version>5.9.3</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>kubernetes-server-mock</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
+ <properties>
+ <spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-elastic-operator:build-latest</spring-boot.build-image.imageName>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <fork>true</fork>
+ <annotationProcessorPaths>
+ <path>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </path>
+ </annotationProcessorPaths>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/ozgcloud-keycloak-operator/pom.xml b/ozgcloud-keycloak-operator/pom.xml
index ff26d6fe329ae50f0093220d2ac5b3c50bb72192..cb36f4172e4fe6b8e5838866e9c5c36b6b8f9e13 100644
--- a/ozgcloud-keycloak-operator/pom.xml
+++ b/ozgcloud-keycloak-operator/pom.xml
@@ -3,15 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.1.3</version>
- <relativePath/>
+ <groupId>de.ozgcloud</groupId>
+ <artifactId>ozgcloud-operator-parent</artifactId>
+ <version>2.1.0-SNAPSHOT</version>
+ <relativePath>../</relativePath>
</parent>
- <groupId>de.ozgcloud</groupId>
<artifactId>ozgcloud-keycloak-operator</artifactId>
- <version>2.1.0-SNAPSHOT</version>
<packaging>jar</packaging>
<name>OzgCloud Keycloak Operator</name>
@@ -19,40 +17,35 @@
<properties>
<spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-keycloak-operator:build-latest</spring-boot.build-image.imageName>
-
- <spring-boot.version>3.1.3</spring-boot.version>
- <operator-sdk.version>5.2.0</operator-sdk.version>
- <mapstruct.version>1.5.5.Final</mapstruct.version>
- <keycloak-adapter.version>20.0.5</keycloak-adapter.version>
- <commons-beanutils.version>1.9.4</commons-beanutils.version>
- <reflections.version>0.10.2</reflections.version>
- <validation-api.version>2.0.1.Final</validation-api.version>
</properties>
<dependencies>
+ <!-- spring -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
+ <dependency>
+ <groupId>io.javaoperatorsdk</groupId>
+ <artifactId>operator-framework-spring-boot-starter</artifactId>
+ </dependency>
+
+ <!-- keycloak -->
<dependency>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
- <version>${keycloak-adapter.version}</version>
</dependency>
+
+ <!-- tools -->
<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>
+
+ <!-- javax -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
- <version>${validation-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.xml.bind</groupId>
@@ -65,24 +58,17 @@
<dependency>
<groupId>org.reflections</groupId>
<artifactId>reflections</artifactId>
- <version>${reflections.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
- <version>${commons-beanutils.version}</version>
</dependency>
+ <!-- test -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.junit.vintage</groupId>
- <artifactId>junit-vintage-engine</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
diff --git a/pom.xml b/pom.xml
index 31b062e57de6703f97cc070f156f0d912d9d66d7..dffd81a2402f3b1236707ecf9f0271d4fb764910 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,26 +21,37 @@
</modules>
<properties>
+ <spring-boot.version>3.1.3</spring-boot.version>
<operator-sdk.version>5.4.0</operator-sdk.version>
+
+ <!-- tools -->
+ <commons-beanutils.version>1.9.4</commons-beanutils.version>
+ <lombok.version>1.18.28</lombok.version>
<mapstruct.version>1.5.5.Final</mapstruct.version>
<keycloak-adapter.version>20.0.5</keycloak-adapter.version>
- <commons-beanutils.version>1.9.4</commons-beanutils.version>
<reflections.version>0.10.2</reflections.version>
<validation-api.version>2.0.1.Final</validation-api.version>
- <ozgcloud-license.version>1.6.0</ozgcloud-license.version>
- <lombok.version>1.18.28</lombok.version>
+ <!-- test -->
+ <junit-jupiter.version>5.9.3</junit-jupiter.version>
<kubernetes-server-mock.version>6.9.2</kubernetes-server-mock.version>
- <spring-boot.version>3.1.3</spring-boot.version>
+
+ <!-- plugin -->
+ <license-maven-plugin.version>4.1</license-maven-plugin.version>
+ <ozgcloud-license.version>1.6.0</ozgcloud-license.version>
</properties>
-
+
<dependencies>
<!-- spring -->
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter</artifactId>
+ </dependency>
<dependency>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>operator-framework-spring-boot-starter</artifactId>
</dependency>
-
+
<!-- tools -->
<dependency>
<groupId>org.projectlombok</groupId>
@@ -50,7 +61,7 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
-
+
<!-- test -->
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -62,6 +73,21 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-engine</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.junit.jupiter</groupId>
+ <artifactId>junit-jupiter-params</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-server-mock</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<dependencyManagement>
@@ -72,11 +98,17 @@
<artifactId>ozgcloud-common-license</artifactId>
<version>${ozgcloud-license.version}</version>
</dependency>
-
+
<!-- spring -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
+ <version>${spring-boot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.javaoperatorsdk</groupId>
+ <artifactId>operator-framework-spring-boot-starter</artifactId>
+ <version>${operator-sdk.version}</version>
</dependency>
<!-- keycloak -->
@@ -87,15 +119,20 @@
</dependency>
<!-- tools -->
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ <version>${lombok.version}</version>
+ </dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>${mapstruct.version}</version>
</dependency>
<dependency>
- <groupId>org.projectlombok</groupId>
- <artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>${reflections.version}</version>
</dependency>
<dependency>
<groupId>commons-beanutils</groupId>
@@ -103,42 +140,30 @@
<version>${commons-beanutils.version}</version>
</dependency>
- <!-- ??? -->
- <dependency>
- <groupId>io.javaoperatorsdk</groupId>
- <artifactId>operator-framework-spring-boot-starter</artifactId>
- <version>${operator-sdk.version}</version>
- </dependency>
+ <!-- javax -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
<version>${validation-api.version}</version>
</dependency>
- <dependency>
- <groupId>jakarta.xml.bind</groupId>
- <artifactId>jakarta.xml.bind-api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <version>${reflections.version}</version>
- </dependency>
-
+
<!-- test -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
+ <version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
+ <version>${junit-jupiter.version}</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>io.fabric8</groupId>
- <artifactId>kubernetes-server-mock</artifactId>
- <version>${kubernetes-server-mock.version}</version>
+ <groupId>io.fabric8</groupId>
+ <artifactId>kubernetes-server-mock</artifactId>
+ <version>${kubernetes-server-mock.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
@@ -149,7 +174,7 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>4.1</version>
+ <version>${license-maven-plugin.version}</version>
<configuration>
<mapping>
<ts>SLASHSTAR_STYLE</ts>
@@ -162,8 +187,6 @@
<exclude>**/README</exclude>
<exclude>src/test/resources/**</exclude>
<exclude>src/main/resources/**</exclude>
- <exclude>**/alfa-e2e/reports/videos/**</exclude>
- <exclude>**/.angular/cache/**</exclude>
</excludes>
</licenseSet>
</licenseSets>