From 9cd6db2f5d78a349cc115d75d3d144a26e777667 Mon Sep 17 00:00:00 2001
From: Cassie Coyle <cassie@diagrid.io>
Date: Tue, 7 Jan 2025 19:46:08 -0600
Subject: [PATCH] [1.13] up versions to be secure and fix issues due to
 deprecation (#1187) (#1188)

---
 examples/pom.xml                                   |  5 +++++
 pom.xml                                            |  5 +++++
 sdk-actors/pom.xml                                 |  6 +++---
 .../io/dapr/actors/runtime/DaprGrpcClientTest.java |  4 ++--
 sdk-autogen/pom.xml                                |  7 ++++++-
 sdk-tests/pom.xml                                  |  4 ++--
 sdk/pom.xml                                        | 14 ++++++++++----
 7 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/examples/pom.xml b/examples/pom.xml
index 1be21cbed..4611c69b8 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -129,6 +129,11 @@
       <artifactId>javax.annotation-api</artifactId>
       <version>1.3.2</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>${protobuf.version}</version>
+    </dependency>
   </dependencies>
 
   <build>
diff --git a/pom.xml b/pom.xml
index c0d7f4902..e5ccd2116 100644
--- a/pom.xml
+++ b/pom.xml
@@ -113,6 +113,11 @@
         <version>${grpc.version}</version>
         <scope>test</scope>
       </dependency>
+    <dependency>
+      <groupId>org.jetbrains.kotlin</groupId>
+      <artifactId>kotlin-stdlib</artifactId>
+      <version>2.1.0</version>
+    </dependency>
     </dependencies>
   </dependencyManagement>
 
diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml
index 04956de5a..65c3f6851 100644
--- a/sdk-actors/pom.xml
+++ b/sdk-actors/pom.xml
@@ -32,9 +32,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.gmazzo</groupId>
-      <artifactId>okhttp-mock</artifactId>
-      <version>1.4.1</version>
+      <groupId>com.github.gmazzo.okhttp.mock</groupId>
+      <artifactId>mock-client</artifactId>
+      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
diff --git a/sdk-actors/src/test/java/io/dapr/actors/runtime/DaprGrpcClientTest.java b/sdk-actors/src/test/java/io/dapr/actors/runtime/DaprGrpcClientTest.java
index 335ea575f..7f006df1e 100644
--- a/sdk-actors/src/test/java/io/dapr/actors/runtime/DaprGrpcClientTest.java
+++ b/sdk-actors/src/test/java/io/dapr/actors/runtime/DaprGrpcClientTest.java
@@ -301,8 +301,8 @@ public class DaprGrpcClientTest {
             responseObserver.onError(se);
         }
 
-        private <T extends GeneratedMessageV3> void populateObserver(StreamObserver<T> responseObserver, GeneratedMessageV3 generatedMessageV3) {
-            responseObserver.onNext((T) generatedMessageV3);
+        private <T extends com.google.protobuf.Message> void populateObserver(StreamObserver<T> responseObserver, T message) {
+            responseObserver.onNext(message);
             responseObserver.onCompleted();
         }
     }
diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml
index b40df7232..16bcb560f 100644
--- a/sdk-autogen/pom.xml
+++ b/sdk-autogen/pom.xml
@@ -55,6 +55,11 @@
       <version>${grpc.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.squareup.okio</groupId>
+      <artifactId>okio</artifactId>
+      <version>3.9.1</version>
+    </dependency>
   </dependencies>
 
   <build>
@@ -130,7 +135,7 @@
             <configuration>
               <protocCommand>protoc</protocCommand>
               <protocVersion>${protobuf.version}</protocVersion>
-              <protocArtifact>com.google.protobuf:protoc:3.21.1</protocArtifact>
+              <protocArtifact>com.google.protobuf:protoc:3.25.5</protocArtifact>
               <addProtoSources>inputs</addProtoSources>
               <includeMavenTypes>direct</includeMavenTypes>
               <includeStdTypes>true</includeStdTypes>
diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml
index 67c92eec1..f1c32897f 100644
--- a/sdk-tests/pom.xml
+++ b/sdk-tests/pom.xml
@@ -26,8 +26,8 @@
     <dapr.sdk.alpha.version>0.14.0-SNAPSHOT</dapr.sdk.alpha.version>
     <protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
     <protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
-    <grpc.version>1.64.0</grpc.version>
-    <protobuf.version>3.25.0</protobuf.version>
+    <grpc.version>1.69.0</grpc.version>
+    <protobuf.version>3.25.5</protobuf.version>
     <opentelemetry.version>1.39.0</opentelemetry.version>
     <springboot.version>3.3.1</springboot.version>
     <logback-classic.version>1.4.12</logback-classic.version>
diff --git a/sdk/pom.xml b/sdk/pom.xml
index d7cd9d377..3970b7f9f 100644
--- a/sdk/pom.xml
+++ b/sdk/pom.xml
@@ -52,7 +52,13 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>4.9.3</version>
+      <version>4.12.0</version>
+      <exclusions>
+        <exclusion>
+          <groupId>org.jetbrains.kotlin</groupId>
+          <artifactId>kotlin-stdlib-jdk8</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
@@ -72,9 +78,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>com.github.gmazzo</groupId>
-      <artifactId>okhttp-mock</artifactId>
-      <version>1.4.1</version>
+      <groupId>com.github.gmazzo.okhttp.mock</groupId>
+      <artifactId>mock-client</artifactId>
+      <version>2.0.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>