Skip to content

Commit 66d04e0

Browse files
mukundansundarmukundansundar
authored
Merge branch 'master' into dependabot/github_actions/actions/checkout-3
2 parents 8a13d47 + 7593b0e commit 66d04e0

File tree

674 files changed

+2192
-2018
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

674 files changed

+2192
-2018
lines changed

‎.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
GOARCH: amd64
2626
GOPROXY: https://proxy.golang.org
2727
JDK_VER: ${{ matrix.java }}
28-
DAPR_CLI_VER: 1.9.0-rc.2
29-
DAPR_RUNTIME_VER: 1.9.0-rc.3
30-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.9.0-rc.2/install/install.sh
28+
DAPR_CLI_VER: 1.9.1
29+
DAPR_RUNTIME_VER: 1.9.3
30+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.9.1/install/install.sh
3131
DAPR_CLI_REF:
3232
DAPR_REF:
3333
steps:

‎.github/workflows/validate.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
GOARCH: amd64
3737
GOPROXY: https://proxy.golang.org
3838
JDK_VER: ${{ matrix.java }}
39-
DAPR_CLI_VER: 1.9.0-rc.2
40-
DAPR_RUNTIME_VER: 1.9.0-rc.3
41-
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.9.0-rc.2/install/install.sh
39+
DAPR_CLI_VER: 1.9.1
40+
DAPR_RUNTIME_VER: 1.9.3
41+
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.9.1/install/install.sh
4242
DAPR_CLI_REF:
4343
DAPR_REF:
4444
steps:

‎README.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@ For a Maven project, add the following to your `pom.xml` file:
5252
<dependency>
5353
<groupId>io.dapr</groupId>
5454
<artifactId>dapr-sdk</artifactId>
55-
<version>1.7.0</version>
55+
<version>1.7.1</version>
5656
</dependency>
5757
<!-- Dapr's SDK for Actors (optional). -->
5858
<dependency>
5959
<groupId>io.dapr</groupId>
6060
<artifactId>dapr-sdk-actors</artifactId>
61-
<version>1.7.0</version>
61+
<version>1.7.1</version>
6262
</dependency>
6363
<!-- Dapr's SDK integration with SpringBoot (optional). -->
6464
<dependency>
6565
<groupId>io.dapr</groupId>
6666
<artifactId>dapr-sdk-springboot</artifactId>
67-
<version>1.7.0</version>
67+
<version>1.7.1</version>
6868
</dependency>
6969
...
7070
</dependencies>
@@ -78,11 +78,11 @@ For a Gradle project, add the following to your `build.gradle` file:
7878
dependencies {
7979
...
8080
// Dapr's core SDK with all features, except Actors.
81-
compile('io.dapr:dapr-sdk:1.7.0')
81+
compile('io.dapr:dapr-sdk:1.7.1')
8282
// Dapr's SDK for Actors (optional).
83-
compile('io.dapr:dapr-sdk-actors:1.7.0')
83+
compile('io.dapr:dapr-sdk-actors:1.7.1')
8484
// Dapr's SDK integration with SpringBoot (optional).
85-
compile('io.dapr:dapr-sdk-springboot:1.7.0')
85+
compile('io.dapr:dapr-sdk-springboot:1.7.1')
8686
}
8787
```
8888

@@ -191,17 +191,20 @@ Most exceptions thrown from the SDK are instances of `DaprException`. `DaprExcep
191191
192192
## Development
193193
194-
### Update proto files
194+
### Update URL to fetch proto files
195195
196-
Change the properties below in [pom.xml](./pom.xml) to point to the desired reference URL in Git. Avoid pointing to `master` branch since it can change over time and create unpredictable behavior in the build.
196+
Change the `dapr.proto.baseurl` property below in [pom.xml](./pom.xml) to point to the URL for the desired commit hash in Git if you need to target a proto file that is not been merged into master yet.
197+
Note: You may need to run `mvn clean` after changing this setting to remove any auto-generated files so that the new proto files get downloaded and compiled.
197198
198199
```xml
199200
<project>
200201
...
201202
<properties>
202203
...
203-
<dapr.proto.url>https://raw.githubusercontent.com/dapr/dapr/v1.0.0/pkg/proto/dapr/dapr.proto</dapr.proto.url>
204-
<dapr.client.proto.url>https://raw.githubusercontent.com/dapr/dapr/v1.0.0/pkg/proto/daprclient/daprclient.proto</dapr.client.proto.url>
204+
<!-- change this .... -->
205+
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/(current ref in pom.xml)/dapr/proto</dapr.proto.baseurl>
206+
<!-- to something like this: -->
207+
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/1ac5d0e8590a7d6772c9957c236351ed992ccb19/dapr/proto</dapr.proto.baseurl>
205208
...
206209
</properties>
207210
...

‎daprdocs/content/en/java-sdk-docs/_index.md

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ For a Maven project, add the following to your `pom.xml` file:
3131
<dependency>
3232
<groupId>io.dapr</groupId>
3333
<artifactId>dapr-sdk</artifactId>
34-
<version>1.7.0</version>
34+
<version>1.7.1</version>
3535
</dependency>
3636
<!-- Dapr's SDK for Actors (optional). -->
3737
<dependency>
3838
<groupId>io.dapr</groupId>
3939
<artifactId>dapr-sdk-actors</artifactId>
40-
<version>1.7.0</version>
40+
<version>1.7.1</version>
4141
</dependency>
4242
<!-- Dapr's SDK integration with SpringBoot (optional). -->
4343
<dependency>
4444
<groupId>io.dapr</groupId>
4545
<artifactId>dapr-sdk-springboot</artifactId>
46-
<version>1.7.0</version>
46+
<version>1.7.1</version>
4747
</dependency>
4848
...
4949
</dependencies>
@@ -57,11 +57,11 @@ For a Gradle project, add the following to your `build.gradle` file:
5757
dependencies {
5858
...
5959
// Dapr's core SDK with all features, except Actors.
60-
compile('io.dapr:dapr-sdk:1.7.0')
60+
compile('io.dapr:dapr-sdk:1.7.1')
6161
// Dapr's SDK for Actors (optional).
62-
compile('io.dapr:dapr-sdk-actors:1.7.0')
62+
compile('io.dapr:dapr-sdk-actors:1.7.1')
6363
// Dapr's SDK integration with SpringBoot (optional).
64-
compile('io.dapr:dapr-sdk-springboot:1.7.0')
64+
compile('io.dapr:dapr-sdk-springboot:1.7.1')
6565
}
6666
```
6767

@@ -292,13 +292,16 @@ try (DaprPreviewClient client = (new DaprClientBuilder()).buildPreviewClient())
292292
// Get configuration for a single key
293293
Mono<ConfigurationItem> item = client.getConfiguration(CONFIG_STORE_NAME, CONFIG_KEY).block();
294294

295-
// Get Configurations for multiple keys
296-
Mono<List<ConfigurationItem>> items =
295+
// Get configurations for multiple keys
296+
Mono<Map<String, ConfigurationItem>> items =
297297
client.getConfiguration(CONFIG_STORE_NAME, CONFIG_KEY_1, CONFIG_KEY_2);
298298

299-
// Susbcribe to Confifuration changes
300-
Flux<List<ConfigurationItem>> outFlux = client.subscribeToConfiguration(CONFIG_STORE_NAME, CONFIG_KEY_1, CONFIG_KEY_2);
299+
// Subscribe to configuration changes
300+
Flux<SubscribeConfigurationResponse> outFlux = client.subscribeConfiguration(CONFIG_STORE_NAME, CONFIG_KEY_1, CONFIG_KEY_2);
301301
outFlux.subscribe(configItems -> configItems.forEach(...));
302+
303+
// Unsubscribe from configuration changes
304+
Mono<UnsubscribeConfigurationResponse> unsubscribe = client.unsubscribeConfiguration(SUBSCRIPTION_ID, CONFIG_STORE_NAME)
302305
}
303306
```
304307

‎daprdocs/content/en/java-sdk-docs/_index.mdbak

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,19 +31,19 @@ For a Maven project, add the following to your `pom.xml` file:
3131
<dependency>
3232
<groupId>io.dapr</groupId>
3333
<artifactId>dapr-sdk</artifactId>
34-
<version>1.7.0</version>
34+
<version>1.7.1</version>
3535
</dependency>
3636
<!-- Dapr's SDK for Actors (optional). -->
3737
<dependency>
3838
<groupId>io.dapr</groupId>
3939
<artifactId>dapr-sdk-actors</artifactId>
40-
<version>1.7.0</version>
40+
<version>1.7.1</version>
4141
</dependency>
4242
<!-- Dapr's SDK integration with SpringBoot (optional). -->
4343
<dependency>
4444
<groupId>io.dapr</groupId>
4545
<artifactId>dapr-sdk-springboot</artifactId>
46-
<version>1.7.0</version>
46+
<version>1.7.1</version>
4747
</dependency>
4848
...
4949
</dependencies>
@@ -57,11 +57,11 @@ For a Gradle project, add the following to your `build.gradle` file:
5757
dependencies {
5858
...
5959
// Dapr's core SDK with all features, except Actors.
60-
compile('io.dapr:dapr-sdk:1.6.0')
60+
compile('io.dapr:dapr-sdk:1.7.0')
6161
// Dapr's SDK for Actors (optional).
62-
compile('io.dapr:dapr-sdk-actors:1.6.0')
62+
compile('io.dapr:dapr-sdk-actors:1.7.0')
6363
// Dapr's SDK integration with SpringBoot (optional).
64-
compile('io.dapr:dapr-sdk-springboot:1.6.0')
64+
compile('io.dapr:dapr-sdk-springboot:1.7.0')
6565
}
6666
```
6767

@@ -72,7 +72,7 @@ You can fix this by specifying a compatible OkHttp version in your project to ma
7272
<dependency>
7373
<groupId>com.squareup.okhttp3</groupId>
7474
<artifactId>okhttp</artifactId>
75-
<version>1.7.0</version>
75+
<version>1.7.1</version>
7676
</dependency>
7777
```
7878

‎docs/allclasses-index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
6-
<title>All Classes (dapr-sdk-parent 1.7.0 API)</title>
5+
<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
6+
<title>All Classes (dapr-sdk-parent 1.7.1 API)</title>
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
9-
<meta name="dc.created" content="2022-10-13">
9+
<meta name="dc.created" content="2022-11-14">
1010
<meta name="description" content="class index">
1111
<meta name="generator" content="javadoc/AllClassesIndexWriter">
1212
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

‎docs/allpackages-index.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
6-
<title>All Packages (dapr-sdk-parent 1.7.0 API)</title>
5+
<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
6+
<title>All Packages (dapr-sdk-parent 1.7.1 API)</title>
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
9-
<meta name="dc.created" content="2022-10-13">
9+
<meta name="dc.created" content="2022-11-14">
1010
<meta name="description" content="package index">
1111
<meta name="generator" content="javadoc/AllPackagesIndexWriter">
1212
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

‎docs/constant-values.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
6-
<title>Constant Field Values (dapr-sdk-parent 1.7.0 API)</title>
5+
<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
6+
<title>Constant Field Values (dapr-sdk-parent 1.7.1 API)</title>
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
9-
<meta name="dc.created" content="2022-10-13">
9+
<meta name="dc.created" content="2022-11-14">
1010
<meta name="description" content="summary of constants">
1111
<meta name="generator" content="javadoc/ConstantsSummaryWriterImpl">
1212
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

‎docs/deprecated-list.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
6-
<title>Deprecated List (dapr-sdk-parent 1.7.0 API)</title>
5+
<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
6+
<title>Deprecated List (dapr-sdk-parent 1.7.1 API)</title>
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
9-
<meta name="dc.created" content="2022-10-13">
9+
<meta name="dc.created" content="2022-11-14">
1010
<meta name="description" content="deprecated elements">
1111
<meta name="generator" content="javadoc/DeprecatedListWriter">
1212
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

‎docs/help-doc.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
<!-- NewPage -->
33
<html lang="en">
44
<head>
5-
<!-- Generated by javadoc (16) on Thu Oct 13 17:23:51 PDT 2022 -->
6-
<title>API Help (dapr-sdk-parent 1.7.0 API)</title>
5+
<!-- Generated by javadoc (16) on Mon Nov 14 17:14:47 PST 2022 -->
6+
<title>API Help (dapr-sdk-parent 1.7.1 API)</title>
77
<meta name="viewport" content="width=device-width, initial-scale=1">
88
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
9-
<meta name="dc.created" content="2022-10-13">
9+
<meta name="dc.created" content="2022-11-14">
1010
<meta name="description" content="help">
1111
<meta name="generator" content="javadoc/HelpWriter">
1212
<link rel="stylesheet" type="text/css" href="stylesheet.css" title="Style">

0 commit comments

Comments
 (0)