From f9047ffa6f0272bf2f8073924155b15130b84987 Mon Sep 17 00:00:00 2001
From: Rui Vieira <ruidevieira@googlemail.com>
Date: Wed, 25 Sep 2024 23:34:07 +0100
Subject: [PATCH 1/2] Update io-grpc from 1.59 to 1.68

com.google.protobuf:protobuf-java has to be manually overriden with 3.25.5, since io-grpc 1.68 still uses 3.25.3.

Signed-off-by: Rui Vieira <ruidevieira@googlemail.com>
---
 explainability-connectors/pom.xml | 14 +++++++++++++-
 explainability-service/pom.xml    |  5 +++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/explainability-connectors/pom.xml b/explainability-connectors/pom.xml
index d778dc73..efb0911b 100644
--- a/explainability-connectors/pom.xml
+++ b/explainability-connectors/pom.xml
@@ -16,9 +16,21 @@
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <grpc.version>1.65.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
+        <grpc.version>1.68.0</grpc.version><!-- CURRENT_GRPC_VERSION -->
         <protoc.version>3.19.3</protoc.version>
     </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <!-- Override the version of protobuf-java until io-grpc moves from 3.25.3 to 3.25.5-->
+            <dependency>
+                <groupId>com.google.protobuf</groupId>
+                <artifactId>protobuf-java</artifactId>
+                <version>3.25.5</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>org.kie.trustyai</groupId>
diff --git a/explainability-service/pom.xml b/explainability-service/pom.xml
index 6681f271..96e53828 100644
--- a/explainability-service/pom.xml
+++ b/explainability-service/pom.xml
@@ -32,6 +32,11 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+          <dependency>
+            <groupId>com.google.protobuf</groupId>
+            <artifactId>protobuf-java</artifactId>
+            <version>3.25.5</version>
+          </dependency>
         </dependencies>
     </dependencyManagement>
   <dependencies>

From 901d5cf011cd8209dd135aed98fc08ee9cd6f5b1 Mon Sep 17 00:00:00 2001
From: Rui Vieira <ruidevieira@googlemail.com>
Date: Thu, 26 Sep 2024 09:37:54 +0100
Subject: [PATCH 2/2] Add link to issue

Signed-off-by: Rui Vieira <ruidevieira@googlemail.com>
---
 explainability-connectors/pom.xml | 1 +
 explainability-service/pom.xml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/explainability-connectors/pom.xml b/explainability-connectors/pom.xml
index efb0911b..f9925f23 100644
--- a/explainability-connectors/pom.xml
+++ b/explainability-connectors/pom.xml
@@ -23,6 +23,7 @@
     <dependencyManagement>
         <dependencies>
             <!-- Override the version of protobuf-java until io-grpc moves from 3.25.3 to 3.25.5-->
+            <!-- Refer to https://issues.redhat.com/browse/RHOAIENG-13454-->
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java</artifactId>
diff --git a/explainability-service/pom.xml b/explainability-service/pom.xml
index 96e53828..6cc08bd3 100644
--- a/explainability-service/pom.xml
+++ b/explainability-service/pom.xml
@@ -32,6 +32,7 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+          <!-- Refer to https://issues.redhat.com/browse/RHOAIENG-13454-->
           <dependency>
             <groupId>com.google.protobuf</groupId>
             <artifactId>protobuf-java</artifactId>