Skip to content

Commit

Permalink
Merge branch '1.2.x' into 1.3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
jgrandja committed Sep 17, 2024
2 parents 22fb092 + 6ed0a22 commit bb36dce
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,5 @@ out/
### Mac ###
.DS_Store
cached-antora-playbook.yml

node_modules
38 changes: 38 additions & 0 deletions docs/antora-playbook.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
antora:
extensions:
- require: '@springio/antora-extensions'
root_component_name: 'authorization-server'
site:
title: Spring Authorization Server
url: https://docs.spring.io/spring-authorization-server/reference
robots: allow
git:
ensure_git_suffix: false
content:
sources:
- url: https://github.com/spring-projects/spring-authorization-server
branches: [main,'{1..9}.+({0..9}).x','!(1.{0..1}.x)']
tags: ['{1..9}.+({0..9}).+({0..9})?(-{RC,M}*)','!(1.{0..1}.+({0..9})?(-{RC,M}*))']
start_path: docs
asciidoc:
attributes:
page-stackoverflow-url: https://stackoverflow.com/tags/spring-authorization-server
page-related-doc-categories: security
page-related-doc-projects: framework
page-pagination: ''
hide-uri-scheme: '@'
tabs-sync-option: '@'
extensions:
- '@asciidoctor/tabs'
- '@springio/asciidoctor-extensions'
urls:
latest_version_segment_strategy: redirect:to
latest_version_segment: ''
redirect_facility: httpd
ui:
bundle:
url: https://github.com/spring-io/antora-ui-spring/releases/download/v0.4.16/ui-bundle.zip
snapshot: true
runtime:
log:
failure_level: warn
10 changes: 10 additions & 0 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"dependencies": {
"antora": "3.2.0-alpha.6",
"@antora/atlas-extension": "1.0.0-alpha.2",
"@antora/collector-extension": "1.0.0-beta.2",
"@asciidoctor/tabs": "1.0.0-beta.6",
"@springio/antora-extensions": "1.14.2",
"@springio/asciidoctor-extensions": "1.0.0-alpha.13"
}
}
11 changes: 4 additions & 7 deletions docs/spring-authorization-server-docs.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,11 @@ java {
}

antora {
playbook = "cached-antora-playbook.yml"
playbookProvider {
repository = "spring-projects/spring-authorization-server"
branch = "docs-build"
path = "lib/antora/templates/per-branch-antora-playbook.yml"
checkLocalBranch = true
}
options = [clean: true, fetch: !project.gradle.startParameter.offline, stacktrace: true]
environment = [
'BUILD_REFNAME': 'HEAD',
'BUILD_VERSION': project.version,
]
}

tasks.named("generateAntoraYml") {
Expand Down

0 comments on commit bb36dce

Please sign in to comment.