diff --git a/pom.xml b/pom.xml
index 303ed86fe1de7537845b0375f4953fe25138414c..627e910060fa39179719108aa18babedb6b3ba6b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -26,22 +26,85 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>de.itvsh.kop.common</groupId>
+ <artifactId>kop-common-dependencies</artifactId>
+ <version>2.3.1</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
- <groupId>de.itvsh.kop</groupId>
+ <groupId>de.ozgcloud.user</groupId>
<artifactId>user-manager</artifactId>
- <version>1.14.0-SNAPSHOT</version>
-
- <name>User Manager Parent</name>
+ <version>2.0.0-SNAPSHOT</version>
+ <name>OZG-Cloud User Manager</name>
<packaging>pom</packaging>
<properties>
- <kop.license.version>1.8.0</kop.license.version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+
+ <user.manager.interface.version>2.0.0-SNAPSHOT</user.manager.interface.version>
+ <quarkus.platform.version>3.5.0</quarkus.platform.version>
+ <kop.license.version>1.3.0</kop.license.version>
+ <jakarta.interceptor.version>2.1.0</jakarta.interceptor.version>
+ <jakarta.annotatioin.version>2.1.1</jakarta.annotatioin.version>
+ <lombok.version>1.18.24</lombok.version>
+ <keycloak-adapter.version>22.0.5</keycloak-adapter.version>
+
+ <!-- plugins -->
+ <maven.compiler.release>17</maven.compiler.release>
+ <jandex-maven-plugin-version>1.2.3</jandex-maven-plugin-version>
+ <compiler-plugin.version>3.8.1</compiler-plugin.version>
+ <jacoco.plugin.version>0.8.8</jacoco.plugin.version>
+ <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
+ <maven-failsafe-plugin.version>3.0.0-M7</maven-failsafe-plugin.version>
+ <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
</properties>
<modules>
- <module>user-manager-server</module>
<module>user-manager-interface</module>
+ <module>user-manager-server</module>
</modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <!-- Modules -->
+ <dependency>
+ <groupId>de.ozgcloud.user</groupId>
+ <artifactId>user-manager-interface</artifactId>
+ <version>${user.manager.interface.version}</version>
+ </dependency>
+
+ <!-- Quarkus -->
+ <dependency>
+ <groupId>io.quarkus.platform</groupId>
+ <artifactId>quarkus-bom</artifactId>
+ <version>${quarkus.platform.version}</version>
+ <type>pom</type>
+ <scope>import</scope>
+ </dependency>
+
+ <!-- Jakarta -->
+ <dependency>
+ <groupId>jakarta.interceptor</groupId>
+ <artifactId>jakarta.interceptor-api</artifactId>
+ <version>${jakarta.interceptor.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>jakarta.annotation</groupId>
+ <artifactId>jakarta.annotation-api</artifactId>
+ <version>${jakarta.annotatioin.version}</version>
+ </dependency>
+
+ <!-- Annotation processors -->
+ <dependency>
+ <groupId>org.mapstruct</groupId>
+ <artifactId>mapstruct-processor</artifactId>
+ <version>${mapstruct.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
<build>
<pluginManagement>
@@ -51,6 +114,9 @@
<artifactId>license-maven-plugin</artifactId>
<version>4.1</version>
<configuration>
+ <mapping>
+ <config>SCRIPT_STYLE</config>
+ </mapping>
<licenseSets>
<licenseSet>
<header>license/eupl_v1_2_de/header.txt</header>
@@ -70,6 +136,88 @@
</dependency>
</dependencies>
</plugin>
+ <plugin>
+ <groupId>io.quarkus.platform</groupId>
+ <artifactId>quarkus-maven-plugin</artifactId>
+ <version>${quarkus.platform.version}</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>build</goal>
+ <goal>generate-code</goal>
+ <goal>generate-code-tests</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.jboss.jandex</groupId>
+ <artifactId>jandex-maven-plugin</artifactId>
+ <version>${jandex-maven-plugin-version}</version>
+ <executions>
+ <execution>
+ <id>make-index</id>
+ <goals>
+ <goal>jandex</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${compiler-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>${surefire-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ <version>${git-commit-id-plugin.version}</version>
+ <executions>
+ <execution>
+ <id>get-the-git-infos</id>
+ <phase>initialize</phase>
+ <goals>
+ <goal>revision</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <offline>true</offline>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ <version>${jacoco.plugin.version}</version>
+ <executions>
+ <execution>
+ <id>start-agent</id>
+ <goals>
+ <goal>prepare-agent</goal>
+ </goals>
+ <configuration>
+ <propertyName>surefire.jacoco.args</propertyName>
+ <exclClassLoaders>*QuarkusClassLoader</exclClassLoaders>
+ <destFile>${project.build.directory}/jacoco-quarkus.exec</destFile>
+ <append>true</append>
+ </configuration>
+ </execution>
+ <execution>
+ <id>generate-report</id>
+ <phase>package</phase>
+ <goals>
+ <goal>report</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</pluginManagement>
</build>
diff --git a/user-manager-interface/pom.xml b/user-manager-interface/pom.xml
index a249d3ea3591c7f6494e042723556e83e3dacb27..c97d160968ecd2cc47ff9dca0af7006e584cf9f0 100644
--- a/user-manager-interface/pom.xml
+++ b/user-manager-interface/pom.xml
@@ -28,26 +28,15 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-dependencies</artifactId>
- <version>1.7.1</version>
- <relativePath/>
+ <groupId>de.ozgcloud.user</groupId>
+ <artifactId>user-manager</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
- <groupId>de.itvsh.kop.user</groupId>
<artifactId>user-manager-interface</artifactId>
- <version>1.14.0-SNAPSHOT</version>
-
- <name>UserManager Interface</name>
+ <name>OZG-Cloud User Manager Interface</name>
<description>gRPC Interface for User Manager</description>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <jandex-maven-plugin-version>1.2.3</jandex-maven-plugin-version>
- <quarkus.platform.version>3.5.0</quarkus.platform.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
@@ -64,74 +53,23 @@
<build>
<plugins>
<plugin>
- <groupId>io.quarkus</groupId>
+ <groupId>io.quarkus.platform</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
- <version>${quarkus.platform.version}</version>
- <executions>
- <execution>
- <goals>
- <goal>build</goal>
- <goal>generate-code</goal>
- <goal>generate-code-tests</goal>
- </goals>
- </execution>
- </executions>
</plugin>
<plugin>
<groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId>
- <version>${jandex-maven-plugin-version}</version>
- <executions>
- <execution>
- <id>make-index</id>
- <goals>
- <goal>jandex</goal>
- </goals>
- </execution>
- </executions>
</plugin>
-
<plugin>
<groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId>
- <version>4.1</version>
<configuration>
<mapping>
<proto>SLASHSTAR_STYLE</proto>
<config>SCRIPT_STYLE</config>
</mapping>
- <licenseSets>
- <licenseSet>
- <header>license/eupl_v1_2_de/header.txt</header>
- <excludes>
- <exclude>**/*.yaml</exclude>
- <exclude>**/*.yml</exclude>
- <exclude>README.md</exclude>
- </excludes>
- </licenseSet>
- </licenseSets>
</configuration>
- <dependencies>
- <dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-license</artifactId>
- <version>${kop.license.version}</version>
- </dependency>
- </dependencies>
</plugin>
</plugins>
</build>
-
- <distributionManagement>
- <repository>
- <id>ozg-nexus</id>
- <name>ozg-releases</name>
- <url>https://nexus.ozg-sh.de/repository/ozg-releases/</url>
- </repository>
- <snapshotRepository>
- <id>ozg-snapshots-nexus</id>
- <name>ozg-snapshots</name>
- <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
</project>
diff --git a/user-manager-server/pom.xml b/user-manager-server/pom.xml
index 0f9a4f359f11b80c1be49d1d7c006212601b3e1a..d188600af02daac2476452c3f3b16dae8a5001b3 100644
--- a/user-manager-server/pom.xml
+++ b/user-manager-server/pom.xml
@@ -28,69 +28,26 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-dependencies</artifactId>
- <version>2.3.1</version>
- <relativePath/>
+ <groupId>de.ozgcloud.user</groupId>
+ <artifactId>user-manager</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
- <groupId>de.itvsh.kop.user</groupId>
<artifactId>user-manager-server</artifactId>
- <version>1.14.0-SNAPSHOT</version>
- <name>User Manager</name>
+ <name>OZG-Cloud User Manager Server</name>
<properties>
<skipITs>false</skipITs>
-
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <compiler-plugin.version>3.8.1</compiler-plugin.version>
- <maven.compiler.release>17</maven.compiler.release>
-
- <jacoco.plugin.version>0.8.8</jacoco.plugin.version>
- <surefire-plugin.version>3.0.0-M7</surefire-plugin.version>
- <maven-failsafe-plugin.version>3.0.0-M7</maven-failsafe-plugin.version>
- <git-commit-id-plugin.version>4.9.10</git-commit-id-plugin.version>
-
- <lombok.version>1.18.24</lombok.version>
-
- <jakarta.interceptor.version>2.1.0</jakarta.interceptor.version>
- <jakarta.annotatioin.version>2.1.1</jakarta.annotatioin.version>
-
- <keycloak-adapter.version>22.0.5</keycloak-adapter.version>
-
- <quarkus.platform.version>3.5.0</quarkus.platform.version>
</properties>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>io.quarkus.platform</groupId>
- <artifactId>quarkus-bom</artifactId>
- <version>${quarkus.platform.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- <dependency>
- <groupId>de.itvsh.kop.common</groupId>
- <artifactId>kop-common-dependencies</artifactId>
- <version>${kop-common.version}</version>
- <type>pom</type>
- <scope>import</scope>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
<dependencies>
<dependency>
- <groupId>de.itvsh.kop.user</groupId>
+ <groupId>de.ozgcloud.user</groupId>
<artifactId>user-manager-interface</artifactId>
- <version>${project.version}</version>
</dependency>
<dependency>
<groupId>de.itvsh.kop.common</groupId>
<artifactId>kop-common-lib</artifactId>
- <version>${kop-common.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
@@ -188,7 +145,6 @@
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>io.quarkus</groupId>
@@ -200,8 +156,6 @@
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId>
- <version>${mapstruct.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>com.thedeanda</groupId>
@@ -213,7 +167,6 @@
<dependency>
<groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId>
- <version>${jakarta.interceptor.version}</version>
</dependency>
<dependency>
<groupId>jakarta.json</groupId>
@@ -230,7 +183,6 @@
<dependency>
<groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId>
- <version>${jakarta.annotatioin.version}</version>
</dependency>
<dependency>
<groupId>jakarta.inject</groupId>
@@ -280,21 +232,23 @@
<plugin>
<groupId>io.quarkus.platform</groupId>
<artifactId>quarkus-maven-plugin</artifactId>
- <version>${quarkus.platform.version}</version>
<extensions>true</extensions>
- <executions>
- <execution>
- <goals>
- <goal>build</goal>
- <goal>generate-code</goal>
- <goal>generate-code-tests</goal>
- </goals>
- </execution>
- </executions>
</plugin>
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.jacoco</groupId>
+ <artifactId>jacoco-maven-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>com.mycila</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ </plugin>
+ <!-- Core plugins -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
- <version>${compiler-plugin.version}</version>
<configuration>
<fork>true</fork>
<annotationProcessorPaths>
@@ -324,7 +278,6 @@
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
- <version>${surefire-plugin.version}</version>
<configuration>
<systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
@@ -336,7 +289,6 @@
</plugin>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>${maven-failsafe-plugin.version}</version>
<executions>
<execution>
<goals>
@@ -357,77 +309,6 @@
<classesDirectory>${project.build.outputDirectory}</classesDirectory>
</configuration>
</plugin>
- <plugin>
- <groupId>pl.project13.maven</groupId>
- <artifactId>git-commit-id-plugin</artifactId>
- <version>${git-commit-id-plugin.version}</version>
- <executions>
- <execution>
- <id>get-the-git-infos</id>
- <phase>initialize</phase>
- <goals>
- <goal>revision</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <offline>true</offline>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>${jacoco.plugin.version}</version>
- <executions>
- <execution>
- <id>start-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <propertyName>surefire.jacoco.args</propertyName>
- <exclClassLoaders>*QuarkusClassLoader</exclClassLoaders>
- <destFile>${project.build.directory}/jacoco-quarkus.exec</destFile>
- <append>true</append>
- </configuration>
- </execution>
- <execution>
- <id>generate-report</id>
- <phase>package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>com.mycila</groupId>
- <artifactId>license-maven-plugin</artifactId>
- <version>4.1</version>
- <configuration>
- <mapping>
- <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.itvsh.kop.common</groupId>
- <artifactId>kop-common-license</artifactId>
- <version>${kop.license.version}</version>
- </dependency>
- </dependencies>
- </plugin>
</plugins>
</build>
@@ -446,17 +327,4 @@
</properties>
</profile>
</profiles>
-
- <distributionManagement>
- <repository>
- <id>ozg-nexus</id>
- <name>ozg-releases</name>
- <url>https://nexus.ozg-sh.de/repository/ozg-releases/</url>
- </repository>
- <snapshotRepository>
- <id>ozg-snapshots-nexus</id>
- <name>ozg-snapshots</name>
- <url>https://nexus.ozg-sh.de/repository/ozg-snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
</project>