Merge branch '2.5.x' into 2.6.x

See gh-30166
pull/30349/head
Andy Wilkinson 3 years ago
commit 05c12737fe

@ -333,6 +333,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"
} }
@ -354,6 +355,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