From a66ea7a084ffcee8f923c7cb7b895a63856ecd2f Mon Sep 17 00:00:00 2001 From: Nick Greenfield Date: Fri, 16 Jul 2021 10:33:32 -0700 Subject: [PATCH 1/3] Add Java submodule` --- .gitmodules | 3 +++ daprdocs/config.toml | 8 ++++++++ sdkdocs/java | 1 + 3 files changed, 12 insertions(+) create mode 160000 sdkdocs/java diff --git a/.gitmodules b/.gitmodules index c2f4ff29d..440638c4e 100644 --- a/.gitmodules +++ b/.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 diff --git a/daprdocs/config.toml b/daprdocs/config.toml index f3d77ee81..d6f39ec36 100644 --- a/daprdocs/config.toml +++ b/daprdocs/config.toml @@ -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" diff --git a/sdkdocs/java b/sdkdocs/java new file mode 160000 index 000000000..a8ff7b835 --- /dev/null +++ b/sdkdocs/java @@ -0,0 +1 @@ +Subproject commit a8ff7b835e3df3d4d370f4fce4acabe385082b12 From e56d5d1ac24ba2e9894400f5112d4816be41be9e Mon Sep 17 00:00:00 2001 From: Ori Zohar Date: Wed, 21 Jul 2021 10:40:30 -0700 Subject: [PATCH 2/3] changes to v1.2 for v1.3 release --- .github/workflows/website-root.yml | 53 ------------------------------ README.md | 4 +-- daprdocs/config.toml | 14 +++++--- 3 files changed, 12 insertions(+), 59 deletions(-) delete mode 100644 .github/workflows/website-root.yml diff --git a/.github/workflows/website-root.yml b/.github/workflows/website-root.yml deleted file mode 100644 index d0f0650db..000000000 --- a/.github/workflows/website-root.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: Azure Static Web App Root - -on: - push: - branches: - - v1.2 - pull_request: - types: [opened, synchronize, reopened, closed] - branches: - - v1.2 - -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" \ No newline at end of file diff --git a/README.md b/README.md index f43fb63e1..24f6d3f01 100644 --- a/README.md +++ b/README.md @@ -14,8 +14,8 @@ The following branches are currently maintained: | Branch | Website | Description | |--------|---------|-------------| -| [v1.2](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. -| [v1.3](https://github.com/dapr/docs/tree/v1.3) (pre-release) | https://v1-3.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.3+ go here. +| [v1.3](https://github.com/dapr/docs) (primary) | https://docs.dapr.io | Latest Dapr release documentation. Typo fixes, clarifications, and most documentation goes here. +| [v1.4](https://github.com/dapr/docs/tree/v1.4) (pre-release) | https://v1-4.docs.dapr.io/ | Pre-release documentation. Doc updates that are only applicable to v1.3+ go here. For more information visit the [Dapr branch structure](https://docs.dapr.io/contributing/contributing-docs/#branch-guidance) document. diff --git a/daprdocs/config.toml b/daprdocs/config.toml index f3d77ee81..ee15c22d0 100644 --- a/daprdocs/config.toml +++ b/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 @@ -144,13 +144,19 @@ github_subdir = "daprdocs" github_branch = "v1.2" # Versioning -version_menu = "v1.2 (latest)" +version_menu = "v1.2" version = "v1.2" -archived_version = false +archived_version = true url_latest_version = "https://docs.dapr.io" [[params.versions]] - version = "v1.2 (latest)" + version = "v1.4 (preview)" + url = "https://v1-4.docs.dapr.io" +[[params.versions]] + version = "v1.3 (latest)" + url = "https://docs.dapr.io" +[[params.versions]] + version = "v1.2" url = "#" [[params.versions]] version = "v1.1" From fc0e232c414853ac71e1fa02a77e68234d0c29bc Mon Sep 17 00:00:00 2001 From: Nick Greenfield Date: Mon, 26 Jul 2021 10:28:48 -0700 Subject: [PATCH 3/3] Add Java Docs and update to latest Java SDK commit --- daprdocs/content/en/concepts/overview.md | 2 +- daprdocs/content/en/developing-applications/sdks/_index.md | 2 +- sdkdocs/java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/daprdocs/content/en/concepts/overview.md b/daprdocs/content/en/concepts/overview.md index d07857715..037a1e81d 100644 --- a/daprdocs/content/en/concepts/overview.md +++ b/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. diff --git a/daprdocs/content/en/developing-applications/sdks/_index.md b/daprdocs/content/en/developing-applications/sdks/_index.md index 88848a8c7..f4cddae76 100644 --- a/daprdocs/content/en/developing-applications/sdks/_index.md +++ b/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 >}})
[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 | ✔ | | diff --git a/sdkdocs/java b/sdkdocs/java index a8ff7b835..d3df194ba 160000 --- a/sdkdocs/java +++ b/sdkdocs/java @@ -1 +1 @@ -Subproject commit a8ff7b835e3df3d4d370f4fce4acabe385082b12 +Subproject commit d3df194bad3826069b7c9cda5178196e92dacad1