From 7fb11bc9d080534d9a14cfbdea57203fc4e5d94d Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 9 Dec 2024 11:12:16 +0100
Subject: [PATCH] OZG-7346: Move parent to common-lib. Add correct
license-header configuration.
---
ozgcloud-elasticsearch-operator/pom.xml | 1 +
ozgcloud-keycloak-operator/pom.xml | 1 +
pom.xml | 109 +++---------------------
3 files changed, 13 insertions(+), 98 deletions(-)
diff --git a/ozgcloud-elasticsearch-operator/pom.xml b/ozgcloud-elasticsearch-operator/pom.xml
index a79d31d..0b44782 100644
--- a/ozgcloud-elasticsearch-operator/pom.xml
+++ b/ozgcloud-elasticsearch-operator/pom.xml
@@ -14,6 +14,7 @@
<name>OZG-Cloud Elasticsearch Operator</name>
<description>OZG-Cloud Elasticsearch Operator</description>
+ <inceptionYear>2023</inceptionYear>
<properties>
<spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-elasticsearch-operator:build-latest</spring-boot.build-image.imageName>
diff --git a/ozgcloud-keycloak-operator/pom.xml b/ozgcloud-keycloak-operator/pom.xml
index f6b48d1..ab14741 100644
--- a/ozgcloud-keycloak-operator/pom.xml
+++ b/ozgcloud-keycloak-operator/pom.xml
@@ -14,6 +14,7 @@
<name>OzgCloud Keycloak Operator</name>
<description>OzgCloud Keycloak Operator</description>
+ <inceptionYear>2023</inceptionYear>
<properties>
<spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-keycloak-operator:build-latest</spring-boot.build-image.imageName>
diff --git a/pom.xml b/pom.xml
index 308fe66..821fde4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,10 +3,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.3.2</version>
- <relativePath/>
+ <groupId>de.ozgcloud.common</groupId>
+ <artifactId>ozgcloud-common-parent</artifactId>
+ <version>4.6.0</version>
</parent>
<groupId>de.ozgcloud</groupId>
@@ -16,6 +15,7 @@
<name>OzgCloud Operator Parent</name>
<description>OzgCloud Operator Parent</description>
+ <inceptionYear>2023</inceptionYear>
<modules>
<module>ozgcloud-keycloak-operator</module>
@@ -26,26 +26,14 @@
<operator-sdk.version>5.4.1</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>24.0.5</keycloak-adapter.version>
<reflections.version>0.10.2</reflections.version>
<validation-api.version>2.0.1.Final</validation-api.version>
- <lorem.version>2.2</lorem.version>
-
<!-- test -->
- <junit-jupiter.version>5.10.1</junit-jupiter.version>
- <kubernetes-server-mock.version>6.9.2</kubernetes-server-mock.version>
+ <kubernetes-server-mock.version>6.13.4</kubernetes-server-mock.version>
<io.javaoperatorsdk.version>0.9.5</io.javaoperatorsdk.version>
<!-- plugin -->
- <license-maven-plugin.version>4.1</license-maven-plugin.version>
- <ozgcloud-license.version>1.6.0</ozgcloud-license.version>
-
- <dependency-track-maven-plugin.version>1.7.0</dependency-track-maven-plugin.version>
<cyclonedx-maven-plugin.version>2.7.11</cyclonedx-maven-plugin.version>
-
</properties>
<dependencies>
@@ -67,11 +55,6 @@
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
</dependency>
- <dependency>
- <groupId>com.thedeanda</groupId>
- <artifactId>lorem</artifactId>
- </dependency>
-
<!-- test -->
<dependency>
@@ -99,61 +82,27 @@
<artifactId>kubernetes-server-mock</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.thedeanda</groupId>
+ <artifactId>lorem</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<dependencyManagement>
<dependencies>
- <!-- own projects -->
- <dependency>
- <groupId>de.ozgcloud.common</groupId>
- <artifactId>ozgcloud-common-license</artifactId>
- <version>${ozgcloud-license.version}</version>
- </dependency>
-
<!-- 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>
<version>${operator-sdk.version}</version>
</dependency>
- <!-- keycloak -->
- <dependency>
- <groupId>org.keycloak</groupId>
- <artifactId>keycloak-admin-client</artifactId>
- <version>${keycloak-adapter.version}</version>
- </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.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>
- <dependency>
- <groupId>com.thedeanda</groupId>
- <artifactId>lorem</artifactId>
- <version>${lorem.version}</version>
- </dependency>
<!-- javax -->
<dependency>
@@ -163,22 +112,11 @@
</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>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>io.javaoperatorsdk</groupId>
@@ -201,30 +139,6 @@
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>${license-maven-plugin.version}</version>
- <configuration>
- <mapping>
- <ts>SLASHSTAR_STYLE</ts>
- <config>SCRIPT_STYLE</config>
- </mapping>
- <licenseSets>
- <licenseSet>
- <header>license/eupl_v1_2_de/header.txt</header>
- <excludes>
- <exclude>**/README</exclude>
- <exclude>src/test/resources/**</exclude>
- <exclude>src/main/resources/**</exclude>
- </excludes>
- </licenseSet>
- </licenseSets>
- </configuration>
- <dependencies>
- <dependency>
- <groupId>de.ozgcloud.common</groupId>
- <artifactId>ozgcloud-common-license</artifactId>
- <version>${ozgcloud-license.version}</version>
- </dependency>
- </dependencies>
</plugin>
<plugin>
@@ -234,7 +148,6 @@
<configuration>
<dependencyTrackBaseUrl>https://dependency-track.ozg-sh.de</dependencyTrackBaseUrl>
<failOnError>true</failOnError>
- <createProject>true</createProject>
</configuration>
</plugin>
</plugins>
--
GitLab