Merge branch '2.5.x' into 2.6.x

Closes gh-29657
pull/30003/head
Phillip Webb 3 years ago
commit 05c58a18df

@ -108,7 +108,7 @@ class AsciidoctorConventions {
project.getConfigurations().matching((candidate) -> "dependencyManagement".equals(candidate.getName())) project.getConfigurations().matching((candidate) -> "dependencyManagement".equals(candidate.getName()))
.all((dependencyManagement) -> configuration.extendsFrom(dependencyManagement)); .all((dependencyManagement) -> configuration.extendsFrom(dependencyManagement));
configuration.getDependencies().add(project.getDependencies() 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() configuration.getDependencies()
.add(project.getDependencies().create("org.asciidoctor:asciidoctorj-pdf:1.5.3")); .add(project.getDependencies().create("org.asciidoctor:asciidoctorj-pdf:1.5.3"));
}); });

@ -1,4 +1,3 @@
:!version-label:
:doctype: book :doctype: book
:idprefix: :idprefix:
:idseparator: - :idseparator: -

Loading…
Cancel
Save