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

OZG-7346: Move parent to common-lib. Add correct license-header configuration.

parent 2c53c2d1
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ozgcloud-elasticsearch-operator/pom.xml
+ 1
− 0
View file @ 7fb11bc9
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<name>OZG-Cloud Elasticsearch Operator</name> <name>OZG-Cloud Elasticsearch Operator</name>
<description>OZG-Cloud Elasticsearch Operator</description> <description>OZG-Cloud Elasticsearch Operator</description>
<inceptionYear>2023</inceptionYear>
<properties> <properties>
<spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-elasticsearch-operator:build-latest</spring-boot.build-image.imageName> <spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-elasticsearch-operator:build-latest</spring-boot.build-image.imageName>
......
ozgcloud-keycloak-operator/pom.xml
+ 1
− 0
View file @ 7fb11bc9
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
<name>OzgCloud Keycloak Operator</name> <name>OzgCloud Keycloak Operator</name>
<description>OzgCloud Keycloak Operator</description> <description>OzgCloud Keycloak Operator</description>
<inceptionYear>2023</inceptionYear>
<properties> <properties>
<spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-keycloak-operator:build-latest</spring-boot.build-image.imageName> <spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-keycloak-operator:build-latest</spring-boot.build-image.imageName>
......
pom.xml
+ 11
− 98
View file @ 7fb11bc9
...@@ -3,10 +3,9 @@ ...@@ -3,10 +3,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>de.ozgcloud.common</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>ozgcloud-common-parent</artifactId>
<version>3.3.2</version> <version>4.6.0</version>
<relativePath/>
</parent> </parent>
<groupId>de.ozgcloud</groupId> <groupId>de.ozgcloud</groupId>
...@@ -16,6 +15,7 @@ ...@@ -16,6 +15,7 @@
<name>OzgCloud Operator Parent</name> <name>OzgCloud Operator Parent</name>
<description>OzgCloud Operator Parent</description> <description>OzgCloud Operator Parent</description>
<inceptionYear>2023</inceptionYear>
<modules> <modules>
<module>ozgcloud-keycloak-operator</module> <module>ozgcloud-keycloak-operator</module>
...@@ -26,26 +26,14 @@ ...@@ -26,26 +26,14 @@
<operator-sdk.version>5.4.1</operator-sdk.version> <operator-sdk.version>5.4.1</operator-sdk.version>
<!-- tools --> <!-- 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> <reflections.version>0.10.2</reflections.version>
<validation-api.version>2.0.1.Final</validation-api.version> <validation-api.version>2.0.1.Final</validation-api.version>
<lorem.version>2.2</lorem.version>
<!-- test --> <!-- test -->
<junit-jupiter.version>5.10.1</junit-jupiter.version> <kubernetes-server-mock.version>6.13.4</kubernetes-server-mock.version>
<kubernetes-server-mock.version>6.9.2</kubernetes-server-mock.version>
<io.javaoperatorsdk.version>0.9.5</io.javaoperatorsdk.version> <io.javaoperatorsdk.version>0.9.5</io.javaoperatorsdk.version>
<!-- plugin --> <!-- 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> <cyclonedx-maven-plugin.version>2.7.11</cyclonedx-maven-plugin.version>
</properties> </properties>
<dependencies> <dependencies>
...@@ -67,11 +55,6 @@ ...@@ -67,11 +55,6 @@
<groupId>commons-beanutils</groupId> <groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId> <artifactId>commons-beanutils</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.thedeanda</groupId>
<artifactId>lorem</artifactId>
</dependency>
<!-- test --> <!-- test -->
<dependency> <dependency>
...@@ -99,61 +82,27 @@ ...@@ -99,61 +82,27 @@
<artifactId>kubernetes-server-mock</artifactId> <artifactId>kubernetes-server-mock</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>com.thedeanda</groupId>
<artifactId>lorem</artifactId>
<scope>test</scope>
</dependency>
</dependencies> </dependencies>
<dependencyManagement> <dependencyManagement>
<dependencies> <dependencies>
<!-- own projects -->
<dependency>
<groupId>de.ozgcloud.common</groupId>
<artifactId>ozgcloud-common-license</artifactId>
<version>${ozgcloud-license.version}</version>
</dependency>
<!-- spring --> <!-- spring -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency> <dependency>
<groupId>io.javaoperatorsdk</groupId> <groupId>io.javaoperatorsdk</groupId>
<artifactId>operator-framework-spring-boot-starter</artifactId> <artifactId>operator-framework-spring-boot-starter</artifactId>
<version>${operator-sdk.version}</version> <version>${operator-sdk.version}</version>
</dependency> </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> <dependency>
<groupId>org.reflections</groupId> <groupId>org.reflections</groupId>
<artifactId>reflections</artifactId> <artifactId>reflections</artifactId>
<version>${reflections.version}</version> <version>${reflections.version}</version>
</dependency> </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 --> <!-- javax -->
<dependency> <dependency>
...@@ -163,22 +112,11 @@ ...@@ -163,22 +112,11 @@
</dependency> </dependency>
<!-- test --> <!-- 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> <dependency>
<groupId>io.fabric8</groupId> <groupId>io.fabric8</groupId>
<artifactId>kubernetes-server-mock</artifactId> <artifactId>kubernetes-server-mock</artifactId>
<version>${kubernetes-server-mock.version}</version> <version>${kubernetes-server-mock.version}</version>
<scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.javaoperatorsdk</groupId> <groupId>io.javaoperatorsdk</groupId>
...@@ -201,30 +139,6 @@ ...@@ -201,30 +139,6 @@
<plugin> <plugin>
<groupId>com.mycila</groupId> <groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId> <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>
<plugin> <plugin>
...@@ -234,7 +148,6 @@ ...@@ -234,7 +148,6 @@
<configuration> <configuration>
<dependencyTrackBaseUrl>https://dependency-track.ozg-sh.de</dependencyTrackBaseUrl> <dependencyTrackBaseUrl>https://dependency-track.ozg-sh.de</dependencyTrackBaseUrl>
<failOnError>true</failOnError> <failOnError>true</failOnError>
<createProject>true</createProject>
</configuration> </configuration>
</plugin> </plugin>
</plugins> </plugins>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit