From bc660b5592aa261781fa77d80244a2915ab142cc Mon Sep 17 00:00:00 2001 From: Javier Aliaga Date: Mon, 4 May 2026 13:15:39 +0200 Subject: [PATCH 1/4] feat: download attestation.proto for durabletask-client Add attestation.proto to the list of proto files fetched by the download-maven-plugin so it is compiled alongside the other durabletask protos. Signed-off-by: Javier Aliaga --- durabletask-client/pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/durabletask-client/pom.xml b/durabletask-client/pom.xml index 41ac0f9b99..cdceed2aa1 100644 --- a/durabletask-client/pom.xml +++ b/durabletask-client/pom.xml @@ -161,6 +161,19 @@ ${protobuf.input.directory} + + getAttestationProto + initialize + + wget + + + true + ${durabletask.proto.baseurl}/attestation.proto + attestation.proto + ${protobuf.input.directory} + + From 1a53b7afddb3886c1ab7a781b740dac42c6ecb4e Mon Sep 17 00:00:00 2001 From: Javier Aliaga Date: Mon, 4 May 2026 16:39:39 +0200 Subject: [PATCH 2/4] chore: Update to 1.18.0-rc.1 Signed-off-by: Javier Aliaga --- .github/workflows/build.yml | 2 +- .github/workflows/validate.yml | 2 +- pom.xml | 2 +- .../java/io/dapr/testcontainers/DaprContainerConstants.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 49b3c77cad..bc0d9dbf64 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,7 +118,7 @@ jobs: GOPROXY: https://proxy.golang.org JDK_VER: ${{ matrix.java }} DAPR_CLI_VER: 1.17.0 - DAPR_RUNTIME_VER: 1.17.0 + DAPR_RUNTIME_VER: 1.18.0-rc.1 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.17.0/install/install.sh DAPR_CLI_REF: DAPR_REF: diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 24effa0fa0..947b70288b 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.17.0 - DAPR_RUNTIME_VER: 1.17.0 + DAPR_RUNTIME_VER: 1.18.0-rc.1 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.17.0/install/install.sh DAPR_CLI_REF: DAPR_REF: diff --git a/pom.xml b/pom.xml index a911e1d7b3..5fdb9ef308 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ UTF-8 1.79.0 3.25.5 - https://raw.githubusercontent.com/dapr/dapr/v1.17.0/dapr/proto + https://raw.githubusercontent.com/dapr/dapr/v1.18.0-rc.1/dapr/proto https://raw.githubusercontent.com/dapr/durabletask-protobuf/main/protos 1.18.0-SNAPSHOT 1.7.1 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 85e379a51e..dc5a932378 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 @@ package io.dapr.testcontainers; public interface DaprContainerConstants { - String DAPR_VERSION = "1.17.0"; + String DAPR_VERSION = "1.18.0-rc.1"; String DAPR_WORKFLOWS_DASHBOARD_VERSION = "0.0.1"; String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_VERSION; String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_VERSION; From de9f954e2025cb3bb662ed32ba6cd2fbf7fcf1c1 Mon Sep 17 00:00:00 2001 From: Javier Aliaga Date: Wed, 6 May 2026 13:25:08 +0200 Subject: [PATCH 3/4] chore: Use 1.18.0-rc.2 Signed-off-by: Javier Aliaga --- .github/workflows/build.yml | 2 +- .github/workflows/validate.yml | 2 +- pom.xml | 2 +- .../java/io/dapr/testcontainers/DaprContainerConstants.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bc0d9dbf64..7c3fd275f9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -118,7 +118,7 @@ jobs: GOPROXY: https://proxy.golang.org JDK_VER: ${{ matrix.java }} DAPR_CLI_VER: 1.17.0 - DAPR_RUNTIME_VER: 1.18.0-rc.1 + DAPR_RUNTIME_VER: 1.18.0-rc.2 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.17.0/install/install.sh DAPR_CLI_REF: DAPR_REF: diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 947b70288b..aaa001cd48 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.17.0 - DAPR_RUNTIME_VER: 1.18.0-rc.1 + DAPR_RUNTIME_VER: 1.18.0-rc.2 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.17.0/install/install.sh DAPR_CLI_REF: DAPR_REF: diff --git a/pom.xml b/pom.xml index 5fdb9ef308..0bbf810001 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ UTF-8 1.79.0 3.25.5 - https://raw.githubusercontent.com/dapr/dapr/v1.18.0-rc.1/dapr/proto + https://raw.githubusercontent.com/dapr/dapr/v1.18.0-rc.2/dapr/proto https://raw.githubusercontent.com/dapr/durabletask-protobuf/main/protos 1.18.0-SNAPSHOT 1.7.1 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 dc5a932378..e3ca649039 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 @@ package io.dapr.testcontainers; public interface DaprContainerConstants { - String DAPR_VERSION = "1.18.0-rc.1"; + String DAPR_VERSION = "1.18.0-rc.2"; String DAPR_WORKFLOWS_DASHBOARD_VERSION = "0.0.1"; String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_VERSION; String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_VERSION; From aeb8e71e2ad1a8d42d8dab5df6c71ebaea80bf95 Mon Sep 17 00:00:00 2001 From: Javier Aliaga Date: Wed, 6 May 2026 17:31:07 +0200 Subject: [PATCH 4/4] fix: Cleanup resources to avoid spam logs Signed-off-by: Javier Aliaga --- .../version/full/FullVersioningWorkflowsIT.java | 14 ++++++++++++++ .../version/patch/PatchVersioningWorkflowsIT.java | 14 +++++++++++++- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/version/full/FullVersioningWorkflowsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/version/full/FullVersioningWorkflowsIT.java index 2816bc46fa..533c802183 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/version/full/FullVersioningWorkflowsIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/version/full/FullVersioningWorkflowsIT.java @@ -28,6 +28,7 @@ import io.dapr.workflows.client.WorkflowState; import io.dapr.workflows.runtime.WorkflowRuntime; import io.dapr.workflows.runtime.WorkflowRuntimeBuilder; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -222,5 +223,18 @@ public DaprWorkflowClient daprWorkflowClient( return new DaprWorkflowClient(new Properties(overrides)); } + + // V2 containers are started manually inside the test and are not managed by @Container, + // so we must stop them explicitly to prevent the daprd V2 process from continuing to log + // placement/scheduler reconnect failures throughout subsequent tests. + @AfterAll + static void stopManuallyStartedContainers() { + if (workerV2.isRunning()) { + workerV2.stop(); + } + if (DAPR_CONTAINER_V2.isRunning()) { + DAPR_CONTAINER_V2.stop(); + } + } } diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/version/patch/PatchVersioningWorkflowsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/version/patch/PatchVersioningWorkflowsIT.java index b6e971482c..c1b331aa52 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/version/patch/PatchVersioningWorkflowsIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/version/patch/PatchVersioningWorkflowsIT.java @@ -26,6 +26,7 @@ import io.dapr.testcontainers.WorkflowDashboardContainer; import io.dapr.workflows.client.DaprWorkflowClient; import io.dapr.workflows.client.WorkflowState; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Tag; import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @@ -221,6 +222,17 @@ public DaprWorkflowClient daprWorkflowClient( return new DaprWorkflowClient(new Properties(overrides)); } - + // V2 containers are started manually inside the test and are not managed by @Container, + // so we must stop them explicitly to prevent the daprd V2 process from continuing to log + // placement/scheduler reconnect failures throughout subsequent tests. + @AfterAll + static void stopManuallyStartedContainers() { + if (workerV2.isRunning()) { + workerV2.stop(); + } + if (DAPR_CONTAINER_V2.isRunning()) { + DAPR_CONTAINER_V2.stop(); + } + } }