Skip to content

Commit 1d6cc88

Browse files
hhunter-mshhunter-ms
committed
Merge branch 'master' of https://github.com/dapr/quickstarts 
2 parents 4e37cf2 + f695e1b commit 1d6cc88

File tree

54 files changed

+675
-369
lines changed

Some content is hidden

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

54 files changed

+675
-369
lines changed

‎.github/env/global.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
DAPR_CLI_VERSION: 1.13.0
2-
DAPR_RUNTIME_VERSION: 1.13.0
2+
DAPR_RUNTIME_VERSION: 1.13.5
33
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v${DAPR_CLI_VERSION}/install/
44
DAPR_DEFAULT_IMAGE_REGISTRY: ghcr
55
MACOS_PYTHON_VERSION: 3.10

‎.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: clrqfb88y222860gjxdlaobhpt
33
stickers:
44
-
5-
id: clmjkxscc122740fl0mkmb7egi
6-
alias: ghc2023
5+
id: clrqfb88y222860gjxdlaobhpt
6+
alias: quickstarts-badge

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ Debug/
3232
.settings/
3333
.metadata
3434
.project
35+
out/
3536

3637
# Package Files #
3738
*.jar

‎bindings/java/http/batch/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>2.6.3</version>
7+
<version>3.3.1</version>
88
<relativePath /> <!-- lookup parent from repository -->
99
</parent>
1010
<groupId>com.service</groupId>
@@ -19,12 +19,12 @@
1919
<dependency>
2020
<groupId>org.json</groupId>
2121
<artifactId>json</artifactId>
22-
<version>20211205</version>
22+
<version>20240303</version>
2323
</dependency>
2424
<dependency>
2525
<groupId>com.fasterxml.jackson.core</groupId>
2626
<artifactId>jackson-databind</artifactId>
27-
<version>2.13.0</version>
27+
<version>2.17.1</version>
2828
</dependency>
2929
<dependency>
3030
<groupId>org.springframework.boot</groupId>
@@ -33,7 +33,7 @@
3333
<dependency>
3434
<groupId>org.projectlombok</groupId>
3535
<artifactId>lombok</artifactId>
36-
<version>1.18.22</version>
36+
<version>1.18.32</version>
3737
<optional>true</optional>
3838
</dependency>
3939
</dependencies>
@@ -42,7 +42,7 @@
4242
<plugin>
4343
<groupId>org.springframework.boot</groupId>
4444
<artifactId>spring-boot-maven-plugin</artifactId>
45-
<version>2.6.4</version>
45+
<version>3.3.1</version>
4646
</plugin>
4747
</plugins>
4848
</build>

‎bindings/java/sdk/batch/pom.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.springframework.boot</groupId>
66
<artifactId>spring-boot-starter-parent</artifactId>
7-
<version>2.6.3</version>
7+
<version>3.3.1</version>
88
<relativePath /> <!-- lookup parent from repository -->
99
</parent>
1010
<groupId>com.service</groupId>
@@ -19,7 +19,7 @@
1919
<dependency>
2020
<groupId>com.squareup.okhttp3</groupId>
2121
<artifactId>okhttp</artifactId>
22-
<version>4.9.0</version>
22+
<version>4.12.0</version>
2323
</dependency>
2424
<dependency>
2525
<groupId>org.springframework.boot</groupId>
@@ -38,13 +38,13 @@
3838
<dependency>
3939
<groupId>org.projectlombok</groupId>
4040
<artifactId>lombok</artifactId>
41-
<version>1.18.22</version>
41+
<version>1.18.32</version>
4242
<optional>true</optional>
4343
</dependency>
4444
<dependency>
4545
<groupId>com.fasterxml.jackson.core</groupId>
4646
<artifactId>jackson-databind</artifactId>
47-
<version>2.13.0</version>
47+
<version>2.17.1</version>
4848
</dependency>
4949
</dependencies>
5050

@@ -53,12 +53,12 @@
5353
<plugin>
5454
<groupId>org.springframework.boot</groupId>
5555
<artifactId>spring-boot-maven-plugin</artifactId>
56-
<version>2.6.4</version>
56+
<version>3.3.1</version>
5757
</plugin>
5858
<plugin>
5959
<groupId>org.apache.maven.plugins</groupId>
6060
<artifactId>maven-resources-plugin</artifactId>
61-
<version>3.1.0</version>
61+
<version>3.3.1</version>
6262
</plugin>
6363
</plugins>
6464
</build>

‎configuration/java/http/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ This quickstart includes one service:
1313
## Prerequisites
1414

1515
- [Maven 3.x](https://maven.apache.org/install.html)
16-
- Java JDK 11 (or greater):
17-
- [Microsoft JDK 11](https://docs.microsoft.com/en-us/java/openjdk/download#openjdk-11)
18-
- [Oracle JDK 11](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK11)
19-
- [OpenJDK 11](https://jdk.java.net/11/)
16+
- Java JDK 17 (or greater):
17+
- [Microsoft JDK 17](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-17)
18+
- [Oracle JDK 17](https://www.oracle.com/java/technologies/downloads/?er=221886#java17)
19+
- [OpenJDK 17](https://jdk.java.net/17/)
2020
- Locally running redis container - a redis container named `dapr_redis` is automatically created when you run `dapr init`
2121

2222
## Add configuration items to the config store

‎configuration/java/http/order-processor/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.6.3</version>
8+
<version>3.3.1</version>
99
<relativePath/>
1010
<!-- lookup parent from repository -->
1111
</parent>
@@ -25,15 +25,15 @@
2525
<dependency>
2626
<groupId>org.json</groupId>
2727
<artifactId>json</artifactId>
28-
<version>20220924</version>
28+
<version>20240303</version>
2929
</dependency>
3030
</dependencies>
3131
<build>
3232
<plugins>
3333
<plugin>
3434
<groupId>org.springframework.boot</groupId>
3535
<artifactId>spring-boot-maven-plugin</artifactId>
36-
<version>2.6.4</version>
36+
<version>3.3.1</version>
3737
</plugin>
3838
</plugins>
3939
</build>

‎configuration/java/sdk/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ This quickstart includes one service:
1111
## Prerequisites
1212

1313
- [Maven 3.x](https://maven.apache.org/install.html)
14-
- Java JDK 11 (or greater):
15-
- [Microsoft JDK 11](https://docs.microsoft.com/en-us/java/openjdk/download#openjdk-11)
16-
- [Oracle JDK 11](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK11)
17-
- [OpenJDK 11](https://jdk.java.net/11/)
14+
- Java JDK 17 (or greater):
15+
- [Microsoft JDK 17](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-17)
16+
- [Oracle JDK 17](https://www.oracle.com/java/technologies/downloads/?er=221886#java17)
17+
- [OpenJDK 17](https://jdk.java.net/17/)
1818
- Locally running redis container - a redis container named `dapr_redis` is automatically created when you run `dapr init`
1919

2020
## Add configuration items to the config store

‎configuration/java/sdk/order-processor/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<properties>
1212
<maven.compiler.source>17</maven.compiler.source>
1313
<maven.compiler.target>17</maven.compiler.target>
14-
<slf4jVersion>1.6.1</slf4jVersion>
14+
<slf4jVersion>2.0.13</slf4jVersion>
1515
</properties>
1616
<dependencies>
1717
<dependency>
@@ -22,7 +22,7 @@
2222
<dependency>
2323
<groupId>io.projectreactor</groupId>
2424
<artifactId>reactor-core</artifactId>
25-
<version>3.4.0</version>
25+
<version>3.6.7</version>
2626
</dependency>
2727
</dependencies>
2828

@@ -31,7 +31,7 @@
3131
<plugin>
3232
<groupId>org.springframework.boot</groupId>
3333
<artifactId>spring-boot-maven-plugin</artifactId>
34-
<version>2.6.3</version>
34+
<version>3.3.1</version>
3535
<executions>
3636
<execution>
3737
<goals>

‎configuration/java/sdk/order-processor/src/main/java/com/service/OrderProcessingServiceApplication.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.service;
22

33
import io.dapr.client.DaprClientBuilder;
4-
import io.dapr.client.DaprPreviewClient;
54
import io.dapr.client.DaprClient;
65
import io.dapr.client.domain.ConfigurationItem;
76
import io.dapr.client.domain.SubscribeConfigurationResponse;

‎configuration/javascript/sdk/order-processor/package-lock.json

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎configuration/javascript/sdk/order-processor/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
"eslint-plugin-react": "^7.28.0"
1616
},
1717
"dependencies": {
18-
"@dapr/dapr": "^3.3.0"
18+
"@dapr/dapr": "^3.3.1"
1919
}
2020
}

‎configuration/python/sdk/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ pip3 install -r requirements.txt
4747
<!-- STEP
4848
name: Run order-processor service
4949
expected_stdout_lines:
50-
- '== APP == Configuration for orderId2 : value: "102"'
50+
- '== APP == Configuration for orderId2 : 102'
5151
- '== APP == Subscription ID is'
5252
expected_stderr_lines:
5353
output_match_mode: substring

‎configuration/python/sdk/order-processor/app.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
# Get config items from the config store
1616
for key in CONFIGURATION_KEYS:
1717
resp = client.get_configuration(store_name=DAPR_CONFIGURATION_STORE, keys=[key], config_metadata={})
18-
print(f"Configuration for {key} : {resp.items[key]}", flush=True)
18+
print(f"Configuration for {key} : {resp.items[key].value}", flush=True)
1919

2020
def handler(id: str, resp: ConfigurationResponse):
2121
for key in resp.items:
22-
print("Configuration update {'"+key+"' : {'value': '"+ resp.items[key].value +"'}}", flush=True)
22+
print(f"Configuration update {key} : {resp.items[key].value}", flush=True)
2323

2424

2525
async def subscribe_config():
@@ -38,6 +38,3 @@ async def subscribe_config():
3838
print("Error unsubscribing from config updates", flush=True)
3939

4040
asyncio.run(subscribe_config())
41-
42-
43-

‎cryptography/javascript/sdk/crypto-quickstart/package-lock.json

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cryptography/javascript/sdk/crypto-quickstart/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"author": "",
1313
"license": "MIT",
1414
"dependencies": {
15-
"@dapr/dapr": "^3.3.0"
15+
"@dapr/dapr": "^3.3.1"
1616
},
1717
"devDependencies": {
1818
"@types/node": "^18.0.0",

‎pub_sub/java/http/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ And one subscriber:
1717
## Pre-requisites
1818

1919
* [Dapr and Dapr Cli](https://docs.dapr.io/getting-started/install-dapr-cli/).
20-
* Java JDK 11 (or greater):
21-
* [Microsoft JDK 11](https://docs.microsoft.com/en-us/java/openjdk/download#openjdk-11)
22-
* [Oracle JDK 11](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK11)
23-
* [OpenJDK 11](https://jdk.java.net/11/)
20+
* Java JDK 17 (or greater):
21+
* [Microsoft JDK 17](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-17)
22+
* [Oracle JDK 17](https://www.oracle.com/java/technologies/downloads/?er=221886#java17)
23+
* [OpenJDK 17](https://jdk.java.net/17/)
2424
* [Apache Maven](https://maven.apache.org/install.html) version 3.x.
2525

2626
## Run all apps with multi-app run template file:

‎pub_sub/java/http/checkout/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@
1111
<properties>
1212
<maven.compiler.source>17</maven.compiler.source>
1313
<maven.compiler.target>17</maven.compiler.target>
14-
<slf4jVersion>1.6.1</slf4jVersion>
14+
<slf4jVersion>2.0.13</slf4jVersion>
1515
</properties>
1616
<dependencies>
1717
<dependency>
1818
<groupId>org.json</groupId>
1919
<artifactId>json</artifactId>
20-
<version>20211205</version>
20+
<version>20240303</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>org.slf4j</groupId>
@@ -35,7 +35,7 @@
3535
<plugin>
3636
<groupId>org.springframework.boot</groupId>
3737
<artifactId>spring-boot-maven-plugin</artifactId>
38-
<version>2.6.4</version>
38+
<version>3.3.1</version>
3939
<executions>
4040
<execution>
4141
<goals>

‎pub_sub/java/http/order-processor/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>org.springframework.boot</groupId>
77
<artifactId>spring-boot-starter-parent</artifactId>
8-
<version>2.6.3</version>
8+
<version>3.3.1</version>
99
<relativePath/> <!-- lookup parent from repository -->
1010
</parent>
1111
<groupId>com.service</groupId>
@@ -24,7 +24,7 @@
2424
<dependency>
2525
<groupId>org.projectlombok</groupId>
2626
<artifactId>lombok</artifactId>
27-
<version>1.18.22</version>
27+
<version>1.18.32</version>
2828
<optional>true</optional>
2929
</dependency>
3030
</dependencies>
@@ -33,7 +33,7 @@
3333
<plugin>
3434
<groupId>org.springframework.boot</groupId>
3535
<artifactId>spring-boot-maven-plugin</artifactId>
36-
<version>2.6.4</version>
36+
<version>3.3.1</version>
3737
</plugin>
3838
</plugins>
3939
</build>

0 commit comments

Comments
 (0)