From 1e3af46651f33e01f13e0a953e9cffca4605f0b5 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Tue, 5 Dec 2023 11:48:17 +0100
Subject: [PATCH] fix version management
---
alfa-service/pom.xml | 18 ------------------
pom.xml | 30 +++++++++++++++++++++++++-----
2 files changed, 25 insertions(+), 23 deletions(-)
diff --git a/alfa-service/pom.xml b/alfa-service/pom.xml
index a7504ef02e..e252a956e8 100644
--- a/alfa-service/pom.xml
+++ b/alfa-service/pom.xml
@@ -42,9 +42,6 @@
<properties>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
-
- <!-- TODO: die Version über ozgcloud-common ziehen -->
- <jjwt.version>0.11.5</jjwt.version>
</properties>
<dependencies>
@@ -94,30 +91,15 @@
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-api</artifactId>
- <version>${jjwt.version}</version>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-impl</artifactId>
- <version>${jjwt.version}</version>
- <exclusions>
- <exclusion>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt-jackson</artifactId>
- <version>${jjwt.version}</version>
<scope>runtime</scope>
- <exclusions>
- <exclusion>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt-api</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<!-- own projects -->
diff --git a/pom.xml b/pom.xml
index b625782d1b..09c0fdf8b3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,11 +34,11 @@
<version>3.0.0-SNAPSHOT</version>
</parent>
- <groupId>de.ozgcloud.alfa</groupId>
- <artifactId>alfa</artifactId>
- <version>2.0.0-SNAPSHOT</version>
- <name>Alfa Parent</name>
- <packaging>pom</packaging>
+ <groupId>de.ozgcloud.alfa</groupId>
+ <artifactId>alfa</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <name>Alfa Parent</name>
+ <packaging>pom</packaging>
<modules>
<module>alfa-client</module>
@@ -54,6 +54,9 @@
<vorgang-manager.version>2.0.0-SNAPSHOT</vorgang-manager.version>
<ozgcloud-common-pdf.version>3.0.0-SNAPSHOT</ozgcloud-common-pdf.version>
<user-manager.version>2.0.0-SNAPSHOT</user-manager.version>
+
+ <!-- TODO: die Version über ozgcloud-common ziehen -->
+ <jjwt.version>0.11.5</jjwt.version>
</properties>
<build>
@@ -125,6 +128,23 @@
</exclusion>
</exclusions>
</dependency>
+
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt-api</artifactId>
+ <version>${jjwt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt-impl</artifactId>
+ <version>${jjwt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.jsonwebtoken</groupId>
+ <artifactId>jjwt-jackson</artifactId>
+ <version>${jjwt.version}</version>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
--
GitLab