From 5d51e5c201d78b0f8323bacfb737a4cc57bc14c4 Mon Sep 17 00:00:00 2001
From: OZGCloud <ozgcloud@mgm-tp.com>
Date: Mon, 3 Apr 2023 20:34:35 +0200
Subject: [PATCH] update spring-boot version; re-add net.devh grpc starter

---
 kop-common-dependencies/pom.xml | 17 +++++++++++++++--
 kop-common-parent/pom.xml       |  6 +++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/kop-common-dependencies/pom.xml b/kop-common-dependencies/pom.xml
index 94623a3..70c9226 100644
--- a/kop-common-dependencies/pom.xml
+++ b/kop-common-dependencies/pom.xml
@@ -46,10 +46,12 @@
 		<maven.compiler.target>17</maven.compiler.target>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-		<spring-boot.version>3.0.4</spring-boot.version>
-		<spring.version>6.0.6</spring.version>
+		<spring-boot.version>3.0.5</spring-boot.version>
+		<spring.version>6.0.7</spring.version>
 
 		<grpc.spring-boot-starter.version>5.0.0</grpc.spring-boot-starter.version>
+		<net.devh.grpc.spring-boot-client-starter.version>2.14.0.RELEASE</net.devh.grpc.spring-boot-client-starter.version>
+		<net.devh.grpc.spring-boot-server-starter.version>2.14.0.RELEASE</net.devh.grpc.spring-boot-server-starter.version>
 		<grpc.version>1.51.1</grpc.version>
 		<protoc-jar-plugin.version>3.11.4</protoc-jar-plugin.version>
 		<protobuf.version>3.21.12</protobuf.version>
@@ -168,6 +170,17 @@
 				<artifactId>grpc-client-spring-boot-starter</artifactId>
 				<version>${grpc.spring-boot-starter.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>net.devh</groupId>
+				<artifactId>grpc-client-spring-boot-starter</artifactId>
+				<version>${net.devh.grpc.spring-boot-client-starter.version}</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>
diff --git a/kop-common-parent/pom.xml b/kop-common-parent/pom.xml
index fc36bcc..28fb753 100644
--- a/kop-common-parent/pom.xml
+++ b/kop-common-parent/pom.xml
@@ -31,7 +31,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>3.0.4</version>
+		<version>3.0.5</version>
 		<relativePath />
 	</parent>
 
@@ -51,7 +51,7 @@
 		<kop-common.version>2.0.0-SNAPSHOT</kop-common.version>
 		<kop.license.version>1.6.0</kop.license.version>
 		
-		<spring-boot.version>2.7.10</spring-boot.version>
+		<spring-boot.version>3.0.5</spring-boot.version>
 		
 		<mapstruct.version>1.5.3.Final</mapstruct.version>
 
@@ -78,7 +78,7 @@
 			<dependency>
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-starter</artifactId>
-				<version>3.0.4</version>
+				<version>3.0.5</version>
 				<exclusions>
 					<exclusion>
 						<groupId>org.springframework.boot</groupId>
-- 
GitLab