Merge branch 'master' into javi-use-name-to-register-activity

This commit is contained in:
Dapr Bot 2025-08-22 09:36:51 -07:00 committed by GitHub
commit 72ef9e84aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions

View File

@ -16,7 +16,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<grpc.version>1.69.0</grpc.version> <grpc.version>1.69.0</grpc.version>
<protobuf.version>3.25.5</protobuf.version> <protobuf.version>3.25.5</protobuf.version>
<protocCommand>protoc</protocCommand> <protocCommand>java-sdk-protoc</protocCommand>
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.3/dapr/proto</dapr.proto.baseurl> <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.3/dapr/proto</dapr.proto.baseurl>
<dapr.sdk.version>1.17.0-SNAPSHOT</dapr.sdk.version> <dapr.sdk.version>1.17.0-SNAPSHOT</dapr.sdk.version>
<dapr.sdk.alpha.version>0.17.0-SNAPSHOT</dapr.sdk.alpha.version> <dapr.sdk.alpha.version>0.17.0-SNAPSHOT</dapr.sdk.alpha.version>

View File

@ -22,7 +22,7 @@
<protobuf.input.directory>${project.build.directory}/proto</protobuf.input.directory> <protobuf.input.directory>${project.build.directory}/proto</protobuf.input.directory>
<maven.deploy.skip>false</maven.deploy.skip> <maven.deploy.skip>false</maven.deploy.skip>
<grpc.version>1.69.0</grpc.version> <grpc.version>1.69.0</grpc.version>
<protocCommand>protoc</protocCommand> <protocCommand>java-sdk-protoc</protocCommand>
<protobuf.version>3.25.5</protobuf.version> <protobuf.version>3.25.5</protobuf.version>
</properties> </properties>
@ -132,7 +132,7 @@
<goal>run</goal> <goal>run</goal>
</goals> </goals>
<configuration> <configuration>
<protocCommand>protoc</protocCommand> <protocCommand>java-sdk-protoc</protocCommand>
<protocVersion>${protobuf.version}</protocVersion> <protocVersion>${protobuf.version}</protocVersion>
<protocArtifact>com.google.protobuf:protoc:3.25.5</protocArtifact> <protocArtifact>com.google.protobuf:protoc:3.25.5</protocArtifact>
<addProtoSources>inputs</addProtoSources> <addProtoSources>inputs</addProtoSources>