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

OZG-4453 OZG-4670 organize dependencies/build management

parent 84dc90a9
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
ozgcloud-elastic-operator/pom.xml
+ 31
− 41
View file @ 9e1280af
...@@ -7,51 +7,41 @@ ...@@ -7,51 +7,41 @@
<groupId>de.ozgcloud</groupId> <groupId>de.ozgcloud</groupId>
<artifactId>ozgcloud-operator-parent</artifactId> <artifactId>ozgcloud-operator-parent</artifactId>
<version>2.1.0-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent> </parent>
<artifactId>ozgcloud-elastic-operator</artifactId> <artifactId>ozgcloud-elastic-operator</artifactId>
<packaging>jar</packaging>
<name>OzgCloud Elastic Operator</name> <name>OzgCloud Elastic Operator</name>
<description>OzgCloud Elastic Operator</description> <description>OzgCloud Elastic Operator</description>
<packaging>jar</packaging>
<dependencies> <properties>
<!-- keycloak --> <spring-boot.build-image.imageName>docker.ozg-sh.de/ozgcloud-elastic-operator:build-latest</spring-boot.build-image.imageName>
<dependency> </properties>
<groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId>
</dependency>
<!-- spring --> <build>
<dependency> <plugins>
<plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-maven-plugin</artifactId>
</dependency> </plugin>
<plugin>
<!-- tools --> <groupId>org.apache.maven.plugins</groupId>
<dependency> <artifactId>maven-compiler-plugin</artifactId>
<groupId>org.mapstruct</groupId> <configuration>
<artifactId>mapstruct</artifactId> <fork>true</fork>
</dependency> <annotationProcessorPaths>
<path>
<!-- test --> <groupId>org.projectlombok</groupId>
<dependency> <artifactId>lombok</artifactId>
<groupId>org.junit.jupiter</groupId> <version>${lombok.version}</version>
<artifactId>junit-jupiter-engine</artifactId> </path>
<version>5.9.3</version> </annotationProcessorPaths>
<scope>test</scope> <showWarnings>true</showWarnings>
</dependency> </configuration>
<dependency> </plugin>
<groupId>org.junit.jupiter</groupId> </plugins>
<artifactId>junit-jupiter-params</artifactId> </build>
<version>5.9.3</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.fabric8</groupId>
<artifactId>kubernetes-server-mock</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
</project> </project>
\ No newline at end of file
ozgcloud-keycloak-operator/pom.xml
+ 16
− 30
View file @ 9e1280af
...@@ -3,15 +3,13 @@ ...@@ -3,15 +3,13 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>de.ozgcloud</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>ozgcloud-operator-parent</artifactId>
<version>3.1.3</version> <version>2.1.0-SNAPSHOT</version>
<relativePath/> <relativePath>../</relativePath>
</parent> </parent>
<groupId>de.ozgcloud</groupId>
<artifactId>ozgcloud-keycloak-operator</artifactId> <artifactId>ozgcloud-keycloak-operator</artifactId>
<version>2.1.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>OzgCloud Keycloak Operator</name> <name>OzgCloud Keycloak Operator</name>
...@@ -19,40 +17,35 @@ ...@@ -19,40 +17,35 @@
<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>
<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> </properties>
<dependencies> <dependencies>
<!-- spring -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId> <artifactId>spring-boot-starter</artifactId>
</dependency> </dependency>
<dependency>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>operator-framework-spring-boot-starter</artifactId>
</dependency>
<!-- keycloak -->
<dependency> <dependency>
<groupId>org.keycloak</groupId> <groupId>org.keycloak</groupId>
<artifactId>keycloak-admin-client</artifactId> <artifactId>keycloak-admin-client</artifactId>
<version>${keycloak-adapter.version}</version>
</dependency> </dependency>
<!-- tools -->
<dependency> <dependency>
<groupId>org.mapstruct</groupId> <groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <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> </dependency>
<!-- javax -->
<dependency> <dependency>
<groupId>javax.validation</groupId> <groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId> <artifactId>validation-api</artifactId>
<version>${validation-api.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.xml.bind</groupId> <groupId>jakarta.xml.bind</groupId>
...@@ -65,24 +58,17 @@ ...@@ -65,24 +58,17 @@
<dependency> <dependency>
<groupId>org.reflections</groupId> <groupId>org.reflections</groupId>
<artifactId>reflections</artifactId> <artifactId>reflections</artifactId>
<version>${reflections.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-beanutils</groupId> <groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId> <artifactId>commons-beanutils</artifactId>
<version>${commons-beanutils.version}</version>
</dependency> </dependency>
<!-- test -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
<exclusions>
<exclusion>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
......
pom.xml
+ 56
− 33
View file @ 9e1280af
...@@ -21,21 +21,32 @@ ...@@ -21,21 +21,32 @@
</modules> </modules>
<properties> <properties>
<spring-boot.version>3.1.3</spring-boot.version>
<operator-sdk.version>5.4.0</operator-sdk.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> <mapstruct.version>1.5.5.Final</mapstruct.version>
<keycloak-adapter.version>20.0.5</keycloak-adapter.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> <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>
<ozgcloud-license.version>1.6.0</ozgcloud-license.version> <!-- test -->
<lombok.version>1.18.28</lombok.version> <junit-jupiter.version>5.9.3</junit-jupiter.version>
<kubernetes-server-mock.version>6.9.2</kubernetes-server-mock.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> </properties>
<dependencies> <dependencies>
<!-- 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>
...@@ -62,6 +73,21 @@ ...@@ -62,6 +73,21 @@
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </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> </dependencies>
<dependencyManagement> <dependencyManagement>
...@@ -77,6 +103,12 @@ ...@@ -77,6 +103,12 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId> <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> </dependency>
<!-- keycloak --> <!-- keycloak -->
...@@ -87,15 +119,20 @@ ...@@ -87,15 +119,20 @@
</dependency> </dependency>
<!-- tools --> <!-- tools -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
</dependency>
<dependency> <dependency>
<groupId>org.mapstruct</groupId> <groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <artifactId>mapstruct</artifactId>
<version>${mapstruct.version}</version> <version>${mapstruct.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.reflections</groupId>
<artifactId>lombok</artifactId> <artifactId>reflections</artifactId>
<version>${lombok.version}</version> <version>${reflections.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>commons-beanutils</groupId> <groupId>commons-beanutils</groupId>
...@@ -103,36 +140,24 @@ ...@@ -103,36 +140,24 @@
<version>${commons-beanutils.version}</version> <version>${commons-beanutils.version}</version>
</dependency> </dependency>
<!-- ??? --> <!-- javax -->
<dependency>
<groupId>io.javaoperatorsdk</groupId>
<artifactId>operator-framework-spring-boot-starter</artifactId>
<version>${operator-sdk.version}</version>
</dependency>
<dependency> <dependency>
<groupId>javax.validation</groupId> <groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId> <artifactId>validation-api</artifactId>
<version>${validation-api.version}</version> <version>${validation-api.version}</version>
</dependency> </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 --> <!-- test -->
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId> <artifactId>junit-jupiter-engine</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.junit.jupiter</groupId> <groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId> <artifactId>junit-jupiter-params</artifactId>
<version>${junit-jupiter.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
...@@ -149,7 +174,7 @@ ...@@ -149,7 +174,7 @@
<plugin> <plugin>
<groupId>com.mycila</groupId> <groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<version>4.1</version> <version>${license-maven-plugin.version}</version>
<configuration> <configuration>
<mapping> <mapping>
<ts>SLASHSTAR_STYLE</ts> <ts>SLASHSTAR_STYLE</ts>
...@@ -162,8 +187,6 @@ ...@@ -162,8 +187,6 @@
<exclude>**/README</exclude> <exclude>**/README</exclude>
<exclude>src/test/resources/**</exclude> <exclude>src/test/resources/**</exclude>
<exclude>src/main/resources/**</exclude> <exclude>src/main/resources/**</exclude>
<exclude>**/alfa-e2e/reports/videos/**</exclude>
<exclude>**/.angular/cache/**</exclude>
</excludes> </excludes>
</licenseSet> </licenseSet>
</licenseSets> </licenseSets>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit