Merge #170 into 1.5.4

Author: acogoluegnes

build.gradle

@@ -19,14 +19,12 @@ buildscript {
 		mavenCentral()
 		maven { url "https://repo.spring.io/plugins-release" }
 	}
-	dependencies {
-		classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.4'
-	}
 }
 plugins {
-	id 'org.asciidoctor.convert' version '1.5.12'
-	id 'me.champeau.gradle.jmh' version '0.4.7'
-	id "com.jfrog.artifactory" version "4.15.2" apply false
+	id 'org.asciidoctor.jvm.convert' version '3.3.2' apply false
+	id 'org.asciidoctor.jvm.pdf' version '3.3.2' apply false
+	// applied in setup.gradle, only if artifactory credentials are configured
+	id "com.jfrog.artifactory" version "4.24.20" apply false
 }
 
 ext {
@@ -55,7 +53,7 @@ ext {
 					"https://rabbitmq.github.io/rabbitmq-java-client/api/current/",] as String[]
 }
 
-apply from: "$gradleScriptDir/doc.gradle"
+apply from: "$gradleScriptDir/asciidoc.gradle"
 apply from: "$gradleScriptDir/releaser.gradle"
 
 configurations.all {
@@ -71,7 +69,6 @@ configure(allprojects) { project ->
 		maven { url 'https://repo.spring.io/snapshot' }
 	}
 
-	apply plugin: 'maven'
 	apply plugin: 'eclipse'
 	apply plugin: 'idea'
 	apply plugin: 'java'
@@ -100,21 +97,21 @@ configure(allprojects) { project ->
 	]
 
 	dependencies {
-		compile "io.projectreactor:reactor-core:$reactorCoreVersion"
-		compile "com.rabbitmq:amqp-client:$rabbitMqJavaClientVersion"
+		implementation "io.projectreactor:reactor-core:$reactorCoreVersion"
+		implementation "com.rabbitmq:amqp-client:$rabbitMqJavaClientVersion"
 
 		// Testing
 		// JUnit Jupiter API and TestEngine implementation
-		testCompile("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
-		testCompile("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
-		testRuntime("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
-
-		testCompile "io.projectreactor:reactor-test:$reactorCoreVersion"
-		testCompile "org.mockito:mockito-core:$mockitoVersion"
-		testCompile "org.assertj:assertj-core:${assertjVersion}"
-		testRuntime "org.slf4j:jcl-over-slf4j:$slf4jVersion"
-		testRuntime "org.slf4j:slf4j-api:$slf4jVersion"
-		testRuntime "ch.qos.logback:logback-classic:$logbackVersion"
+		testImplementation("org.junit.jupiter:junit-jupiter-api:${junitJupiterVersion}")
+		testImplementation("org.junit.jupiter:junit-jupiter-params:${junitJupiterVersion}")
+		testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitJupiterVersion}")
+
+		testImplementation "io.projectreactor:reactor-test:$reactorCoreVersion"
+		testImplementation "org.mockito:mockito-core:$mockitoVersion"
+		testImplementation "org.assertj:assertj-core:${assertjVersion}"
+		testRuntimeOnly "org.slf4j:jcl-over-slf4j:$slf4jVersion"
+		testRuntimeOnly "org.slf4j:slf4j-api:$slf4jVersion"
+		testRuntimeOnly "ch.qos.logback:logback-classic:$logbackVersion"
 	}
 
 	// force test runs even when there are no test changes
@@ -124,6 +121,7 @@ configure(allprojects) { project ->
 configure(rootProject) {
 	archivesBaseName = 'reactor-rabbitmq'
 	description = 'Reactor RabbitMQ: A reactive API for RabbitMQ'
+	apply from: "$gradleScriptDir/javadoc.gradle"
 
 	jar {
 		manifest {
@@ -146,27 +144,27 @@ project(':reactor-rabbitmq-samples') {
 	description = 'Samples for Reactor RabbitMQ'
 
 	dependencies {
-		compile rootProject
-		runtime "ch.qos.logback:logback-classic:$logbackVersion"
+		implementation rootProject
+		runtimeOnly "ch.qos.logback:logback-classic:$logbackVersion"
 		implementation "org.springframework.boot:spring-boot-starter:$springBootVersion"
 		implementation "org.springframework.amqp:spring-rabbit:$springAmqpVersion"
 
-		testCompile rootProject.sourceSets.test.output
-		testRuntime "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
+		testImplementation rootProject.sourceSets.test.output
+		testRuntimeOnly "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
 	}
 
 	task sender(type:JavaExec) {
-		main = 'reactor.rabbitmq.samples.SampleSender'
+		mainClass = 'reactor.rabbitmq.samples.SampleSender'
 		classpath = sourceSets.main.runtimeClasspath
 	}
 
 	task receiver(type:JavaExec) {
-		main = 'reactor.rabbitmq.samples.SampleReceiver'
+		mainClass = 'reactor.rabbitmq.samples.SampleReceiver'
 		classpath = sourceSets.main.runtimeClasspath
 	}
 
 	task springboot(type:JavaExec) {
-		main = 'reactor.rabbitmq.samples.SpringBootSample'
+		mainClass = 'reactor.rabbitmq.samples.SpringBootSample'
 		classpath = sourceSets.main.runtimeClasspath
 	}
 

gradle/asciidoc.gradle

@@ -0,0 +1,81 @@
+/*
+ * Copyright (c) 2011-2021 VMware Inc. or its affiliates, All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+configure(rootProject) {
+  	apply plugin: 'org.asciidoctor.jvm.convert'
+  	apply plugin: 'org.asciidoctor.jvm.pdf'
+
+	var date = new Date().format('yyyy-MM-dd');
+
+	// This configuration applies both to the asciidoctor & asciidoctorPdf tasks
+	asciidoctorj {
+		options = [doctype: 'book']
+		attributes 'allow-uri-read': '',
+				   'attribute-missing': 'warn',
+				   'revdate': "${date}",
+				   'docinfo': '',
+				   'toc2': '',
+				   'compat-mode': '',
+				   'stylesdir': "stylesheets/",
+				   'stylesheet': 'golo.css',
+				   'appversion': "${project.version}",
+				   'source-highlighter': 'coderay'
+	}
+
+	asciidoctor {
+		sourceDir "src/docs/asciidoc/"
+		sources {
+			include "index.asciidoc"
+		}
+		baseDirFollowsSourceDir()
+		resources {
+			from(sourceDir) {
+				include 'images/**'
+			}
+		}
+		outputDir file("$buildDir/docs/asciidoc/html")
+		logDocuments = true
+		attributes stylesdir: "stylesheets/",
+				   stylesheet: 'golo.css',
+				   'source-highlighter': 'coderay'
+	}
+
+	asciidoctorPdf {
+		sourceDir "src/docs/asciidoc/"
+		sources {
+			include "index.asciidoc"
+		}
+		baseDirFollowsSourceDir()
+		outputDir file("$buildDir/docs/asciidoc/pdf")
+		logDocuments = true
+		attributes 'source-highlighter': 'coderay'
+	}
+
+  task docsZip(type: Zip, dependsOn: [asciidoctor, asciidoctorPdf]) {
+	archiveBaseName.set('reactor-rabbitmq')
+	archiveClassifier.set('docs')
+	afterEvaluate() {
+		//we copy the pdf late, when a potential customVersion has been applied to rootProject
+		from("$buildDir/docs/asciidoc/pdf/index.pdf") {
+			into ("docs/")
+			rename("index.pdf", "reactor-rabbitmq-reference-guide-${rootProject.version}.pdf")
+		}
+	}
+	from("$buildDir/docs/asciidoc/html5/index.html") { into("docs/") }
+	from("$buildDir/docs/asciidoc/html5/images") { into("images/") }
+  }
+}
+

gradle/doc.gradle

@@ -0,0 +1,28 @@
+javadoc {
+    dependsOn jar
+    group = "Reactor RabbitMQ Javadoc"
+
+    description = "Generates aggregated Javadoc API documentation."
+    title = "Reactor RabbitMQ ${version}"
+
+    if (JavaVersion.current().isJava8Compatible()) {
+        compileTestJava.options.compilerArgs += "-parameters"
+        tasks.withType(Javadoc) {
+            options.addStringOption('Xdoclint:none', '-quiet')
+        }
+    }
+
+    options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
+    options.author = true
+    options.header = "Reactor RabbitMQ"
+    options.overview = "src/api/overview.html"
+    options.stylesheetFile = file("src/api/stylesheet.css")
+    options.links(rootProject.ext.javadocLinks)
+
+    maxMemory = "1024m"
+    destinationDir = new File(buildDir, "docs/javadoc")
+    source rootProject.sourceSets.main.allJava
+    doFirst {
+        classpath = files(rootProject.sourceSets.main.compileClasspath)
+    }
+}

gradle/javadoc.gradle

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import org.gradle.util.VersionNumber
+import org.gradle.util.internal.VersionNumber
 
 static def qualifyVersion(String v) {
 	def versionNumber = VersionNumber.parse(v)

gradle/setup.gradle

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -210,7 +210,7 @@ For Maven:
 </repositories>
 --------
 
-[#versioning]
+[[versioning-scheme]]
 ==== Versioning
 
 Reactor RabbitMQ used https://semver.org/[semantic versioning] from version 1.0 to

src/docs/asciidoc/getting-started.adoc

@@ -1,7 +1,5 @@
 = Reactor RabbitMQ Reference Guide
-Arnaud Cogoluègnes, Pawel Mackowski
-// version is automatically set in doc.gradle, no need to change it here
-:appversion: 1.0.0.BUILD-SNAPSHOT
+Arnaud Cogoluègnes; Pawel Mackowski
 ifndef::host-github[:ext-relative: {outfilesuffix}]
 {appversion}
 :doctype: book

src/docs/asciidoc/index.asciidoc

@@ -5,7 +5,7 @@
 === What's new in Reactor RabbitMQ 1.4.1
 
 * Support exchange-to-exchange binding and unbinding
-* Change in <<versioning,versioning scheme>>: Reactor RabbitMQ does not follow semantic versioning anymore,
+* Change in <<versioning-scheme,versioning scheme>>: Reactor RabbitMQ does not follow semantic versioning anymore,
 it uses now a `GENERATION.MAJOR.MINOR` scheme, for consistency with the other Reactor libraries
 
 === What's new in Reactor RabbitMQ 1.4