[1.13] up versions to be secure and fix issues due to deprecation (#1187

) * up versions to be secure and fix issues due to deprecation Signed-off-by: Cassandra Coyle <[email protected]> * see if this fixes it Signed-off-by: Cassandra Coyle <[email protected]> * check if protoc is in ci Signed-off-by: Cassandra Coyle <[email protected]> * see if changes from this PR (#1182) fix it Signed-off-by: Cassandra Coyle <[email protected]> * 3.25.5 version protobuf-java Signed-off-by: Cassandra Coyle <[email protected]> * rm explicit versions and fix deprecation dependency to new one Signed-off-by: Cassandra Coyle <[email protected]> * merge in release branch and lower protoc versions to match Signed-off-by: Cassandra Coyle <[email protected]> * force upped version Signed-off-by: Cassandra Coyle <[email protected]> * use protobuf.version 3.25.5 (secure) Signed-off-by: Cassandra Coyle <[email protected]> * use correct protobuf for sdk tests Signed-off-by: Cassandra Coyle <[email protected]> --------- Signed-off-by: Cassandra Coyle <[email protected]>
dapr · Jan 6, 2025 · 88ec8c9 · 88ec8c9
1 parent dd2d758
commit 88ec8c9
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -301,8 +301,8 @@ private void throwException(StreamObserver<?> responseObserver) {
             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
@@ -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
@@ -26,8 +26,8 @@
     <dapr.sdk.alpha.version>0.13.1</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
@@ -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>