diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a6cfafcb2..7bfc93568 100644 --- a/.github/workflows/build.yml +++ b/.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: diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 5532b167b..0a73978c7 100644 --- a/.github/workflows/validate.yml +++ b/.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: diff --git a/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md b/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md index a331e6fbe..3fbb2a584 100644 --- a/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md +++ b/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)) diff --git a/pom.xml b/pom.xml index 763f2fd19..da9e1dda4 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.69.0 3.25.5 java-sdk-protoc - https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.3/dapr/proto + https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.5/dapr/proto 1.17.0-SNAPSHOT 0.17.0-SNAPSHOT 1.7.1 diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/conversations/DaprConversationIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/conversations/DaprConversationIT.java index 2301e6fc3..7177d2aab 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/conversations/DaprConversationIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/conversations/DaprConversationIT.java @@ -109,11 +109,9 @@ public class DaprConversationIT { this.daprPreviewClient.converse(new ConversationRequest("echo", conversationInputList) .setScrubPii(true)).block(); - Assertions.assertEquals("", response.getContextId()); - Assertions.assertEquals("input this ", + Assertions.assertEquals("", response.getContextId()); + Assertions.assertEquals("input this \ninput this ", response.getConversationOutputs().get(0).getResult()); - Assertions.assertEquals("input this ", - response.getConversationOutputs().get(1).getResult()); } @Test @@ -126,9 +124,7 @@ public class DaprConversationIT { 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 ", response.getConversationOutputs().get(0).getResult()); - Assertions.assertEquals("input this ", - response.getConversationOutputs().get(1).getResult()); } } diff --git a/spring-boot-examples/kubernetes/README.md b/spring-boot-examples/kubernetes/README.md index 2f3fddac8..d780c2eb8 100644 --- a/spring-boot-examples/kubernetes/README.md +++ b/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 diff --git a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java index dd24e0a46..f32607336 100644 --- a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java @@ -14,7 +14,7 @@ limitations under the License. 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;