From d42f96d157067156b0e25274a733ee354f1124d5 Mon Sep 17 00:00:00 2001
From: Jay Bryant <jbryant@pivotal.io>
Date: Mon, 9 Mar 2020 12:12:01 -0500
Subject: [PATCH 1/2] Dynamic ToC and PDF output

I updated the document-production parts of the build files to pick up the dynamic ToC (tocbot) that we use across the portfolio. I also added PDF output (again, in keeping with the rest of the portfolio). In doing so, I updated various versions and other settings.
---
 build.gradle      |  9 ++++++
 docs/build.gradle | 80 ++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 9bc4ef060..cbe976d9d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -244,6 +244,15 @@ task docsZip(type: Zip, dependsOn: [':docs:asciidoctor', ':api', ':buildSamples'
 	destinationDir = file("${project.buildDir}/distributions")
 
 	from(project.tasks.findByPath(':docs:asciidoctor')) {
+		include "index.html"
+		include "css/**"
+		include "js/**"
+		include "images/**"
+		into 'reference'
+	}
+
+	from(project.tasks.findByPath(':docs:makePDF')) {
+		include "index.pdf"
 		into 'reference'
 	}
 
diff --git a/docs/build.gradle b/docs/build.gradle
index 528f2f8bd..dd1bbc0ee 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -8,7 +8,8 @@ repositories {
 }
 
 dependencies {
-	asciidoctor 'io.spring.asciidoctor:spring-asciidoctor-extensions:0.1.2.RELEASE'
+	asciidoctor 'io.spring.asciidoctor:spring-asciidoctor-extensions:0.2.0.RELEASE'
+	asciidoctor "org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16"
 	testCompile project(':spring-restdocs-mockmvc')
 	testCompile project(':spring-restdocs-restassured')
 	testCompile project(':spring-restdocs-webtestclient')
@@ -19,13 +20,82 @@ dependencies {
 	testCompile 'org.junit.jupiter:junit-jupiter-api'
 }
 
+ext {
+	docResourcesVersion = '0.1.3.RELEASE'
+}
+
 tasks.findByPath("artifactoryPublish")?.enabled = false
 
-asciidoctor {
+configurations {
+	docs
+}
+
+dependencies {
+	docs "io.spring.docresources:spring-doc-resources:${docResourcesVersion}@zip"
+}
+
+task prepareAsciidocBuild(type: Sync) {
+	dependsOn configurations.docs
+	// copy doc resources
+	from {
+		configurations.docs.collect { zipTree(it) }
+	}
+	// and doc sources
+	from "../docs/src/docs/asciidoc/"
+	// to a build directory of your choice
+	into "$buildDir/asciidoc/assemble"
+}
+
+task copyExamples(type: Copy) {
+	dependsOn prepareAsciidocBuild
+	from "../docs/src/test/java"
+	into "$buildDir/asciidoc/assemble/examples/java"
+}
+
+task('makePDF', type: org.asciidoctor.gradle.AsciidoctorTask){
+	dependsOn copyExamples
+	backends 'pdf'
+	sourceDir "$buildDir/asciidoc/assemble"
 	sources {
 		include 'index.adoc'
 	}
-	attributes	'revnumber': project.version,
-				'branch-or-tag': project.version.endsWith('SNAPSHOT') ? 'master': "v${project.version}"
-	inputs.files(sourceSets.test.java)
+	options doctype: 'book', eruby: 'erubis'
+	logDocuments = true
+	attributes 'icons': 'font',
+		'examples-dir': 'examples/java',
+		'sectanchors': '',
+		'sectnums': '',
+		'toc': '',
+		'source-highlighter' : 'coderay',
+		revnumber: project.version
+}
+
+asciidoctor {
+	dependsOn makePDF
+	backends 'html5'
+	sourceDir "$buildDir/asciidoc/assemble"
+	resources {
+		from(sourceDir) {
+			include 'images/*', 'css/**', 'js/**'
+		}
+	}
+	options doctype: 'book', eruby: 'erubis'
+	logDocuments = true
+	attributes 'docinfo': 'shared',
+		'examples-dir': 'examples/java',
+		// use provided stylesheet
+		stylesdir: "css/",
+		stylesheet: 'spring.css',
+		'linkcss': true,
+		'icons': 'font',
+    'sectanchors': '',
+		// use provided highlighter
+		'source-highlighter=highlight.js',
+		'highlightjsdir=js/highlight',
+		'highlightjs-theme=atom-one-dark-reasonable',
+		'idprefix': '',
+		'idseparator': '-',
+		'spring-version': project.version,
+		'allow-uri-read': '',
+		revnumber: project.version
 }

From cac478718f10eb3ec8d4cd586ae57dac1313d3f1 Mon Sep 17 00:00:00 2001
From: Jay Bryant <jbryant@pivotal.io>
Date: Wed, 1 Apr 2020 10:55:43 -0500
Subject: [PATCH 2/2] Update spring-doc-resources version and highlight

Update to pick up the latest look and feel and better highlighting.
---
 docs/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/build.gradle b/docs/build.gradle
index dd1bbc0ee..5ed825c0c 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -21,7 +21,7 @@ dependencies {
 }
 
 ext {
-	docResourcesVersion = '0.1.3.RELEASE'
+	docResourcesVersion = '0.2.0.RELEASE'
 }
 
 tasks.findByPath("artifactoryPublish")?.enabled = false
@@ -92,7 +92,7 @@ asciidoctor {
 		// use provided highlighter
 		'source-highlighter=highlight.js',
 		'highlightjsdir=js/highlight',
-		'highlightjs-theme=atom-one-dark-reasonable',
+		'highlightjs-theme=github',
 		'idprefix': '',
 		'idseparator': '-',
 		'spring-version': project.version,