diff --git a/.gitignore b/.gitignore index 9809ba76..42e40b0a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ build +node_modules/ +.full-build !/**/src/**/build /**/src/**/generated .gradle diff --git a/spring-graphql-docs/antora-playbook.yml b/spring-graphql-docs/antora-playbook.yml index 6b8d0175..df00a9fb 100644 --- a/spring-graphql-docs/antora-playbook.yml +++ b/spring-graphql-docs/antora-playbook.yml @@ -1,15 +1,10 @@ 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' - - require: '@springio/antora-extensions/root-component-extension' + - require: '@springio/antora-extensions' root_component_name: 'graphql' site: title: Spring GraphQL - url: https://rwinch.github.io/spring-graphql + url: https://docs.spring.io/spring-graphql/reference robots: allow git: ensure_git_suffix: false @@ -25,9 +20,11 @@ asciidoc: page-pagination: '' hide-uri-scheme: '@' tabs-sync-option: '@' + include-java: 'example$docs-src/main/java/org/springframework/graphql/docs' extensions: - '@asciidoctor/tabs' - '@springio/asciidoctor-extensions' + - '@springio/asciidoctor-extensions/include-code-extension' urls: latest_version_segment_strategy: redirect:to latest_version_segment: '' @@ -35,7 +32,6 @@ urls: 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 diff --git a/spring-graphql-docs/build.gradle b/spring-graphql-docs/build.gradle index 27ecd6de..cab25138 100644 --- a/spring-graphql-docs/build.gradle +++ b/spring-graphql-docs/build.gradle @@ -77,21 +77,12 @@ task api(type: Javadoc) { destinationDir = file("$buildDir/docs/javadoc") } + antora { - version = '3.2.0-alpha.2' options = [clean: true, fetch: !project.gradle.startParameter.offline, stacktrace: true] - environment = [ - 'ALGOLIA_API_KEY': '9d489079e5ec46dbb238909fee5c9c29', - 'ALGOLIA_APP_ID': 'WB1FQYI187', - 'ALGOLIA_INDEX_NAME': 'springsecurity', - ] - dependencies = [ - '@antora/atlas-extension': '1.0.0-alpha.1', - '@antora/collector-extension': '1.0.0-alpha.3', - '@asciidoctor/tabs': '1.0.0-beta.3', - '@springio/antora-extensions': '1.4.2', - '@springio/asciidoctor-extensions': '1.0.0-alpha.8', - '@opendevise/antora-release-line-extension': '1.0.0', + environment = [ + 'BUILD_REFNAME': 'HEAD', + 'BUILD_VERSION': project.version, ] } diff --git a/spring-graphql-docs/package.json b/spring-graphql-docs/package.json new file mode 100644 index 00000000..9cc3073f --- /dev/null +++ b/spring-graphql-docs/package.json @@ -0,0 +1,11 @@ +{ + "dependencies": { + "antora": "3.2.0-alpha.4", + "@antora/atlas-extension": "1.0.0-alpha.2", + "@antora/collector-extension": "1.0.0-alpha.3", + "@asciidoctor/tabs": "1.0.0-beta.6", + "@springio/antora-extensions": "1.11.1", + "@springio/asciidoctor-extensions": "1.0.0-alpha.10", + "@opendevise/antora-release-line-extension": "1.0.0" + } +} \ No newline at end of file