root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Upgrade to AsciidoctorJ 3.1.0 

Closes gh-24991
This commit is contained in:
Brian Clozel 2020-09-23 10:06:13 +02:00
parent 1061bcdba2
commit 6e7be76278
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -3,8 +3,8 @@ plugins {
id 'io.spring.nohttp' version '0.0.5.RELEASE' id 'io.spring.nohttp' version '0.0.5.RELEASE'
id 'org.jetbrains.kotlin.jvm' version '1.4.10' apply false id 'org.jetbrains.kotlin.jvm' version '1.4.10' apply false
id 'org.jetbrains.dokka' version '0.10.1' apply false id 'org.jetbrains.dokka' version '0.10.1' apply false
id 'org.asciidoctor.jvm.convert' version '2.4.0' id 'org.asciidoctor.jvm.convert' version '3.1.0'
id 'org.asciidoctor.jvm.pdf' version '2.4.0' id 'org.asciidoctor.jvm.pdf' version '3.1.0'
id 'de.undercouch.download' version '4.1.1' id 'de.undercouch.download' version '4.1.1'
id "io.freefair.aspectj" version '5.1.1' apply false id "io.freefair.aspectj" version '5.1.1' apply false
id "com.github.ben-manes.versions" version '0.28.0' id "com.github.ben-manes.versions" version '0.28.0'

11
gradle/docs.gradle
View File

@ -3,7 +3,7 @@ configurations {
} }
dependencies { dependencies {
asciidoctorExt("io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.4.2.RELEASE") asciidoctorExt("io.spring.asciidoctor:spring-asciidoctor-extensions-block-switch:0.4.3.RELEASE")
} }
repositories { repositories {
@ -124,11 +124,7 @@ task extractDocResources(type: Copy, dependsOn: downloadResources) {
} }
asciidoctorj { asciidoctorj {
modules { version = '2.4.1'
pdf {
version '1.5.0-beta.8'
}
}
fatalWarnings ".*" fatalWarnings ".*"
options doctype: 'book', eruby: 'erubis' options doctype: 'book', eruby: 'erubis'
attributes([ attributes([
@ -153,7 +149,6 @@ asciidoctorj {
* in "build/docs/ref-docs/html5". * in "build/docs/ref-docs/html5".
*/ */
asciidoctor { asciidoctor {
dependsOn asciidoctorPdf
baseDirFollowsSourceDir() baseDirFollowsSourceDir()
configurations 'asciidoctorExt' configurations 'asciidoctorExt'
sources { sources {
@ -186,7 +181,7 @@ asciidoctorPdf {
/** /**
* Zip all docs (API and reference) into a single archive * Zip all docs (API and reference) into a single archive
*/ */
task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'dokka']) { task docsZip(type: Zip, dependsOn: ['api', 'asciidoctor', 'asciidoctorPdf', 'dokka']) {
group = "Distribution" group = "Distribution"
description = "Builds -${archiveClassifier} archive containing api and reference " + description = "Builds -${archiveClassifier} archive containing api and reference " +
"for deployment at https://docs.spring.io/spring-framework/docs." "for deployment at https://docs.spring.io/spring-framework/docs."