Merge branch 'master' into users/svegiraju/add-failure-policy

Signed-off-by: Siri Varma Vegiraju <[email protected]>

Author: siri-varma

.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:

.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:

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

@@ -83,7 +83,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))
@@ -238,7 +238,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))

pom.xml

@@ -17,7 +17,7 @@
     <grpc.version>1.69.0</grpc.version>
     <protobuf.version>3.25.5</protobuf.version>
     <protocCommand>protoc</protocCommand>
-    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/master/dapr/proto</dapr.proto.baseurl>
+    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.15.7/dapr/proto</dapr.proto.baseurl>
     <dapr.sdk.version>1.16.0-SNAPSHOT</dapr.sdk.version>
     <dapr.sdk.alpha.version>0.16.0-SNAPSHOT</dapr.sdk.alpha.version>
     <os-maven-plugin.version>1.7.1</os-maven-plugin.version>

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

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.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;

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());
 
   }
 }