Upgrade Asciidoctor

Upgrade Asciidoctor to the latest version, to eliminate technical debt.

Author: Jay Bryant

build.gradle

@@ -4,7 +4,6 @@ buildscript {
 		maven { url 'https://repo.spring.io/plugins-release' }
 	}
 	dependencies {
-		classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-beta.6'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 		classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
 	}
@@ -15,11 +14,13 @@ plugins {
 	id 'project-report'
 	id 'idea'
 	id 'org.sonarqube' version '2.8'
-	id 'org.asciidoctor.convert' version '1.6.1'
 	id 'org.ajoberstar.grgit' version '4.0.1' apply false
 	id 'io.spring.nohttp' version '0.0.4.RELEASE'
 	id 'io.spring.dependency-management' version '1.0.9.RELEASE' apply false
 	id 'com.jfrog.artifactory' version '4.13.0' apply false
+	id 'org.asciidoctor.jvm.pdf' version '3.1.0'
+	id 'org.asciidoctor.jvm.gems' version '3.1.0'
+	id 'org.asciidoctor.jvm.convert' version '3.1.0'
 }
 
 apply plugin: 'io.spring.nohttp'
@@ -341,26 +342,34 @@ task prepareAsciidocBuild(type: Sync) {
 	into "$buildDir/asciidoc"
 }
 
-task('makePDF', type: org.asciidoctor.gradle.AsciidoctorTask) {
+asciidoctorPdf {
 	dependsOn prepareAsciidocBuild
-	backends 'pdf'
-	sourceDir "$buildDir/asciidoc"
-	sources {
-		include 'index.adoc'
-	}
-	options doctype: 'book', eruby: 'erubis'
-	attributes 'icons': 'font',
+	baseDirFollowsSourceFile()
+
+	asciidoctorj {
+		sourceDir "$buildDir/asciidoc"
+		inputs.dir(sourceDir)
+		sources {
+			include 'index.adoc'
+		}
+		options doctype: 'book'
+		attributes 'icons': 'font',
 		'sectanchors': '',
 		'sectnums': '',
 		'toc': '',
 		'source-highlighter' : 'coderay',
-		revnumber: project.version
+		revnumber: project.version,
+		'project-version': project.version
+	}
 }
 
 asciidoctor {
-	dependsOn makePDF
-	backends 'html5'
-	sourceDir "$buildDir/asciidoc"
+	dependsOn asciidoctorPdf
+	baseDirFollowsSourceFile()
+	sourceDir = file("$buildDir/asciidoc")
+	sources {
+		include '*.adoc'
+	}
 	resources {
 		from(sourceDir) {
 			include 'images/*', 'css/**', 'js/**'
@@ -374,16 +383,17 @@ asciidoctor {
 		'linkcss': true,
 		'icons': 'font',
 		'sectanchors': '',
-		'source-highlighter=highlight.js',
-		'highlightjsdir=js/highlight',
+		'source-highlighter': 'highlight.js',
+		'highlightjsdir': 'js/highlight',
 		'highlightjs-theme': 'github',
 		'idprefix': '',
 		'idseparator': '-',
 		'spring-version': project.version,
 		'allow-uri-read': '',
 		'toc': 'left',
 		'toclevbels': '4',
-		revnumber: project.version
+		revnumber: project.version,
+		'project-version': project.version
 }
 
 task reference(dependsOn: asciidoctor) {

src/reference/asciidoc/kafka.adoc

@@ -139,6 +139,7 @@ private KafkaAdmin admin;
 ----
 ====
 
+[[sending-messages]]
 ==== Sending Messages
 
 This section covers how to send messages.
@@ -726,6 +727,7 @@ IMPORTANT: The listener container for the replies MUST be configured with `AckMo
 To avoid any possibility of losing messages, the template only commits offsets when there are zero requests outstanding, i.e. when the last outstanding request is released by the release strategy.
 After a rebalance, it is possible for duplicate reply deliveries; these will be ignored for any in-flight requests; you may see error log messages when duplicate replies are received for already released replies.
 
+[[receiving-messages]]
 ==== Receiving Messages
 
 You can receive messages by configuring a `MessageListenerContainer` and providing a message listener or by using the `@KafkaListener` annotation.
@@ -828,7 +830,7 @@ The `ConcurrentMessageListenerContainer` delegates to one or more `KafkaMessageL
 
 Starting with version 2.2.7, you can add a `RecordInterceptor` to the listener container; it will be invoked before calling the listener allowing inspection or modification of the record.
 If the interceptor returns null, the listener is not called.
-The interceptor is not invoked when the listener is a <<batch-listners, batch listener>>.
+The interceptor is not invoked when the listener is a <<batch-listeners, batch listener>>.
 
 Starting with version 2.3, the `CompositeRecordInterceptor` can be used to invoke multiple interceptors.