INT-4339: Remove Docbook & rely on Asciidoctor

JIRA: https://jira.spring.io/browse/INT-4339

Author: Jay Bryant

build.gradle

@@ -4,28 +4,27 @@ buildscript {
 		maven { url 'https://repo.spring.io/plugins-release' }
 	}
 	dependencies {
-		classpath 'io.spring.gradle:docbook-reference-plugin:0.3.1'
-		classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.8'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 		classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
+		classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
 	}
 }
 
 plugins {
 	id 'org.sonarqube' version '2.6.2'
+	id 'org.asciidoctor.convert' version '1.5.9.2'
 }
 
 description = 'Spring Integration'
 
-def docsDir = 'src/reference/asciidoc'
-
 ext {
 	linkHomepage = 'https://projects.spring.io/spring-integration'
 	linkCi = 'https://build.spring.io/browse/INT'
 	linkIssue = 'https://jira.spring.io/browse/INT'
 	linkScmUrl = 'https://github.com/spring-projects/spring-integration'
 	linkScmConnection = 'scm:git:git://github.com/spring-projects/spring-integration.git'
 	linkScmDevConnection = 'scm:git:ssh://[email protected]:spring-projects/spring-integration.git'
+	docResourcesVersion = '0.1.0.RELEASE'
 }
 
 allprojects {
@@ -764,42 +763,58 @@ project("spring-integration-bom") {
 	}
 }
 
-apply plugin: 'org.asciidoctor.convert'
+configurations {
+	docs
+}
+
+dependencies {
+	docs "io.spring.docresources:spring-doc-resources:${docResourcesVersion}@zip"
+}
+
+task prepareAsciidocBuild(type: Sync) {
+	dependsOn configurations.docs
+	from {
+		configurations.docs.collect { zipTree(it) }
+	}
+	from 'src/reference/asciidoc/'
+	into "$buildDir/asciidoc"
+}
 
 asciidoctor {
-	sourceDir = file("$docsDir")
+	dependsOn 'prepareAsciidocBuild'
+	sourceDir "$buildDir/asciidoc"
 	sources {
 		include 'index.adoc'
 	}
-	backends = ['html5', 'docbook']
-	logDocuments = true
-	options = [
-		doctype: 'book',
-	]
-	attributes = [
-		docinfo: '',
-		toc2: '',
-		'compat-mode': '',
-		imagesdir: '',
-		stylesheet: "${rootProject.projectDir}/src/reference/asciidoc/stylesheets/golo.css",
-		'source-highlighter': 'highlightjs'
-	]
-}
-
-apply plugin: DocbookReferencePlugin
-
-reference {
-	sourceFileName = 'index.xml'
-	sourceDir = file("$buildDir/asciidoc/docbook")
-	pdfFilename = 'spring-integration-reference.pdf'
-	expandPlaceholders = ''
+	resources {
+		from(sourceDir) {
+			include 'images/*', 'css/*', 'js/**'
+		}
+	}
+	backends = ['html5', 'pdf']
+	options doctype: 'book', eruby: 'erubis'
+	attributes  'icons': 'font',
+			'idprefix': '',
+			'idseparator': '-',
+			docinfo: 'shared',
+			sectanchors: '',
+			sectnums: '',
+			stylesdir: 'css/',
+			stylesheet: 'spring.css',
+			'linkcss': true,
+			'source-highlighter=highlight.js',
+			'highlightjsdir=js/highlight',
+			'highlightjs-theme=atom-one-dark-reasonable',
+			'project-version': project.version,
+			'allow-uri-read': ''
+}
+
+task reference(dependsOn: asciidoctor) {
+	group = 'Documentation'
+	description = 'Generate the reference documentation'
 }
 
-reference.dependsOn asciidoctor
-
-[asciidoctor, reference, referenceEpub, referenceHtmlMulti, referenceHtmlSingle, referencePdf].each {
-	it.onlyIf { "$System.env.NO_REFERENCE_TASK" != 'true' || project.hasProperty('ignoreEnvToStopReference') }
-}
+reference.onlyIf { "$System.env.NO_REFERENCE_TASK" != 'true' || project.hasProperty('ignoreEnvToStopReference') }
 
 sonarqube {
 	properties {
@@ -863,7 +878,7 @@ task schemaZip(type: Zip) {
 	}
 }
 
-task docsZip(type: Zip) {
+task docsZip(type: Zip, dependsOn: reference) {
 		group = 'Distribution'
 		classifier = 'docs'
 		description = "Builds -${classifier} archive containing api and reference " +
@@ -877,9 +892,14 @@ task docsZip(type: Zip) {
 			into 'api'
 		}
 
-		from (reference) {
-			into 'reference'
-		}
+	    from ('build/asciidoc/html5') {
+		     into 'reference'
+	    }
+
+	    from ('build/asciidoc/pdf') {
+		     include 'index.pdf'
+		     into 'reference'
+	    }
 }
 
 task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {

composite_filter_bugfix

@@ -8,7 +8,7 @@ See the https://github.com/spring-projects/spring-integration/wiki/Spring-Integr
 
 Spring Integration 2.0 is built on top of Spring 3.0.5 and makes many of its features available to our users.
 
-[[spel-support]]
+[[2.0-spel-support]]
 ===== Support for the Spring Expression Language (SpEL)
 
 You can now use SpEL expressions within the transformer, router, filter, splitter, aggregator, service-activator, header-enricher, and many more elements of the Spring Integration core namespace as well as within various adapters.

src/reference/asciidoc/changes-1.0-2.0.adoc

@@ -1,27 +1,27 @@
 [[spring-integration-reference]]
-= Spring Integration Reference Manual
-:revnumber: {project-version}
-:revdate: {localdate}
-:linkcss:
-:doctype: book
-:docinfo: shared
+= Spring Integration
 :toc: left
 :toclevels: 4
-:source-highlighter: prettify
+:numbered:
 :icons: font
-:imagesdir: images
-ifdef::backend-epub3[:front-cover-image: image:epub-cover.png[Front Cover,1050,1600]]
+:hide-uri-scheme:
+Mark Fisher; Marius Bogoevici; Iwein Fuld; Jonas Partner; Oleg Zhurakousky; Gary Russell; Dave Syer; Josh Long; David Turanski; Gunnar Hillert; Artem Bilan; Amol Nayak; Jay Bryant
 
-(C) 2009-2018 Pivotal Software, Inc. All rights reserved.
+*{project-version}*
 
-NOTE: 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 copy contains this Copyright Notice, whether distributed in print or electronically.
+(C) 2009 - 2019 Pivotal Software, Inc.
+All rights reserved.
+
+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 copy contains this Copyright Notice, whether distributed in print or electronically.
 
 include::./preface.adoc[]
+
 [[whats-new-part]]
 = What's New?
 
 [[spring-integration-intro-new]]
 For those who are already familiar with Spring Integration, this chapter provides a brief overview of the new features of version 5.1.
+
 If you are interested in the changes and features that were introduced in earlier versions, see the <<history>>.
 
 include::./whats-new.adoc[]
@@ -33,6 +33,7 @@ include::./whats-new.adoc[]
 Spring Integration provides an extension of the Spring programming model to support the well known http://www.eaipatterns.com/[Enterprise Integration Patterns].
 It enables lightweight messaging within Spring-based applications and supports integration with external systems through declarative adapters.
 Those adapters provide a higher level of abstraction over Spring's support for remoting, messaging, and scheduling.
+
 Spring Integration's primary goal is to provide a simple model for building enterprise integration solutions while maintaining the separation of concerns that is essential for producing maintainable, testable code.
 
 include::./overview.adoc[]
@@ -44,7 +45,8 @@ include::./overview.adoc[]
 This section covers all aspects of the core messaging API in Spring Integration.
 It covers messages, message channels, and message endpoints.
 It also covers many of the enterprise integration patterns, such as filter, router, transformer, service activator , splitter, and aggregator.
-The section also contains material about system management, including the control bus and message history support.
+
+This section also contains material about system management, including the control bus and message history support.
 
 // BE SURE TO PRECEDE ALL include:: with a blank line - see https://github.com/asciidoctor/asciidoctor/issues/1297
 include::./messaging-channels.adoc[]
@@ -67,6 +69,8 @@ include::./system-management.adoc[]
 [[spring-integration-adapters]]
 This section covers the various channel adapters and messaging gateways provided by Spring Integration to support message-based communication with external systems.
 
+Each system, from AMQP to Zookeeper, has its own integration requirements, and this section covers them.
+
 // BE SURE TO PRECEDE ALL include:: with a blank line - see https://github.com/asciidoctor/asciidoctor/issues/1297
 include::./endpoint-summary.adoc[]
 
@@ -129,7 +133,9 @@ include::./zookeeper.adoc[]
 = Appendices
 
 [[spring-integration-adapters-advanced]]
-Advanced Topics and Additional Resources
+The appendices cover advanced topics and additional resources.
+
+The last appendix covers the history of Spring Integration.
 
 [appendix]
 include::./spel.adoc[]