chore: Use dapr from master

Signed-off-by: Javier Aliaga <[email protected]>

Author: javier-aliaga

.github/workflows/build.yml

@@ -33,14 +33,14 @@ jobs:
             spring-boot-display-version: 3.3.x
             experimental: false
     env:
-      GOVER: "1.20"
+      GOVER: "1.24.4"
       GOOS: linux
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
-      DAPR_CLI_VER: 1.15.0
-      DAPR_RUNTIME_VER: 1.15.4
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
+      DAPR_CLI_VER: 1.16.0-rc.1
+      DAPR_RUNTIME_VER: 1.16.0-rc.1
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.16.0-rc.1/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
       TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64

.github/workflows/validate.yml

@@ -32,16 +32,16 @@ jobs:
       matrix:
         java: [ 17 ]
     env:
-      GOVER: "1.20"
+      GOVER: "1.24.4"
       GOOS: linux
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
-      DAPR_CLI_VER: 1.15.0
-      DAPR_RUNTIME_VER: 1.15.4
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
+      DAPR_CLI_VER: 1.16.0-rc.1
+      DAPR_RUNTIME_VER: 1.16.0-rc.1
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.16.0-rc.1/install/install.sh
       DAPR_CLI_REF:
-      DAPR_REF:
+      DAPR_REF: 
     steps:
       - uses: actions/checkout@v4
       - name: Set up OpenJDK ${{ env.JDK_VER }}

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.16.0-rc.1")
             .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.16.0-rc.1")
             .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/v1.15.4/dapr/proto</dapr.proto.baseurl>
+    <dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.1/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>

sdk-tests/src/test/java/io/dapr/it/testcontainers/workflows/TestWorkflowsConfiguration.java

@@ -15,6 +15,8 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.dapr.config.Properties;
+import io.dapr.it.testcontainers.TaskExecutionIdActivity;
+import io.dapr.it.testcontainers.TestExecutionKeysWorkflow;
 import io.dapr.workflows.client.DaprWorkflowClient;
 import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
 import org.springframework.beans.factory.annotation.Value;

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.16.0-rc.1 \
 --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.16.0-rc.1";
   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

@@ -13,17 +13,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:1.16.0-rc.1")
+                    .asCompatibleSubstituteFor("daprio/scheduler:1.16.0-rc.1"))
+            .withPlacementImage(DockerImageName.parse("custom/placement:1.16.0-rc.1")
+                    .asCompatibleSubstituteFor("daprio/placement:1.16.0-rc.1"))
             .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:1.16.0-rc.1", dapr.getPlacementDockerImageName().asCanonicalNameString());
+    assertEquals("custom/scheduler:1.16.0-rc.1", dapr.getSchedulerDockerImageName().asCanonicalNameString());
 
   }
 
@@ -32,15 +32,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:1.16.0-rc.1")
+            .withPlacementImage("daprio/placement:1.16.0-rc.1")
             .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:1.16.0-rc.1", dapr.getPlacementDockerImageName().asCanonicalNameString());
+    assertEquals("daprio/scheduler:1.16.0-rc.1", dapr.getSchedulerDockerImageName().asCanonicalNameString());
 
   }
 }