Merge branch '2.6.x' into 2.7.x

See gh-30167
pull/30406/head
Andy Wilkinson 3 years ago
commit e97fa0ae52

@ -350,6 +350,7 @@ syncDocumentationSourceForAsciidoctorMultipage {
dependsOn documentDependencyVersions dependsOn documentDependencyVersions
dependsOn documentVersionProperties dependsOn documentVersionProperties
dependsOn documentConfigurationProperties dependsOn documentConfigurationProperties
dependsOn documentDevtoolsPropertyDefaults
from("${buildDir}/docs/generated") { from("${buildDir}/docs/generated") {
into "asciidoc" into "asciidoc"
} }
@ -377,6 +378,7 @@ syncDocumentationSourceForAsciidoctorPdf {
dependsOn documentDependencyVersions dependsOn documentDependencyVersions
dependsOn documentVersionProperties dependsOn documentVersionProperties
dependsOn documentConfigurationProperties dependsOn documentConfigurationProperties
dependsOn documentDevtoolsPropertyDefaults
from("${buildDir}/docs/generated") { from("${buildDir}/docs/generated") {
into "asciidoc" into "asciidoc"
} }

Loading…
Cancel
Save