Skip to content
Snippets Groups Projects
Commit 6852eb3d authored by OZGCloud's avatar OZGCloud
Browse files

OZG-3532 OZG-4581 Update/cleanup POMs

parent a01775ab
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
pom.xml
+ 154
− 6
View file @ 6852eb3d
...@@ -26,23 +26,86 @@ ...@@ -26,23 +26,86 @@
--> -->
<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"> <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> <modelVersion>4.0.0</modelVersion>
<groupId>de.itvsh.kop</groupId> <groupId>de.ozgcloud.user</groupId>
<artifactId>user-manager</artifactId> <artifactId>user-manager</artifactId>
<version>1.14.0-SNAPSHOT</version> <version>2.0.0-SNAPSHOT</version>
<name>OZG-Cloud User Manager</name>
<name>User Manager Parent</name>
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <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> </properties>
<modules> <modules>
<module>user-manager-server</module>
<module>user-manager-interface</module> <module>user-manager-interface</module>
<module>user-manager-server</module>
</modules> </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> <build>
<pluginManagement> <pluginManagement>
<plugins> <plugins>
...@@ -51,6 +114,9 @@ ...@@ -51,6 +114,9 @@
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<version>4.1</version> <version>4.1</version>
<configuration> <configuration>
<mapping>
<config>SCRIPT_STYLE</config>
</mapping>
<licenseSets> <licenseSets>
<licenseSet> <licenseSet>
<header>license/eupl_v1_2_de/header.txt</header> <header>license/eupl_v1_2_de/header.txt</header>
...@@ -70,6 +136,88 @@ ...@@ -70,6 +136,88 @@
</dependency> </dependency>
</dependencies> </dependencies>
</plugin> </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> </plugins>
</pluginManagement> </pluginManagement>
</build> </build>
......
user-manager-interface/pom.xml
+ 5
− 67
View file @ 6852eb3d
...@@ -28,26 +28,15 @@ ...@@ -28,26 +28,15 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>de.itvsh.kop.common</groupId> <groupId>de.ozgcloud.user</groupId>
<artifactId>kop-common-dependencies</artifactId> <artifactId>user-manager</artifactId>
<version>1.7.1</version> <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent> </parent>
<groupId>de.itvsh.kop.user</groupId>
<artifactId>user-manager-interface</artifactId> <artifactId>user-manager-interface</artifactId>
<version>1.14.0-SNAPSHOT</version> <name>OZG-Cloud User Manager Interface</name>
<name>UserManager Interface</name>
<description>gRPC Interface for User Manager</description> <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> <dependencies>
<dependency> <dependency>
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
...@@ -64,74 +53,23 @@ ...@@ -64,74 +53,23 @@
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>io.quarkus</groupId> <groupId>io.quarkus.platform</groupId>
<artifactId>quarkus-maven-plugin</artifactId> <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>
<plugin> <plugin>
<groupId>org.jboss.jandex</groupId> <groupId>org.jboss.jandex</groupId>
<artifactId>jandex-maven-plugin</artifactId> <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>
<plugin> <plugin>
<groupId>com.mycila</groupId> <groupId>com.mycila</groupId>
<artifactId>license-maven-plugin</artifactId> <artifactId>license-maven-plugin</artifactId>
<version>4.1</version>
<configuration> <configuration>
<mapping> <mapping>
<proto>SLASHSTAR_STYLE</proto> <proto>SLASHSTAR_STYLE</proto>
<config>SCRIPT_STYLE</config> <config>SCRIPT_STYLE</config>
</mapping> </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> </configuration>
<dependencies>
<dependency>
<groupId>de.itvsh.kop.common</groupId>
<artifactId>kop-common-license</artifactId>
<version>${kop.license.version}</version>
</dependency>
</dependencies>
</plugin> </plugin>
</plugins> </plugins>
</build> </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> </project>
user-manager-server/pom.xml
+ 18
− 150
View file @ 6852eb3d
...@@ -28,69 +28,26 @@ ...@@ -28,69 +28,26 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>de.itvsh.kop.common</groupId> <groupId>de.ozgcloud.user</groupId>
<artifactId>kop-common-dependencies</artifactId> <artifactId>user-manager</artifactId>
<version>2.3.1</version> <version>2.0.0-SNAPSHOT</version>
<relativePath/>
</parent> </parent>
<groupId>de.itvsh.kop.user</groupId>
<artifactId>user-manager-server</artifactId> <artifactId>user-manager-server</artifactId>
<version>1.14.0-SNAPSHOT</version> <name>OZG-Cloud User Manager Server</name>
<name>User Manager</name>
<properties> <properties>
<skipITs>false</skipITs> <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> </properties>
<dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>io.quarkus.platform</groupId> <groupId>de.ozgcloud.user</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>
<artifactId>user-manager-interface</artifactId> <artifactId>user-manager-interface</artifactId>
<version>${project.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>de.itvsh.kop.common</groupId> <groupId>de.itvsh.kop.common</groupId>
<artifactId>kop-common-lib</artifactId> <artifactId>kop-common-lib</artifactId>
<version>${kop-common.version}</version>
<exclusions> <exclusions>
<exclusion> <exclusion>
<groupId>org.apache.logging.log4j</groupId> <groupId>org.apache.logging.log4j</groupId>
...@@ -188,7 +145,6 @@ ...@@ -188,7 +145,6 @@
<dependency> <dependency>
<groupId>org.mapstruct</groupId> <groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId> <artifactId>mapstruct</artifactId>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.quarkus</groupId> <groupId>io.quarkus</groupId>
...@@ -200,8 +156,6 @@ ...@@ -200,8 +156,6 @@
<dependency> <dependency>
<groupId>org.mapstruct</groupId> <groupId>org.mapstruct</groupId>
<artifactId>mapstruct-processor</artifactId> <artifactId>mapstruct-processor</artifactId>
<version>${mapstruct.version}</version>
<scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.thedeanda</groupId> <groupId>com.thedeanda</groupId>
...@@ -213,7 +167,6 @@ ...@@ -213,7 +167,6 @@
<dependency> <dependency>
<groupId>jakarta.interceptor</groupId> <groupId>jakarta.interceptor</groupId>
<artifactId>jakarta.interceptor-api</artifactId> <artifactId>jakarta.interceptor-api</artifactId>
<version>${jakarta.interceptor.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.json</groupId> <groupId>jakarta.json</groupId>
...@@ -230,7 +183,6 @@ ...@@ -230,7 +183,6 @@
<dependency> <dependency>
<groupId>jakarta.annotation</groupId> <groupId>jakarta.annotation</groupId>
<artifactId>jakarta.annotation-api</artifactId> <artifactId>jakarta.annotation-api</artifactId>
<version>${jakarta.annotatioin.version}</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.inject</groupId> <groupId>jakarta.inject</groupId>
...@@ -280,21 +232,23 @@ ...@@ -280,21 +232,23 @@
<plugin> <plugin>
<groupId>io.quarkus.platform</groupId> <groupId>io.quarkus.platform</groupId>
<artifactId>quarkus-maven-plugin</artifactId> <artifactId>quarkus-maven-plugin</artifactId>
<version>${quarkus.platform.version}</version>
<extensions>true</extensions> <extensions>true</extensions>
<executions>
<execution>
<goals>
<goal>build</goal>
<goal>generate-code</goal>
<goal>generate-code-tests</goal>
</goals>
</execution>
</executions>
</plugin> </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> <plugin>
<artifactId>maven-compiler-plugin</artifactId> <artifactId>maven-compiler-plugin</artifactId>
<version>${compiler-plugin.version}</version>
<configuration> <configuration>
<fork>true</fork> <fork>true</fork>
<annotationProcessorPaths> <annotationProcessorPaths>
...@@ -324,7 +278,6 @@ ...@@ -324,7 +278,6 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<version>${surefire-plugin.version}</version>
<configuration> <configuration>
<systemPropertyVariables> <systemPropertyVariables>
<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager> <java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
...@@ -336,7 +289,6 @@ ...@@ -336,7 +289,6 @@
</plugin> </plugin>
<plugin> <plugin>
<artifactId>maven-failsafe-plugin</artifactId> <artifactId>maven-failsafe-plugin</artifactId>
<version>${maven-failsafe-plugin.version}</version>
<executions> <executions>
<execution> <execution>
<goals> <goals>
...@@ -357,77 +309,6 @@ ...@@ -357,77 +309,6 @@
<classesDirectory>${project.build.outputDirectory}</classesDirectory> <classesDirectory>${project.build.outputDirectory}</classesDirectory>
</configuration> </configuration>
</plugin> </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> </plugins>
</build> </build>
...@@ -446,17 +327,4 @@ ...@@ -446,17 +327,4 @@
</properties> </properties>
</profile> </profile>
</profiles> </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> </project>
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

Impressum - Datenschutz - Barrierefreiheit