From 4bc3595103b4f33e9c6d71a2670adf18ac488cd2 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Thu, 19 Oct 2023 13:00:57 +0200
Subject: [PATCH] Update and Cleanup

---
 kop-common-dependencies/pom.xml | 48 ++++++++++++++++++---------------
 kop-common-parent/pom.xml       |  2 +-
 2 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/kop-common-dependencies/pom.xml b/kop-common-dependencies/pom.xml
index 9aa7fd7..509bc06 100644
--- a/kop-common-dependencies/pom.xml
+++ b/kop-common-dependencies/pom.xml
@@ -23,7 +23,9 @@
     unter der Lizenz sind dem Lizenztext zu entnehmen.
 
 -->
-<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">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
@@ -38,7 +40,7 @@
 	<description>Dependenencies management for kop projects</description>
 
 	<properties>
-		<pluto.version>1.14.0</pluto.version>
+		<pluto.version>1.15.0</pluto.version>
 		<license.version>1.8.0</license.version>
 
 		<java.version>17</java.version>
@@ -50,18 +52,16 @@
 		<spring.version>6.0.12</spring.version>
 
 		<grpc.spring-boot-starter.version>5.0.0</grpc.spring-boot-starter.version>
-		 
-		<net.devh.grpc.spring-boot-server-starter.version>2.14.0.RELEASE</net.devh.grpc.spring-boot-server-starter.version>
-		<net.devh.grpc.spring-boot-client-starter.version>2.14.0.RELEASE</net.devh.grpc.spring-boot-client-starter.version>
-<!--		<grpc.version>1.57.2</grpc.version>-->
-		<grpc.version>1.51.1</grpc.version>
-		
-		
+
+		<net.devh.grpc.spring-boot-server-starter.version>2.15.0.RELEASE</net.devh.grpc.spring-boot-server-starter.version>
+		<net.devh.grpc.spring-boot-client-starter.version>2.15.0.RELEASE</net.devh.grpc.spring-boot-client-starter.version>
+		<grpc.version>1.58.0</grpc.version>
+
+
 		<protoc-jar-plugin.version>3.11.4</protoc-jar-plugin.version>
-<!--		<protobuf.version>3.24.1</protobuf.version>-->
-<!--		<protoc-gen.version>1.57.2</protoc-gen.version>-->
-		<protobuf.version>3.21.12</protobuf.version>
-		<protoc-gen.version>1.51.1</protoc-gen.version>
+
+		<protobuf.version>3.24.4</protobuf.version>
+		<protoc-gen.version>1.58.0</protoc-gen.version>
 
 		<mapstruct.version>1.5.5.Final</mapstruct.version>
 		<commons-io.version>2.13.0</commons-io.version>
@@ -70,11 +70,8 @@
 		<commons-collections.version>4.4</commons-collections.version>
 
 		<java-jwt.version>4.4.0</java-jwt.version>
-		<jjwt.version>0.11.5</jjwt.version>
+		<jjwt.version>0.12.3</jjwt.version>
 
-		<!--TODO update - welche version verwendet ops -->
-		<keycloak-adapter.version>18.0.0</keycloak-adapter.version>
-		<keycloak-spring-boot-starter.version>18.0.0</keycloak-spring-boot-starter.version>
 		<jakarta.version>2.1.0</jakarta.version>
 
 		<quarkus.platform.version>2.16.9.Final</quarkus.platform.version>
@@ -82,9 +79,6 @@
 		<!-- Test -->
 		<lorem.version>2.1</lorem.version>
 		<faker.version>1.0.2</faker.version>
-		
-		<!--overriden to fix security issue CVE-2022-1471 -->
-		<snakeyaml.version>2.0</snakeyaml.version>
 	</properties>
 
 	<dependencyManagement>
@@ -190,14 +184,13 @@
 				<groupId>net.devh</groupId>
 				<artifactId>grpc-client-spring-boot-starter</artifactId>
 				<version>${net.devh.grpc.spring-boot-client-starter.version}</version>
-<!--				<version>2.14.0.RELEASE</version>-->
 			</dependency>
 			<dependency>
 				<groupId>net.devh</groupId>
 				<artifactId>grpc-server-spring-boot-starter</artifactId>
 				<version>${net.devh.grpc.spring-boot-server-starter.version}</version>
 			</dependency>
-			
+
 			<dependency>
 				<groupId>io.grpc</groupId>
 				<artifactId>grpc-stub</artifactId>
@@ -248,6 +241,17 @@
 				<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>
 			<!-- TODO legacy - pleace remove -->
 			<dependency>
 				<groupId>io.jsonwebtoken</groupId>
diff --git a/kop-common-parent/pom.xml b/kop-common-parent/pom.xml
index ea5a278..c0ff000 100644
--- a/kop-common-parent/pom.xml
+++ b/kop-common-parent/pom.xml
@@ -57,7 +57,7 @@
 		<!-- plugins -->
 		<maven-surefire-plugin.version>3.1.2</maven-surefire-plugin.version>
 		<maven-failsafe-plugin.version>3.1.2</maven-failsafe-plugin.version>
-		<jacoco.plugin.version>0.8.10</jacoco.plugin.version>
+		<jacoco.plugin.version>0.8.11</jacoco.plugin.version>
 
 		<sonarqube.version>3.9.1.2184</sonarqube.version>
 		<license.plugin.version>4.1</license.plugin.version>
-- 
GitLab