Merge branch '2.5.x' into 2.6.x

Closes gh-29657
2022-02-04 19:44:05 -08:00 · 2022-02-04 19:44:05 -08:00 · 05c58a18df
parent 03d393bc4c 12a33a2eaf
commit 05c58a18df
2 changed files with 1 additions and 2 deletions
--- a/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java
+++ b/buildSrc/src/main/java/org/springframework/boot/build/AsciidoctorConventions.java
@ -108,7 +108,7 @@ class AsciidoctorConventions {
 			project.getConfigurations().matching((candidate) -> "dependencyManagement".equals(candidate.getName()))
 					.all((dependencyManagement) -> configuration.extendsFrom(dependencyManagement));
 			configuration.getDependencies().add(project.getDependencies()
-					.create("io.spring.asciidoctor.backends:spring-asciidoctor-backends:0.0.2"));
+					.create("io.spring.asciidoctor.backends:spring-asciidoctor-backends:0.0.3"));
 			configuration.getDependencies()
 					.add(project.getDependencies().create("org.asciidoctor:asciidoctorj-pdf:1.5.3"));
 		});
--- a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc
+++ b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc
@ -1,4 +1,3 @@
-:!version-label:
 :doctype: book
 :idprefix:
 :idseparator: -