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

Merge pull request 'OZG-3787 OZG-3822 upgrade quarkus platform version using...

Merge pull request 'OZG-3787 OZG-3822 upgrade quarkus platform version using kop-common-dependencies' (#54) from OZG-3787_upgrade_quarkus into master

Reviewed-on: https://git.ozg-sh.de/mgm/user-manager/pulls/54
parents 7868f44a 3cefec82
No related branches found
No related tags found
No related merge requests found
......@@ -30,7 +30,7 @@
<parent>
<groupId>de.itvsh.kop.common</groupId>
<artifactId>kop-common-dependencies</artifactId>
<version>1.6.4</version>
<version>1.7.0-SNAPSHOT</version>
<relativePath/>
</parent>
......@@ -44,30 +44,9 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<kop.license.version>1.6.0</kop.license.version>
<java.version>17</java.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
<quarkus.platform.version>2.15.0.Final</quarkus.platform.version>
<jandex-maven-plugin-version>1.2.3</jandex-maven-plugin-version>
</properties>
<dependencyManagement>
<dependencies>
<!-- Quarkus -->
<dependency>
<groupId>io.quarkus.platform</groupId>
<artifactId>quarkus-bom</artifactId>
<version>${quarkus.platform.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies>
<dependency>
<groupId>io.quarkus</groupId>
......
......@@ -27,6 +27,13 @@
<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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>de.itvsh.kop.common</groupId>
<artifactId>kop-common-dependencies</artifactId>
<version>1.7.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>de.itvsh.kop.user</groupId>
<artifactId>user-manager-server</artifactId>
<version>1.9.0-SNAPSHOT</version>
......@@ -40,29 +47,19 @@
<compiler-plugin.version>3.8.1</compiler-plugin.version>
<maven.compiler.release>17</maven.compiler.release>
<kop-common.version>1.6.4</kop-common.version>
<kop.license.version>1.6.0</kop.license.version>
<jacoco.plugin.version>0.8.8</jacoco.plugin.version>
<quarkus.platform.version>2.15.0.Final</quarkus.platform.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>
<!-- Versions already declared in kop-common-dependencies bom -> use bom as parent!? -->
<mapstruct.version>1.5.1.Final</mapstruct.version>
<lombok.version>1.18.24</lombok.version>
<commons-lang3.version>3.12.0</commons-lang3.version>
<jakarta.interceptor.version>1.2.5</jakarta.interceptor.version>
<jakarta.annotatioin.version>1.3.5</jakarta.annotatioin.version>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>de.itvsh.kop.user</groupId>
<artifactId>user-manager-interface</artifactId>
<version>${project.version}</version>
</dependency>
<!-- Quarkus -->
<dependency>
<groupId>io.quarkus.platform</groupId>
<artifactId>quarkus-bom</artifactId>
......@@ -77,17 +74,6 @@
<type>pom</type>
<scope>import</scope>
</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>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
</exclusions>
</dependency>
</dependencies>
</dependencyManagement>
......@@ -95,10 +81,18 @@
<dependency>
<groupId>de.itvsh.kop.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>
<artifactId>log4j-slf4j-impl</artifactId>
</exclusion>
</exclusions>
</dependency>
<!-- Quarkus -->
......@@ -207,6 +201,18 @@
<scope>test</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>
<!-- Test -->
<dependency>
<groupId>io.quarkus</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment