dapr
/
java-sdk
mirror of https://github.com/dapr/java-sdk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into gh-1533

This commit is contained in:
salaboy 2025-09-01 13:23:52 +01:00 committed by GitHub
parent c63d318ecb 8fa4e9dee6
commit 3ace37c38e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -68,7 +68,7 @@ jobs:
GOPROXY: https://proxy.golang.org GOPROXY: https://proxy.golang.org
JDK_VER: ${{ matrix.java }} JDK_VER: ${{ matrix.java }}
DAPR_CLI_VER: 1.15.0 DAPR_CLI_VER: 1.15.0
DAPR_RUNTIME_VER: 1.16.0-rc.3 DAPR_RUNTIME_VER: 1.16.0-rc.5
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
DAPR_CLI_REF: DAPR_CLI_REF:
DAPR_REF: DAPR_REF:

2
.github/workflows/validate.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
GOPROXY: https://proxy.golang.org GOPROXY: https://proxy.golang.org
JDK_VER: ${{ matrix.java }} JDK_VER: ${{ matrix.java }}
DAPR_CLI_VER: 1.15.0 DAPR_CLI_VER: 1.15.0
DAPR_RUNTIME_VER: 1.16.0-rc.3 DAPR_RUNTIME_VER: 1.16.0-rc.5
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
DAPR_CLI_REF: DAPR_CLI_REF:
DAPR_REF: DAPR_REF:

4
daprdocs/content/en/java-sdk-docs/spring-boot/_index.md
View File

@ -95,7 +95,7 @@ public class DaprTestContainersConfig {
@ServiceConnection @ServiceConnection
public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer){ public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer){
return new DaprContainer("daprio/daprd:1.16.0-rc.3") return new DaprContainer("daprio/daprd:1.16.0-rc.5")
.withAppName("producer-app") .withAppName("producer-app")
.withNetwork(daprNetwork) .withNetwork(daprNetwork)
.withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES))
@ -250,7 +250,7 @@ Finally, because Dapr PubSub requires a bidirectional connection between your ap
@ServiceConnection @ServiceConnection
public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer, RabbitMQContainer rabbitMQContainer){ public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer, RabbitMQContainer rabbitMQContainer){
return new DaprContainer("daprio/daprd:1.16.0-rc.3") return new DaprContainer("daprio/daprd:1.16.0-rc.5")
.withAppName("producer-app") .withAppName("producer-app")
.withNetwork(daprNetwork) .withNetwork(daprNetwork)
.withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES))

2
pom.xml
View File

@ -17,7 +17,7 @@
<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>java-sdk-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.5/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>
<os-maven-plugin.version>1.7.1</os-maven-plugin.version> <os-maven-plugin.version>1.7.1</os-maven-plugin.version>

10
sdk-tests/src/test/java/io/dapr/it/testcontainers/conversations/DaprConversationIT.java
View File

@ -109,11 +109,9 @@ public class DaprConversationIT {
this.daprPreviewClient.converse(new ConversationRequest("echo", conversationInputList) this.daprPreviewClient.converse(new ConversationRequest("echo", conversationInputList)
.setScrubPii(true)).block(); .setScrubPii(true)).block();
Assertions.assertEquals("", response.getContextId()); Assertions.assertEquals("", response.getContextId());
Assertions.assertEquals("input this <EMAIL_ADDRESS>", Assertions.assertEquals("input this <EMAIL_ADDRESS>\ninput this <PHONE_NUMBER>",
response.getConversationOutputs().get(0).getResult()); response.getConversationOutputs().get(0).getResult());
Assertions.assertEquals("input this <PHONE_NUMBER>",
response.getConversationOutputs().get(1).getResult());
} }
@Test @Test
@ -126,9 +124,7 @@ public class DaprConversationIT {
this.daprPreviewClient.converse(new ConversationRequest("echo", conversationInputList)).block(); this.daprPreviewClient.converse(new ConversationRequest("echo", conversationInputList)).block();
Assertions.assertEquals("", response.getContextId()); Assertions.assertEquals("", response.getContextId());
Assertions.assertEquals("input this abcd@gmail.com", Assertions.assertEquals("input this abcd@gmail.com\ninput this <PHONE_NUMBER>",
response.getConversationOutputs().get(0).getResult()); response.getConversationOutputs().get(0).getResult());
Assertions.assertEquals("input this <PHONE_NUMBER>",
response.getConversationOutputs().get(1).getResult());
} }
} }

2
spring-boot-examples/kubernetes/README.md
View File

@ -30,7 +30,7 @@ Once you have the cluster up and running you can install Dapr:
helm repo add dapr https://dapr.github.io/helm-charts/ helm repo add dapr https://dapr.github.io/helm-charts/
helm repo update helm repo update
helm upgrade --install dapr dapr/dapr \ helm upgrade --install dapr dapr/dapr \
--version=1.16.0-rc.3 \ --version=1.16.0-rc.5 \
--namespace dapr-system \ --namespace dapr-system \
--create-namespace \ --create-namespace \
--wait --wait

2
testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java
View File

@ -14,7 +14,7 @@ limitations under the License.
package io.dapr.testcontainers; package io.dapr.testcontainers;
public interface DaprContainerConstants { public interface DaprContainerConstants {
String DAPR_VERSION = "1.16.0-rc.3"; String DAPR_VERSION = "1.16.0-rc.5";
String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_VERSION; String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_VERSION;
String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_VERSION; String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_VERSION;
String DAPR_SCHEDULER_IMAGE_TAG = "daprio/scheduler:" + DAPR_VERSION; String DAPR_SCHEDULER_IMAGE_TAG = "daprio/scheduler:" + DAPR_VERSION;