Merge branch 'v1.2' into v1.3

.github/workflows/website-root.yml

@@ -1,53 +0,0 @@
-name: Azure Static Web App Root
-
-on:
-  push:
-    branches:
-      - v1.3
-  pull_request:
-    types: [opened, synchronize, reopened, closed]
-    branches:
-      - v1.3
-
-jobs:
-  build_and_deploy_job:
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.action != 'closed')
-    runs-on: ubuntu-latest
-    name: Build and Deploy Job
-    steps:
-      - uses: actions/checkout@v2
-        with:
-          submodules: recursive
-      - name: Setup Docsy
-        run: cd daprdocs && git submodule update --init --recursive && sudo npm install -D --save autoprefixer && sudo npm install -D --save postcss-cli
-      - name: Build And Deploy
-        id: builddeploy
-        uses: Azure/static-web-apps-deploy@v0.0.1-preview
-        env:
-          HUGO_ENV: production
-          HUGO_VERSION: "0.74.3"
-        with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
-          repo_token: ${{ secrets.GITHUB_TOKEN }} # Used for Github integrations (i.e. PR comments)
-          skip_deploy_on_missing_secrets: true
-          action: "upload"
-          ###### Repository/Build Configurations - These values can be configured to match your app requirements. ######
-          # For more information regarding Static Web App workflow configurations, please visit: https://aka.ms/swaworkflowconfig
-          app_location: "/daprdocs" # App source code path
-          api_location: "api" # Api source code path - optional
-          output_location: "public" # Built app content directory - optional
-          app_build_command: "hugo"
-          ###### End of Repository/Build Configurations ######
-
-  close_pull_request_job:
-    if: github.event_name == 'pull_request' && github.event.action == 'closed'
-    runs-on: ubuntu-latest
-    name: Close Pull Request Job
-    steps:
-      - name: Close Pull Request
-        id: closepullrequest
-        uses: Azure/static-web-apps-deploy@v0.0.1-preview
-        with:
-          azure_static_web_apps_api_token: ${{ secrets.AZURE_STATIC_WEB_APPS_API_TOKEN_PROUD_BAY_0E9E0E81E }}
-          skip_deploy_on_missing_secrets: true
-          action: "close"

.gitmodules

@@ -17,3 +17,6 @@
 [submodule "sdkdocs/go"]
 	path = sdkdocs/go
 	url = https://github.com/dapr/go-sdk.git
+[submodule "sdkdocs/java"]
+	path = sdkdocs/java
+	url = https://github.com/dapr/java-sdk.git

daprdocs/config.toml

@@ -1,5 +1,5 @@
 # Site Configuration
-baseURL = "https://docs.dapr.io/"
+baseURL = "https://v1-2.docs.dapr.io/"
 title = "Dapr Docs"
 theme = "docsy"
 disableFastRender = true
@@ -79,6 +79,14 @@ id = "UA-149338238-3"
     source = "../sdkdocs/go/daprdocs/content/en/go-sdk-contributing"
     target = "content/contributing/"
     lang = "en"
+  [[module.mounts]]
+    source = "../sdkdocs/java/daprdocs/content/en/java-sdk-docs"
+    target = "content/developing-applications/sdks/java"
+    lang = "en"
+  [[module.mounts]]
+    source = "../sdkdocs/java/daprdocs/content/en/java-sdk-contributing"
+    target = "content/contributing/"
+    lang = "en"
 
   [[module.mounts]]
     source = "../translations/docs-zh/content/zh-hans"

daprdocs/content/en/concepts/overview.md

@@ -98,7 +98,7 @@ Dapr can be used from any developer framework. Here are some that have been inte
 | Language | Frameworks | Description |
 |----------|------------|-------------|
 | [.NET]({{< ref dotnet >}}) | [ASP.NET]({{< ref dotnet-aspnet.md >}}) | 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/en-us/aspnet/core/grpc/).
-| [Java](https://github.com/dapr/java-sdk) | [Spring Boot](https://spring.io/)
+| [Java]({{< ref java >}} | [Spring Boot](https://spring.io/)
 | [Python]({{< ref python >}}) | [Flask]({{< ref python-flask.md >}})
 | [Javascript](https://github.com/dapr/js-sdk) | [Express](http://expressjs.com/)
 | [PHP]({{< ref php >}}) | | You can serve with Apache, Nginx, or Caddyserver.

daprdocs/content/en/developing-applications/sdks/_index.md

@@ -33,7 +33,7 @@ The Dapr SDKs are the easiest way for you to get Dapr into your application. Cho
 |----------|:------|:----------:|:-----------:|:---------:|
 | [.NET]({{< ref dotnet >}}) | Stable | ✔ |  [ASP.NET Core]({{< ref dotnet-aspnet >}}) | ✔ |
 | [Python]({{< ref python >}}) | Stable | ✔ | [gRPC]({{< ref python-grpc.md >}}) | [FastAPI]({{< ref python-fastapi.md >}})<br />[Flask]({{< ref python-flask.md >}}) |
-| [Java](https://github.com/dapr/java-sdk) | Stable | ✔ | Spring Boot | ✔ |
+| [Java]({{< ref java >}}) | Stable | ✔ | Spring Boot | ✔ |
 | [Go]({{< ref go >}}) | Stable | ✔ | ✔ |  |
 | [PHP]({{< ref php >}}) | Stable | ✔ | ✔ | ✔ |
 | [C++](https://github.com/dapr/cpp-sdk) | In development | ✔ | |

sdkdocs/java

@@ -0,0 +1 @@
+Subproject commit d3df194bad3826069b7c9cda5178196e92dacad1