chore: Bump dapr version (#1539)

* chore: Bump dapr version

Signed-off-by: Javier Aliaga <javier@diagrid.io>

* chore: Fix conversation tests

Only one response expected

Signed-off-by: Javier Aliaga <javier@diagrid.io>

---------

Signed-off-by: Javier Aliaga <javier@diagrid.io>

Author: javier-aliaga

.github/workflows/build.yml

@@ -68,7 +68,7 @@ jobs:
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
       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_CLI_REF:
       DAPR_REF:

.github/workflows/validate.yml

@@ -38,7 +38,7 @@ jobs:
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
       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_CLI_REF:
       DAPR_REF:

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

@@ -95,7 +95,7 @@ public class DaprTestContainersConfig {
   @ServiceConnection
   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")
             .withNetwork(daprNetwork)
             .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
 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")
             .withNetwork(daprNetwork)
             .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES))

pom.xml

@@ -17,7 +17,7 @@
     <grpc.version>1.69.0</grpc.version>
     <protobuf.version>3.25.5</protobuf.version>
     <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.alpha.version>0.17.0-SNAPSHOT</dapr.sdk.alpha.version>
     <os-maven-plugin.version>1.7.1</os-maven-plugin.version>

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

@@ -109,11 +109,9 @@ public void testConversationSDKShouldScrubPIIWhenScrubPIIIsSetInRequestBody() {
                 this.daprPreviewClient.converse(new ConversationRequest("echo", conversationInputList)
                         .setScrubPii(true)).block();
 
-        Assertions.assertEquals("", response.getContextId());
-        Assertions.assertEquals("input this <EMAIL_ADDRESS>",
+      Assertions.assertEquals("", response.getContextId());
+      Assertions.assertEquals("input this <EMAIL_ADDRESS>\ninput this <PHONE_NUMBER>",
                 response.getConversationOutputs().get(0).getResult());
-        Assertions.assertEquals("input this <PHONE_NUMBER>",
-                response.getConversationOutputs().get(1).getResult());
     }
 
     @Test
@@ -126,9 +124,7 @@ public void testConversationSDKShouldScrubPIIOnlyForTheInputWhereScrubPIIIsSet()
                 this.daprPreviewClient.converse(new ConversationRequest("echo", conversationInputList)).block();
 
         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());
-        Assertions.assertEquals("input this <PHONE_NUMBER>",
-                response.getConversationOutputs().get(1).getResult());
     }
 }

spring-boot-examples/kubernetes/README.md

@@ -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 update
 helm upgrade --install dapr dapr/dapr \
---version=1.16.0-rc.3 \
+--version=1.16.0-rc.5 \
 --namespace dapr-system \
 --create-namespace \
 --wait

testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java

@@ -14,7 +14,7 @@
 package io.dapr.testcontainers;
 
 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_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_VERSION;
   String DAPR_SCHEDULER_IMAGE_TAG = "daprio/scheduler:" + DAPR_VERSION;