Skip to content

Commit ee89757

Browse files
committed
chore: Use dapr from master
Signed-off-by: Javier Aliaga <[email protected]>
1 parent 39010b3 commit ee89757

File tree

7 files changed

+16
-14
lines changed

7 files changed

+16
-14
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ jobs:
3333
spring-boot-display-version: 3.3.x
3434
experimental: false
3535
env:
36-
GOVER: "1.20"
36+
GOVER: "1.24.4"
3737
GOOS: linux
3838
GOARCH: amd64
3939
GOPROXY: https://proxy.golang.org
4040
JDK_VER: ${{ matrix.java }}
41-
DAPR_CLI_VER: 1.15.0
42-
DAPR_RUNTIME_VER: 1.15.7
43-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
41+
DAPR_CLI_VER: 1.16.0-rc.1
42+
DAPR_RUNTIME_VER: 1.16.0-rc.1
43+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.16.0-rc.1/install/install.sh
4444
DAPR_CLI_REF:
4545
DAPR_REF:
4646
TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64

.github/workflows/validate.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,16 @@ jobs:
3232
matrix:
3333
java: [ 17 ]
3434
env:
35-
GOVER: "1.20"
35+
GOVER: "1.24.4"
3636
GOOS: linux
3737
GOARCH: amd64
3838
GOPROXY: https://proxy.golang.org
3939
JDK_VER: ${{ matrix.java }}
40-
DAPR_CLI_VER: 1.15.0
41-
DAPR_RUNTIME_VER: 1.15.7
42-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
40+
DAPR_CLI_VER: 1.16.0-rc.1
41+
DAPR_RUNTIME_VER: 1.16.0-rc.1
42+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.16.0-rc.1/install/install.sh
4343
DAPR_CLI_REF:
44-
DAPR_REF:
44+
DAPR_REF:
4545
steps:
4646
- uses: actions/checkout@v4
4747
- name: Set up OpenJDK ${{ env.JDK_VER }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public class DaprTestContainersConfig {
8383
@ServiceConnection
8484
public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer){
8585

86-
return new DaprContainer("daprio/daprd:1.15.7")
86+
return new DaprContainer("daprio/daprd:1.16.0-rc.1")
8787
.withAppName("producer-app")
8888
.withNetwork(daprNetwork)
8989
.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
238238
@ServiceConnection
239239
public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer, RabbitMQContainer rabbitMQContainer){
240240

241-
return new DaprContainer("daprio/daprd:1.15.7")
241+
return new DaprContainer("daprio/daprd:1.16.0-rc.1")
242242
.withAppName("producer-app")
243243
.withNetwork(daprNetwork)
244244
.withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES))

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<grpc.version>1.69.0</grpc.version>
1818
<protobuf.version>3.25.5</protobuf.version>
1919
<protocCommand>protoc</protocCommand>
20-
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.15.7/dapr/proto</dapr.proto.baseurl>
20+
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.1/dapr/proto</dapr.proto.baseurl>
2121
<dapr.sdk.version>1.16.0-SNAPSHOT</dapr.sdk.version>
2222
<dapr.sdk.alpha.version>0.16.0-SNAPSHOT</dapr.sdk.alpha.version>
2323
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515

1616
import com.fasterxml.jackson.databind.ObjectMapper;
1717
import io.dapr.config.Properties;
18+
import io.dapr.it.testcontainers.TaskExecutionIdActivity;
19+
import io.dapr.it.testcontainers.TestExecutionKeysWorkflow;
1820
import io.dapr.workflows.client.DaprWorkflowClient;
1921
import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
2022
import org.springframework.beans.factory.annotation.Value;

spring-boot-examples/kubernetes/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Once you have the cluster up and running you can install Dapr:
3030
helm repo add dapr https://dapr.github.io/helm-charts/
3131
helm repo update
3232
helm upgrade --install dapr dapr/dapr \
33-
--version=1.15.7 \
33+
--version=1.16.0-rc.1 \
3434
--namespace dapr-system \
3535
--create-namespace \
3636
--wait

testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
package io.dapr.testcontainers;
1515

1616
public interface DaprContainerConstants {
17-
String DAPR_VERSION = "1.15.7";
17+
String DAPR_VERSION = "1.16.0-rc.1";
1818
String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_VERSION;
1919
String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_VERSION;
2020
String DAPR_SCHEDULER_IMAGE_TAG = "daprio/scheduler:" + DAPR_VERSION;

0 commit comments

Comments
 (0)