Skip to content

Commit 57a86e3

Browse files
authored
Merge branch 'master' into users/svegiraju/conversation-ai
2 parents 1610e02 + 62b01c6 commit 57a86e3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1717
<grpc.version>1.69.0</grpc.version>
1818
<protobuf.version>3.25.5</protobuf.version>
19-
<protocCommand>protoc</protocCommand>
19+
<protocCommand>java-sdk-protoc</protocCommand>
2020
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.3/dapr/proto</dapr.proto.baseurl>
2121
<dapr.sdk.version>1.17.0-SNAPSHOT</dapr.sdk.version>
2222
<dapr.sdk.alpha.version>0.17.0-SNAPSHOT</dapr.sdk.alpha.version>

sdk-autogen/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<protobuf.input.directory>${project.build.directory}/proto</protobuf.input.directory>
2323
<maven.deploy.skip>false</maven.deploy.skip>
2424
<grpc.version>1.69.0</grpc.version>
25-
<protocCommand>protoc</protocCommand>
25+
<protocCommand>java-sdk-protoc</protocCommand>
2626
<protobuf.version>3.25.5</protobuf.version>
2727
</properties>
2828

@@ -132,7 +132,7 @@
132132
<goal>run</goal>
133133
</goals>
134134
<configuration>
135-
<protocCommand>protoc</protocCommand>
135+
<protocCommand>java-sdk-protoc</protocCommand>
136136
<protocVersion>${protobuf.version}</protocVersion>
137137
<protocArtifact>com.google.protobuf:protoc:3.25.5</protocArtifact>
138138
<addProtoSources>inputs</addProtoSources>

sdk-workflows/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
<dependency>
4848
<groupId>io.dapr</groupId>
4949
<artifactId>durabletask-client</artifactId>
50-
<version>1.5.6</version>
50+
<version>1.5.7</version>
5151
</dependency>
5252
<!--
5353
manually declare durabletask-client's jackson dependencies

0 commit comments

Comments
 (0)