diff --git a/spring-boot-project/spring-boot-docs/pom.xml b/spring-boot-project/spring-boot-docs/pom.xml index 7898dbd7c9..349e73348a 100644 --- a/spring-boot-project/spring-boot-docs/pom.xml +++ b/spring-boot-project/spring-boot-docs/pom.xml @@ -1442,7 +1442,14 @@ asciidoctor-maven-plugin ${refdocs.build.directory} - ${project.build.directory}/generated-docs/reference/html + + + ${refdocs.build.directory} + + **/*.*adoc + + + ${revision} ${spring-boot-repo} @@ -1465,6 +1472,11 @@ html5 + + adoc + htmladoc + + ${project.build.directory}/generated-docs/reference/html highlight.js book @@ -1478,6 +1490,53 @@ + + generate-htmlsingle-documentation + prepare-package + + process-asciidoc + + + html5 + + htmlsingleadoc + + ${project.build.directory}/generated-docs/reference/htmlsingle + highlight.js + book + + js/highlight + atom-one-dark-reasonable + true + ./images + font + css/ + spring.css + + + + + generate-pdf-documentation + prepare-package + + process-asciidoc + + + pdf + + pdfadoc + + ${project.build.directory}/generated-docs/reference/pdf + + + ${refdocs.build.directory} + + **/* + + + + + diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc index 15a40ad234..c62f49c56c 100644 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/documentation-overview.adoc @@ -13,10 +13,12 @@ as a map for the rest of the document. [[boot-documentation-about]] == About the Documentation The Spring Boot reference guide is available as -<> or -<> documentation. -The latest copy -of the reference documentation is available at {spring-boot-docs-current}. + +* {spring-boot-docs}/html[Multi-page HTML] +* {spring-boot-docs}/htmlsingle[Single page HTML] +* {spring-boot-docs}/pdf/spring-boot-reference.pdf[PDF] + +The latest copy is available at {spring-boot-docs-current}. Copies of this document may be made for your own use and for distribution to others, provided that you do not charge any fee for such copies and further provided that each diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/images/epub-cover.png b/spring-boot-project/spring-boot-docs/src/main/asciidoc/images/epub-cover.png deleted file mode 100644 index 8536552f85..0000000000 Binary files a/spring-boot-project/spring-boot-docs/src/main/asciidoc/images/epub-cover.png and /dev/null differ diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/images/epub-cover.svg b/spring-boot-project/spring-boot-docs/src/main/asciidoc/images/epub-cover.svg deleted file mode 100644 index 797468ad39..0000000000 --- a/spring-boot-project/spring-boot-docs/src/main/asciidoc/images/epub-cover.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - Spring Boot - Reference Guide - Phillip Webb, Dave Syer, Josh Long, - Stéphane Nicoll, Rob Winch, Andy Wilkinson, - Marcel Overdijk, Christian Dupuis, - Sébastien Deleuze, Michael Simons, - Vedran Pavić, Jay Bryant, Madhura Bhave - diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.htmladoc similarity index 100% rename from spring-boot-project/spring-boot-docs/src/main/asciidoc/index.adoc rename to spring-boot-project/spring-boot-docs/src/main/asciidoc/index.htmladoc diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/single-index.adoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/index.htmlsingleadoc similarity index 100% rename from spring-boot-project/spring-boot-docs/src/main/asciidoc/single-index.adoc rename to spring-boot-project/spring-boot-docs/src/main/asciidoc/index.htmlsingleadoc diff --git a/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-reference.pdfadoc b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-reference.pdfadoc new file mode 100644 index 0000000000..7df3ffe432 --- /dev/null +++ b/spring-boot-project/spring-boot-docs/src/main/asciidoc/spring-boot-reference.pdfadoc @@ -0,0 +1,17 @@ +[[spring-boot-reference-documentation]] += Spring Boot Reference Documentation +Phillip Webb, Dave Syer, Josh Long, Stéphane Nicoll, Rob Winch, Andy Wilkinson, Marcel Overdijk, Christian Dupuis, Sébastien Deleuze, Michael Simons, Vedran Pavić, Jay Bryant, Madhura Bhave +:docinfo: shared +include::attributes.adoc[] + +include::legal.adoc[leveloffset=+1] +include::documentation-overview.adoc[leveloffset=+1] +include::getting-started.adoc[leveloffset=+1] +include::using-spring-boot.adoc[leveloffset=+1] +include::spring-boot-features.adoc[leveloffset=+1] +include::production-ready-features.adoc[leveloffset=+1] +include::deployment.adoc[leveloffset=+1] +include::spring-boot-cli.adoc[leveloffset=+1] +include::build-tool-plugins.adoc[leveloffset=+1] +include::howto.adoc[leveloffset=+1] +include::appendix.adoc[leveloffset=+1] diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml index 4b22ecd651..7a9d780cb6 100644 --- a/spring-boot-project/spring-boot-parent/pom.xml +++ b/spring-boot-project/spring-boot-parent/pom.xml @@ -306,6 +306,11 @@ asciidoctorj 1.5.8 + + org.asciidoctor + asciidoctorj-pdf + 1.5.0-alpha.11 + diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml index 20bec57c29..8966f45d0e 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/pom.xml @@ -356,11 +356,6 @@ - - org.asciidoctor - asciidoctorj-pdf - 1.5.0-alpha.11 - io.spring.asciidoctor spring-asciidoctor-extensions