From 680d044635aa16002528e9bf2de74b3fe1d52d39 Mon Sep 17 00:00:00 2001 From: salaboy Date: Fri, 18 Jul 2025 14:26:58 +0100 Subject: [PATCH] Upgrading to 1.15.7 (#1458) * upgrading to 1.15.7 Signed-off-by: salaboy * using DAPR VERSION Signed-off-by: salaboy --------- Signed-off-by: salaboy --- .github/workflows/build.yml | 2 +- .github/workflows/validate.yml | 2 +- .../en/java-sdk-docs/spring-boot/_index.md | 4 ++-- pom.xml | 2 +- spring-boot-examples/kubernetes/README.md | 2 +- .../DaprContainerConstants.java | 2 +- .../testcontainers/DaprContainerTest.java | 21 ++++++++++--------- 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3f6feb65d..d9040b5d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: GOPROXY: https://proxy.golang.org JDK_VER: ${{ matrix.java }} DAPR_CLI_VER: 1.15.0 - DAPR_RUNTIME_VER: 1.15.4 + DAPR_RUNTIME_VER: 1.15.7 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 42a07c878..8e6f1c6aa 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.15.4 + DAPR_RUNTIME_VER: 1.15.7 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 3d5e945e3..0fd64ed69 100644 --- a/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md +++ b/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md @@ -80,7 +80,7 @@ public class DaprTestContainersConfig { @ServiceConnection public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer postgreSQLContainer){ - return new DaprContainer("daprio/daprd:1.15.4") + return new DaprContainer("daprio/daprd:1.15.7") .withAppName("producer-app") .withNetwork(daprNetwork) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) @@ -235,7 +235,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.15.4") + return new DaprContainer("daprio/daprd:1.15.7") .withAppName("producer-app") .withNetwork(daprNetwork) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) diff --git a/pom.xml b/pom.xml index afd535115..9d086f0b3 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.69.0 3.25.5 protoc - https://raw.githubusercontent.com/dapr/dapr/v1.15.4/dapr/proto + https://raw.githubusercontent.com/dapr/dapr/v1.15.7/dapr/proto 1.15.0-rc-8 0.15.0-rc-8 1.7.1 diff --git a/spring-boot-examples/kubernetes/README.md b/spring-boot-examples/kubernetes/README.md index 9f047d76f..67bc1290a 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.15.4 \ +--version=1.15.7 \ --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 89bdb09b0..516d54893 100644 --- a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java @@ -1,7 +1,7 @@ package io.dapr.testcontainers; public interface DaprContainerConstants { - String DAPR_VERSION = "1.15.4"; + String DAPR_VERSION = "1.15.7"; 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; diff --git a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprContainerTest.java b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprContainerTest.java index 680b1f4ee..87cfeda6e 100644 --- a/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprContainerTest.java +++ b/testcontainers-dapr/src/test/java/io/dapr/testcontainers/DaprContainerTest.java @@ -4,6 +4,7 @@ import org.testcontainers.utility.DockerImageName; import static io.dapr.testcontainers.DaprContainerConstants.DAPR_RUNTIME_IMAGE_TAG; +import static io.dapr.testcontainers.DaprContainerConstants.DAPR_VERSION; import static org.junit.jupiter.api.Assertions.assertEquals; public class DaprContainerTest { @@ -13,17 +14,17 @@ public void schedulerAndPlacementCustomImagesTest() { DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("dapr-app") - .withSchedulerImage(DockerImageName.parse("custom/scheduler:1.15.4") - .asCompatibleSubstituteFor("daprio/scheduler:1.15.4")) - .withPlacementImage(DockerImageName.parse("custom/placement:1.15.4") - .asCompatibleSubstituteFor("daprio/placement:1.15.4")) + .withSchedulerImage(DockerImageName.parse("custom/scheduler:" + DAPR_VERSION) + .asCompatibleSubstituteFor("daprio/scheduler:" + DAPR_VERSION)) + .withPlacementImage(DockerImageName.parse("custom/placement:"+ DAPR_VERSION) + .asCompatibleSubstituteFor("daprio/placement:" + DAPR_VERSION)) .withAppPort(8081) .withDaprLogLevel(DaprLogLevel.DEBUG) .withAppChannelAddress("host.testcontainers.internal"); - assertEquals("custom/placement:1.15.4", dapr.getPlacementDockerImageName().asCanonicalNameString()); - assertEquals("custom/scheduler:1.15.4", dapr.getSchedulerDockerImageName().asCanonicalNameString()); + assertEquals("custom/placement:" + DAPR_VERSION, dapr.getPlacementDockerImageName().asCanonicalNameString()); + assertEquals("custom/scheduler:" + DAPR_VERSION, dapr.getSchedulerDockerImageName().asCanonicalNameString()); } @@ -32,15 +33,15 @@ public void schedulerAndPlacementCustomImagesStringTest() { DaprContainer dapr = new DaprContainer(DAPR_RUNTIME_IMAGE_TAG) .withAppName("dapr-app") - .withSchedulerImage("daprio/scheduler:1.15.4") - .withPlacementImage("daprio/placement:1.15.4") + .withSchedulerImage("daprio/scheduler:" + DAPR_VERSION) + .withPlacementImage("daprio/placement:"+ DAPR_VERSION) .withAppPort(8081) .withDaprLogLevel(DaprLogLevel.DEBUG) .withAppChannelAddress("host.testcontainers.internal"); - assertEquals("daprio/placement:1.15.4", dapr.getPlacementDockerImageName().asCanonicalNameString()); - assertEquals("daprio/scheduler:1.15.4", dapr.getSchedulerDockerImageName().asCanonicalNameString()); + assertEquals("daprio/placement:" + DAPR_VERSION, dapr.getPlacementDockerImageName().asCanonicalNameString()); + assertEquals("daprio/scheduler:" + DAPR_VERSION, dapr.getSchedulerDockerImageName().asCanonicalNameString()); } }