From af61a396ffb9244df283f7a9424f2597b2df7dd0 Mon Sep 17 00:00:00 2001 From: Mahmoud Ben Hassine Date: Thu, 24 Aug 2023 09:37:23 -0700 Subject: [PATCH] Switch to spring-asciidoctor-backends Taken from https://github.com/spring-projects/spring-framework/commit/2bf8eeb120425aef8e1abd03cc1e3e472ec07572 --- build.gradle | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index fd94aefa2..bce5829ed 100644 --- a/build.gradle +++ b/build.gradle @@ -104,7 +104,7 @@ allprojects { jaxbApiVersion = '2.3.1' jaxbImplVersion = '2.3.0.1' prometheusPushgatewayVersion = '0.16.0' - docResourcesVersion = '0.2.5' + docResourcesVersion = '0.0.5' assertjVersion='3.23.1' mongoDbDriverSyncVersion='4.6.1' // used only in tests and samples testcontainersVersion='1.17.6' @@ -670,18 +670,18 @@ project('spring-batch-samples') { } configurations { - docs + asciidoctorExtensions } dependencies { - docs "io.spring.docresources:spring-doc-resources:${docResourcesVersion}@zip" + asciidoctorExtensions "io.spring.asciidoctor.backends:spring-asciidoctor-backends:${docResourcesVersion}" } task prepareAsciidocBuild(type: Sync) { - dependsOn configurations.docs + dependsOn configurations.asciidoctorExtensions // copy doc resources from { - configurations.docs.collect { zipTree(it) } + configurations.asciidoctorExtensions.collect { zipTree(it) } } // and doc sources from "spring-batch-docs/asciidoc/" @@ -692,6 +692,7 @@ task prepareAsciidocBuild(type: Sync) { asciidoctorPdf { dependsOn prepareAsciidocBuild baseDirFollowsSourceFile() + configurations 'asciidoctorExtensions' asciidoctorj { sourceDir "$buildDir/asciidoc/assemble" @@ -714,12 +715,16 @@ asciidoctorPdf { asciidoctor { dependsOn asciidoctorPdf baseDirFollowsSourceFile() + configurations "asciidoctorExtensions" sourceDir "$buildDir/asciidoc/assemble" resources { from(sourceDir) { include 'images/*', 'css/**', 'js/**' } } + outputOptions { + backends "spring-html" + } options doctype: 'book', eruby: 'erubis' logDocuments = true attributes 'docinfo': 'shared',