Skip to content

Commit a6d9cb0

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

File tree

7 files changed

+23
-9
lines changed

7 files changed

+23
-9
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
GOPROXY: https://proxy.golang.org
4040
JDK_VER: ${{ matrix.java }}
4141
DAPR_CLI_VER: 1.15.0
42-
DAPR_RUNTIME_VER: 1.15.7
42+
DAPR_RUNTIME_VER: 1.16.0-rc.2
4343
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
4444
DAPR_CLI_REF:
4545
DAPR_REF:

.github/workflows/validate.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
GOPROXY: https://proxy.golang.org
3939
JDK_VER: ${{ matrix.java }}
4040
DAPR_CLI_VER: 1.15.0
41-
DAPR_RUNTIME_VER: 1.15.7
41+
DAPR_RUNTIME_VER: 1.16.0-rc.2
4242
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
4343
DAPR_CLI_REF:
4444
DAPR_REF:

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ If you already have a Spring Boot application, you can directly add the followin
2626
<dependency>
2727
<groupId>io.dapr.spring</groupId>
2828
<artifactId>dapr-spring-boot-starter</artifactId>
29-
<version>0.x.x</version> // see below for the latest versions
29+
<version>0.14.2</version>
3030
</dependency>
3131
<dependency>
3232
<groupId>io.dapr.spring</groupId>
3333
<artifactId>dapr-spring-boot-starter-test</artifactId>
34-
<version>0.x.x</version> // see below for the latest versions
34+
<version>0.14.2</version>
3535
<scope>test</scope>
3636
</dependency>
3737
```
@@ -53,6 +53,18 @@ private DaprClient daprClient;
5353

5454
This will connect to the default Dapr gRPC endpoint `localhost:50001`, requiring you to start Dapr outside of your application.
5555

56+
{{% alert title="Note" color="primary" %}}
57+
By default, the following properties are preconfigured for `DaprClient` and `DaprWorkflowClient`:
58+
```properties
59+
dapr.client.http-endpoint=http://localhost
60+
dapr.client.http-port=3500
61+
dapr.client.grpc-endpoint=localhost
62+
dapr.client.grpc-port=50001
63+
dapr.client.api-token=<Your Remote App API Token>
64+
```
65+
These values are used by default, but you can override them in your `application.properties` file to suit your environment.
66+
{{% /alert %}}
67+
5668
You can use the `DaprClient` to interact with the Dapr APIs anywhere in your application, for example from inside a REST endpoint:
5769

5870
```java
@@ -83,7 +95,7 @@ public class DaprTestContainersConfig {
8395
@ServiceConnection
8496
public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer){
8597

86-
return new DaprContainer("daprio/daprd:1.15.7")
98+
return new DaprContainer("daprio/daprd:1.16.0-rc.2")
8799
.withAppName("producer-app")
88100
.withNetwork(daprNetwork)
89101
.withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES))
@@ -238,7 +250,7 @@ Finally, because Dapr PubSub requires a bidirectional connection between your ap
238250
@ServiceConnection
239251
public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer<?> postgreSQLContainer, RabbitMQContainer rabbitMQContainer){
240252

241-
return new DaprContainer("daprio/daprd:1.15.7")
253+
return new DaprContainer("daprio/daprd:1.16.0-rc.2")
242254
.withAppName("producer-app")
243255
.withNetwork(daprNetwork)
244256
.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.2/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.2 \
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.2";
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)