From 7e09818e6f3e9c76c857409d4464b3fac35e08fc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Jul 2026 12:10:59 +0000
Subject: [PATCH 1/2] chore: [DevOps] bump io.grpc:grpc-bom

Bumps the production-minor-patch group with 1 update: [io.grpc:grpc-bom](https://github.com/grpc/grpc-java).


Updates `io.grpc:grpc-bom` from 1.82.2 to 1.83.0
- [Release notes](https://github.com/grpc/grpc-java/releases)
- [Commits](https://github.com/grpc/grpc-java/compare/v1.82.2...v1.83.0)

---
updated-dependencies:
- dependency-name: io.grpc:grpc-bom
  dependency-version: 1.83.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: production-minor-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 cloudplatform/connectivity-ztis/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloudplatform/connectivity-ztis/pom.xml b/cloudplatform/connectivity-ztis/pom.xml
index a5683e47d..1440b41b6 100644
--- a/cloudplatform/connectivity-ztis/pom.xml
+++ b/cloudplatform/connectivity-ztis/pom.xml
@@ -37,7 +37,7 @@
 			<dependency>
 				<groupId>io.grpc</groupId>
 				<artifactId>grpc-bom</artifactId>
-				<version>1.82.2</version>
+				<version>1.83.0</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>

From 1f795c796812ebb64ea4b89f3fd1aba568a0e0e4 Mon Sep 17 00:00:00 2001
From: Jonas Israel <jonas.israel@sap.com>
Date: Wed, 29 Jul 2026 10:41:24 +0200
Subject: [PATCH 2/2] resolve version conflict

---
 cloudplatform/connectivity-ztis/pom.xml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/cloudplatform/connectivity-ztis/pom.xml b/cloudplatform/connectivity-ztis/pom.xml
index 1440b41b6..cd2c87d9d 100644
--- a/cloudplatform/connectivity-ztis/pom.xml
+++ b/cloudplatform/connectivity-ztis/pom.xml
@@ -30,6 +30,7 @@
 	</developers>
 	<properties>
 		<netty.version>4.2.16.Final</netty.version>
+		<protobuf.version>3.25.9</protobuf.version>
 	</properties>
 	<dependencyManagement>
 		<dependencies>
@@ -50,6 +51,12 @@
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
+			<!-- Resolve protobuf-java version conflict between grpc-protobuf and proto-google-common-protos -->
+			<dependency>
+				<groupId>com.google.protobuf</groupId>
+				<artifactId>protobuf-java</artifactId>
+				<version>${protobuf.version}</version>
+			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>