diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index b63522ec5d5..556f2682b25 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -33,15 +33,17 @@ jobs: echo BUILD_VERSION=$(git cat-file --textconv FETCH_HEAD:gradle.properties | sed -n '/^version=/ { s/^version=//;p }') >> $GITHUB_ENV - name: Run Antora run: ./gradlew antora + - name: Copy the cache to be included in the site + run: cp -rf build/antora/inject-collector-cache-config-extension/.cache build/site/ - name: Publish Docs - uses: spring-io/spring-doc-actions/rsync-antora-reference@v0.0.8 + uses: spring-io/spring-doc-actions/rsync-antora-reference@v0.0.11 with: docs-username: ${{ secrets.DOCS_USERNAME }} docs-host: ${{ secrets.DOCS_HOST }} docs-ssh-key: ${{ secrets.DOCS_SSH_KEY }} docs-ssh-host-key: ${{ secrets.DOCS_SSH_HOST_KEY }} - name: Bust Clouflare Cache - uses: spring-io/spring-doc-actions/bust-cloudflare-antora-cache@v0.0.8 + uses: spring-io/spring-doc-actions/bust-cloudflare-antora-cache@v0.0.11 with: context-root: spring-framework cloudflare-zone-id: ${{ secrets.CLOUDFLARE_ZONE_ID }} diff --git a/antora-playbook.yml b/antora-playbook.yml index 967dc14b627..756f851a929 100644 --- a/antora-playbook.yml +++ b/antora-playbook.yml @@ -1,14 +1,16 @@ antora: extensions: + - '@springio/antora-extensions/partial-build-extension' + - require: '@springio/antora-extensions/latest-version-extension' + - require: '@springio/antora-extensions/inject-collector-cache-config-extension' - '@antora/collector-extension' - '@antora/atlas-extension' - '@opendevise/antora-release-line-extension' - - '@springio/antora-extensions/latest-version-extension' - require: '@springio/antora-extensions/root-component-extension' root_component_name: 'framework' site: title: Spring Framework - url: https://docs.spring.io/spring-security/reference + url: https://docs.spring.io/spring-framework/reference robots: allow git: ensure_git_suffix: false diff --git a/build.gradle b/build.gradle index 6982b477d41..2d6e30e77d4 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,8 @@ plugins { } antora { - version = '3.2.0-alpha.2' - options = ['--clean', '--fetch', '--stacktrace'] + version = '3.2.0-alpha.2' + options = [clean: true, fetch: true, stacktrace: true] environment = [ 'ALGOLIA_API_KEY': '042f6aaab6ce998d2ea29e60167e1660', 'ALGOLIA_APP_ID': 'WB1FQYI187', @@ -17,7 +17,7 @@ antora { '@antora/collector-extension': '1.0.0-alpha.3', '@asciidoctor/tabs': '1.0.0-beta.3', '@opendevise/antora-release-line-extension': '1.0.0', - '@springio/antora-extensions': '1.3.0', + '@springio/antora-extensions': '1.4.2', '@springio/asciidoctor-extensions': '1.0.0-alpha.9', ] }