Skip to content

Commit 8193db5

Browse files
authored
Merge branch 'master' into use-state-serializer-contenttype-when-saving-actor-state
2 parents 74d944a + a074310 commit 8193db5

File tree

1,223 files changed

+277965
-513461
lines changed

Some content is hidden

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

1,223 files changed

+277965
-513461
lines changed

.github/holopin.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
organization: dapr
2-
defaultSticker: clmjkxscc122740fl0mkmb7egi
2+
defaultSticker: clrqfdv4x24910fl5n4iwu5oa
33
stickers:
44
-
5-
id: clmjkxscc122740fl0mkmb7egi
6-
alias: ghc2023
5+
id: clrqfdv4x24910fl5n4iwu5oa
6+
alias: sdk-badge

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,19 @@ For a Maven project, add the following to your `pom.xml` file:
5454
<dependency>
5555
<groupId>io.dapr</groupId>
5656
<artifactId>dapr-sdk</artifactId>
57-
<version>1.10.0</version>
57+
<version>1.11.0</version>
5858
</dependency>
5959
<!-- Dapr's SDK for Actors (optional). -->
6060
<dependency>
6161
<groupId>io.dapr</groupId>
6262
<artifactId>dapr-sdk-actors</artifactId>
63-
<version>1.10.0</version>
63+
<version>1.11.0</version>
6464
</dependency>
6565
<!-- Dapr's SDK integration with SpringBoot (optional). -->
6666
<dependency>
6767
<groupId>io.dapr</groupId>
6868
<artifactId>dapr-sdk-springboot</artifactId>
69-
<version>1.10.0</version>
69+
<version>1.11.0</version>
7070
</dependency>
7171
...
7272
</dependencies>
@@ -80,11 +80,11 @@ For a Gradle project, add the following to your `build.gradle` file:
8080
dependencies {
8181
...
8282
// Dapr's core SDK with all features, except Actors.
83-
compile('io.dapr:dapr-sdk:1.10.0')
83+
compile('io.dapr:dapr-sdk:1.11.0')
8484
// Dapr's SDK for Actors (optional).
85-
compile('io.dapr:dapr-sdk-actors:1.10.0')
85+
compile('io.dapr:dapr-sdk-actors:1.11.0')
8686
// Dapr's SDK integration with SpringBoot (optional).
87-
compile('io.dapr:dapr-sdk-springboot:1.10.0')
87+
compile('io.dapr:dapr-sdk-springboot:1.11.0')
8888
}
8989
```
9090

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ For a Maven project, add the following to your `pom.xml` file:
4646
<dependency>
4747
<groupId>io.dapr</groupId>
4848
<artifactId>dapr-sdk</artifactId>
49-
<version>1.10.0</version>
49+
<version>1.11.0</version>
5050
</dependency>
5151
<!-- Dapr's SDK for Actors (optional). -->
5252
<dependency>
5353
<groupId>io.dapr</groupId>
5454
<artifactId>dapr-sdk-actors</artifactId>
55-
<version>1.10.0</version>
55+
<version>1.11.0</version>
5656
</dependency>
5757
<!-- Dapr's SDK integration with SpringBoot (optional). -->
5858
<dependency>
5959
<groupId>io.dapr</groupId>
6060
<artifactId>dapr-sdk-springboot</artifactId>
61-
<version>1.10.0</version>
61+
<version>1.11.0</version>
6262
</dependency>
6363
...
6464
</dependencies>
@@ -76,11 +76,11 @@ For a Gradle project, add the following to your `build.gradle` file:
7676
dependencies {
7777
...
7878
// Dapr's core SDK with all features, except Actors.
79-
compile('io.dapr:dapr-sdk:1.10.0')
79+
compile('io.dapr:dapr-sdk:1.11.0')
8080
// Dapr's SDK for Actors (optional).
81-
compile('io.dapr:dapr-sdk-actors:1.10.0')
81+
compile('io.dapr:dapr-sdk-actors:1.11.0')
8282
// Dapr's SDK integration with SpringBoot (optional).
83-
compile('io.dapr:dapr-sdk-springboot:1.10.0')
83+
compile('io.dapr:dapr-sdk-springboot:1.11.0')
8484
}
8585
```
8686

@@ -96,7 +96,7 @@ You can fix this by specifying a compatible `OkHttp` version in your project to
9696
<dependency>
9797
<groupId>com.squareup.okhttp3</groupId>
9898
<artifactId>okhttp</artifactId>
99-
<version>1.10.0</version>
99+
<version>1.11.0</version>
100100
</dependency>
101101
```
102102

docs/allclasses-index.html

Lines changed: 1440 additions & 2434 deletions
Large diffs are not rendered by default.

docs/allclasses.html

Lines changed: 0 additions & 510 deletions
This file was deleted.

0 commit comments

Comments
 (0)