dapr
/
docs
mirror of https://github.com/dapr/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upmerge ahead of release 

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
This commit is contained in:
Hannah Hunter 2024-08-02 13:06:07 -04:00
parent 13672ff170 f32acf0991
commit 8e6f2b85bc
11 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daprdocs/content/en/concepts/overview.md
View File

@ -139,7 +139,7 @@ Dapr can be used from any developer framework. Here are some that have been inte
| [.NET]({{< ref dotnet >}}) | [ASP.NET Core](https://github.com/dapr/dotnet-sdk/tree/master/examples/AspNetCore) | Brings stateful routing controllers that respond to pub/sub events from other services. Can also take advantage of [ASP.NET Core gRPC Services](https://docs.microsoft.com/aspnet/core/grpc/). | [.NET]({{< ref dotnet >}}) | [ASP.NET Core](https://github.com/dapr/dotnet-sdk/tree/master/examples/AspNetCore) | Brings stateful routing controllers that respond to pub/sub events from other services. Can also take advantage of [ASP.NET Core gRPC Services](https://docs.microsoft.com/aspnet/core/grpc/).
| [Java]({{< ref java >}}) | [Spring Boot](https://spring.io/) | Build Spring boot applications with Dapr APIs | [Java]({{< ref java >}}) | [Spring Boot](https://spring.io/) | Build Spring boot applications with Dapr APIs
| [Python]({{< ref python >}}) | [Flask]({{< ref python-flask.md >}}) | Build Flask applications with Dapr APIs | [Python]({{< ref python >}}) | [Flask]({{< ref python-flask.md >}}) | Build Flask applications with Dapr APIs
| [JavaScript](https://github.com/dapr/js-sdk) | [Express](http://expressjs.com/) | Build Express applications with Dapr APIs | [JavaScript](https://github.com/dapr/js-sdk) | [Express](https://expressjs.com/) | Build Express applications with Dapr APIs
| [PHP]({{< ref php >}}) | | You can serve with Apache, Nginx, or Caddyserver. | [PHP]({{< ref php >}}) | | You can serve with Apache, Nginx, or Caddyserver.
#### Integrations and extensions #### Integrations and extensions

2
daprdocs/content/en/getting-started/install-dapr-cli.md
View File

@ -16,7 +16,7 @@ You'll use the Dapr CLI as the main tool for various Dapr-related tasks. You can
The Dapr CLI works with both [self-hosted]({{< ref self-hosted >}}) and [Kubernetes]({{< ref Kubernetes >}}) environments. The Dapr CLI works with both [self-hosted]({{< ref self-hosted >}}) and [Kubernetes]({{< ref Kubernetes >}}) environments.
{{% alert title="Before you begin" color="primary" %}} {{% alert title="Before you begin" color="primary" %}}
In Docker Desktop's advanced options, verify you've allowed the default Docker socket to be used. In Docker Desktop's advanced options, verify you've allowed the default Docker socket to be used. This option is not available if you are using WSL integration on Windows.
<img src="/images/docker-desktop-setting.png" width=800 style="padding-bottom:15px;"> <img src="/images/docker-desktop-setting.png" width=800 style="padding-bottom:15px;">
{{% /alert %}} {{% /alert %}}

2
daprdocs/content/en/getting-started/quickstarts/bindings-quickstart.md
View File

@ -651,7 +651,7 @@ In the YAML file:
For this example, you will need: For this example, you will need:
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
- Java JDK 11 (or greater): - Java JDK 17 (or greater):
- [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or
- OpenJDK - OpenJDK
- [Apache Maven](https://maven.apache.org/install.html), version 3.x. - [Apache Maven](https://maven.apache.org/install.html), version 3.x.

2
daprdocs/content/en/getting-started/quickstarts/configuration-quickstart.md
View File

@ -389,7 +389,7 @@ try
For this example, you will need: For this example, you will need:
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
- Java JDK 11 (or greater): - Java JDK 17 (or greater):
- [Oracle JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK11), or - [Oracle JDK](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK11), or
- OpenJDK - OpenJDK
- [Apache Maven](https://maven.apache.org/install.html), version 3.x. - [Apache Maven](https://maven.apache.org/install.html), version 3.x.

4
daprdocs/content/en/getting-started/quickstarts/pubsub-quickstart.md
View File

@ -512,7 +512,7 @@ Console.WriteLine("Published data: " + order);
For this example, you will need: For this example, you will need:
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
- Java JDK 11 (or greater): - Java JDK 17 (or greater):
- [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or
- OpenJDK - OpenJDK
- [Apache Maven](https://maven.apache.org/install.html), version 3.x. - [Apache Maven](https://maven.apache.org/install.html), version 3.x.
@ -1321,7 +1321,7 @@ In the YAML file:
For this example, you will need: For this example, you will need:
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
- Java JDK 11 (or greater): - Java JDK 17 (or greater):
- [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or
- OpenJDK - OpenJDK
- [Apache Maven](https://maven.apache.org/install.html), version 3.x. - [Apache Maven](https://maven.apache.org/install.html), version 3.x.

2
daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-serviceinvo-quickstart.md
View File

@ -693,7 +693,7 @@ dapr run --app-port 7001 --app-id order-processor --app-protocol http --dapr-htt
For this example, you will need: For this example, you will need:
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
- Java JDK 11 (or greater): - Java JDK 17 (or greater):
- [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or
- OpenJDK - OpenJDK
- [Apache Maven](https://maven.apache.org/install.html), version 3.x. - [Apache Maven](https://maven.apache.org/install.html), version 3.x.

2
daprdocs/content/en/getting-started/quickstarts/resiliency/resiliency-state-quickstart.md
View File

@ -534,7 +534,7 @@ INFO[0036] Recovered processing operation component[statestore] output.
For this example, you will need: For this example, you will need:
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
- Java JDK 11 (or greater): - Java JDK 17 (or greater):
- [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or
- OpenJDK - OpenJDK
- [Apache Maven](https://maven.apache.org/install.html), version 3.x. - [Apache Maven](https://maven.apache.org/install.html), version 3.x.

2
daprdocs/content/en/getting-started/quickstarts/secrets-quickstart.md
View File

@ -356,7 +356,7 @@ Order-processor output:
For this example, you will need: For this example, you will need:
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
- Java JDK 11 (or greater): - Java JDK 17 (or greater):
- [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or
- OpenJDK - OpenJDK
- [Apache Maven](https://maven.apache.org/install.html), version 3.x. - [Apache Maven](https://maven.apache.org/install.html), version 3.x.

4
daprdocs/content/en/getting-started/quickstarts/serviceinvocation-quickstart.md
View File

@ -458,7 +458,7 @@ var response = await client.PostAsync($"{baseURL}/orders", content);
For this example, you will need: For this example, you will need:
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
- Java JDK 11 (or greater): - Java JDK 17 (or greater):
- [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or
- OpenJDK - OpenJDK
- [Apache Maven](https://maven.apache.org/install.html), version 3.x. - [Apache Maven](https://maven.apache.org/install.html), version 3.x.
@ -1156,7 +1156,7 @@ Dapr invokes an application on any Dapr instance. In the code, the sidecar progr
For this example, you will need: For this example, you will need:
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
- Java JDK 11 (or greater): - Java JDK 17 (or greater):
- [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or
- OpenJDK - OpenJDK
- [Apache Maven](https://maven.apache.org/install.html), version 3.x. - [Apache Maven](https://maven.apache.org/install.html), version 3.x.

4
daprdocs/content/en/getting-started/quickstarts/statemanagement-quickstart.md
View File

@ -419,7 +419,7 @@ In the YAML file:
For this example, you will need: For this example, you will need:
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
- Java JDK 11 (or greater): - Java JDK 17 (or greater):
- [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or
- OpenJDK - OpenJDK
- [Apache Maven](https://maven.apache.org/install.html), version 3.x. - [Apache Maven](https://maven.apache.org/install.html), version 3.x.
@ -1050,7 +1050,7 @@ In the YAML file:
For this example, you will need: For this example, you will need:
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
- Java JDK 11 (or greater): - Java JDK 17 (or greater):
- [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or - [Oracle JDK](https://www.oracle.com/java/technologies/downloads), or
- OpenJDK - OpenJDK
- [Apache Maven](https://maven.apache.org/install.html), version 3.x. - [Apache Maven](https://maven.apache.org/install.html), version 3.x.

8
daprdocs/content/en/getting-started/quickstarts/workflow-quickstart.md
View File

@ -750,10 +750,10 @@ The `order-processor` console app starts and manages the lifecycle of an order p
For this example, you will need: For this example, you will need:
- [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started). - [Dapr CLI and initialized environment](https://docs.dapr.io/getting-started).
- Java JDK 11 (or greater): - Java JDK 17 (or greater):
- [Microsoft JDK 11](https://docs.microsoft.com/java/openjdk/download#openjdk-11) - [Microsoft JDK 17](https://docs.microsoft.com/java/openjdk/download#openjdk-17)
- [Oracle JDK 11](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK11) - [Oracle JDK 17](https://www.oracle.com/technetwork/java/javase/downloads/index.html#JDK17)
- [OpenJDK 11](https://jdk.java.net/11/) - [OpenJDK 17](https://jdk.java.net/17/)
- [Apache Maven](https://maven.apache.org/install.html) version 3.x. - [Apache Maven](https://maven.apache.org/install.html) version 3.x.
<!-- IGNORE_LINKS --> <!-- IGNORE_LINKS -->
- [Docker Desktop](https://www.docker.com/products/docker-desktop) - [Docker Desktop](https://www.docker.com/products/docker-desktop)