Configure the Asciidoctor revnumber in a central location

See gh-20934
spring-projects · May 13, 2020 · a03426a · a03426a
1 parent 0607af8
commit a03426a
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 36 deletions.
diff --git a/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java b/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java
@@ -152,6 +152,7 @@ private void configureCommonAttributes(Project project, AbstractAsciidoctorTask
 		attributes.put("github-tag", determineGitHubTag(project));
 		attributes.put("spring-boot-artifactory-repo", ArtifactoryRepository.forProject(project));
 		attributes.put("version", "{gradle-project-version}");
+		attributes.put("revnumber", null);
 		asciidoctorTask.attributes(attributes);
 	}
 

diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle b/spring-boot-project/spring-boot-actuator-autoconfigure/build.gradle
@@ -181,10 +181,6 @@ asciidoctor {
 	}
 }
 
-asciidoctor {
-	attributes "revnumber": null
-}
-
 asciidoctorPdf {
 	configurations "asciidoctorExtensions"
 	dependsOn test
@@ -193,10 +189,6 @@ asciidoctorPdf {
 	}
 }
 
-asciidoctorPdf {
-	attributes "revnumber": null
-}
-
 task zip(type: Zip) {
 	dependsOn asciidoctor, asciidoctorPdf
 	duplicatesStrategy "fail"

diff --git a/spring-boot-project/spring-boot-docs/build.gradle b/spring-boot-project/spring-boot-docs/build.gradle
@@ -155,10 +155,6 @@ tasks.withType(org.asciidoctor.gradle.jvm.AbstractAsciidoctorTask) {
 	}
 }
 
-asciidoctor {
-	attributes "revnumber": null
-}
-
 asciidoctor {
 	sources {
 		include "*.singleadoc"
@@ -171,20 +167,12 @@ asciidoctorPdf {
 	}
 }
 
-asciidoctorPdf {
-	attributes "revnumber": null
-}
-
 task asciidoctorMultipage(type: org.asciidoctor.gradle.jvm.AsciidoctorTask) {
 	sources {
 		include "*.adoc"
 	}
 }
 
-asciidoctorMultipage {
-	attributes "revnumber": null
-}
-
 syncDocumentationSourceForAsciidoctor {
 	dependsOn documentTestSlices
 	dependsOn documentStarters

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/build.gradle
@@ -86,20 +86,12 @@ asciidoctor {
 	attributes "stylesheet": "css/style.css"
 }
 
-asciidoctor {
-	attributes "revnumber": null
-}
-
 asciidoctorPdf {
 	sources {
 		include "index.adoc"
 	}
 }
 
-asciidoctorPdf {
-	attributes "revnumber": null
-}
-
 javadoc {
 	options {
 		author = true

diff --git a/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle b/spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/build.gradle
@@ -63,10 +63,6 @@ asciidoctor {
 	}
 }
 
-asciidoctor {
-	attributes "revnumber": null
-}
-
 syncDocumentationSourceForAsciidoctorPdf {
 	from(documentPluginGoals) {
 		into "asciidoc/goals"
@@ -79,10 +75,6 @@ asciidoctorPdf {
 	}
 }
 
-asciidoctorPdf {
-	attributes "revnumber": null
-}
-
 javadoc {
 	options {
 		author = true