Merge branch 'master' into workflows-1164

dapr · Jan 2, 2025 · 0cbbdba · 0cbbdba
2 parents 2ec6baf + 3a54a5e
commit 0cbbdba
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <grpc.version>1.64.0</grpc.version>
+    <grpc.version>1.69.0</grpc.version>
     <protobuf.version>3.25.5</protobuf.version>
     <protocCommand>protoc</protocCommand>
     <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.14.4/dapr/proto</dapr.proto.baseurl>

diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml
@@ -21,9 +21,9 @@
     <protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
     <protobuf.input.directory>${project.build.directory}/proto</protobuf.input.directory>
     <maven.deploy.skip>false</maven.deploy.skip>
-    <grpc.version>1.64.0</grpc.version>
+    <grpc.version>1.69.0</grpc.version>
     <protocCommand>protoc</protocCommand>
-    <protobuf.version>3.25.0</protobuf.version>
+    <protobuf.version>3.25.5</protobuf.version>
   </properties>
 
   <dependencies>

diff --git a/sdk/pom.xml b/sdk/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.apache.maven.plugins</groupId>
       <artifactId>maven-resources-plugin</artifactId>
-      <version>3.3.0</version>
+      <version>3.3.1</version>
       <type>maven-plugin</type>
     </dependency>
     <dependency>
@@ -52,7 +52,7 @@
     <dependency>
       <groupId>com.squareup.okhttp3</groupId>
       <artifactId>okhttp</artifactId>
-      <version>4.9.2</version>
+      <version>4.9.3</version>
     </dependency>
     <dependency>
       <groupId>org.mockito</groupId>