Upgrade to Gradle 4.7 and others, build polishing

* Upgrade all the dependencies to their latest version
* Remove Spring IO plugin stuff as it isn't supported any more
* Remove redundant dependencies since they are polled transitively
*

Author: artembilan

Diff for: build.gradle

@@ -3,23 +3,21 @@ buildscript {
 		maven { url 'https://repo.spring.io/plugins-release' }
 	}
 	dependencies {
-		classpath 'io.spring.gradle:dependency-management-plugin:1.0.3.RELEASE'
-		classpath 'io.spring.gradle:spring-io-plugin:0.0.8.RELEASE'
 		classpath 'io.spring.gradle:docbook-reference-plugin:0.3.1'
-		classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.0'
+		classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.3'
 	}
 }
 
 plugins {
-	id 'org.sonarqube' version '2.5'
+	id 'org.sonarqube' version '2.6.2'
 	id 'base'
 	id 'project-report'
 	id 'idea'
 }
 
 description = 'Spring Kafka'
 
-def docsDir = 'src/reference/asciidoc' // Will be default with newer asciidoctor plugin
+def docsDir = 'src/reference/asciidoc'
 
 ext {
 	linkHomepage = 'https://github.com/spring-projects/spring-kafka'
@@ -36,7 +34,7 @@ allprojects {
 
 	repositories {
 		maven { url 'https://repo.spring.io/libs-milestone' }
-		if (version.endsWith('BUILD-SNAPSHOT') || project.hasProperty('platformVersion')) {
+		if (version.endsWith('BUILD-SNAPSHOT')) {
 			maven { url 'https://repo.spring.io/libs-snapshot' }
 		}
 	}
@@ -52,18 +50,6 @@ subprojects { subproject ->
 	apply plugin: 'jacoco'
 	apply plugin: 'checkstyle'
 
-	if (project.hasProperty('platformVersion')) {
-		apply plugin: 'spring-io'
-
-		dependencyManagement {
-			springIoTestRuntime {
-				imports {
-					mavenBom "io.spring.platform:platform-bom:${platformVersion}"
-				}
-			}
-		}
-	}
-
 	compileJava {
 		sourceCompatibility = 1.8
 		targetCompatibility = 1.8
@@ -72,19 +58,18 @@ subprojects { subproject ->
 	ext {
 		assertjVersion = '3.9.1'
 		hamcrestVersion = '1.3'
-		jacksonVersion = '2.9.4'
+		jacksonVersion = '2.9.5'
 		jaywayJsonPathVersion = '2.4.0'
 		junit4Version = '4.12'
-		junitJupiterVersion = '5.1.0'
-		junitPlatformVersion = '1.1.0'
-		junitVintageVersion = '5.1.0'
+		junitJupiterVersion = '5.1.1'
+		junitPlatformVersion = '1.1.1'
 		kafkaVersion = '1.1.0'
 		log4jVersion = '2.11.0'
-		mockitoVersion = '2.15.0'
+		mockitoVersion = '2.18.0'
 		scalaVersion = '2.11'
 		springRetryVersion = '1.2.2.RELEASE'
-		springVersion = '5.0.4.RELEASE'
-		springDataCommonsVersion = '2.0.4.RELEASE'
+		springVersion = '5.1.0.BUILD-SNAPSHOT'
+		springDataCommonsVersion = '2.1.0.BUILD-SNAPSHOT'
 
 		idPrefix = 'kafka'
 
@@ -103,12 +88,11 @@ subprojects { subproject ->
 		testRuntime "org.junit.platform:junit-platform-launcher:$junitPlatformVersion"
 
 		// To support JUnit 4 tests
-		testRuntime "org.junit.vintage:junit-vintage-engine:$junitVintageVersion"
+		testRuntime "org.junit.vintage:junit-vintage-engine:$junitJupiterVersion"
 
 		// To avoid compiler warnings about @API annotations in JUnit code
 		testCompileOnly 'org.apiguardian:apiguardian-api:1.0.0'
 
-		testRuntime "org.apache.logging.log4j:log4j-core:$log4jVersion"
 		testRuntime "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
 	}
 
@@ -128,7 +112,7 @@ subprojects { subproject ->
 
 	checkstyle {
 		configFile = file("${rootDir}/src/checkstyle/checkstyle.xml")
-		toolVersion = "8.8"
+		toolVersion = "8.9"
 	}
 
 	jacocoTestReport {
@@ -191,8 +175,6 @@ project ('spring-kafka') {
 		compile ("com.jayway.jsonpath:json-path:$jaywayJsonPathVersion", optional)
 
 		testCompile project (":spring-kafka-test")
-		testCompile "org.assertj:assertj-core:$assertjVersion"
-		testCompile "org.springframework:spring-tx:$springVersion"
 	}
 }
 
@@ -222,12 +204,13 @@ project ('spring-kafka-test') {
 	}
 }
 
-apply plugin: org.asciidoctor.gradle.AsciidoctorPlugin
+apply plugin: 'org.asciidoctor.convert'
 
 asciidoctor {
-	sourceDir file("$docsDir")
-	sourceDocumentNames = files("$docsDir/index.adoc") // Change in >= 1.5.1
-	outputDir file("$buildDir/html")
+	sourceDir = file("$docsDir")
+	sources {
+		include 'index.adoc'
+	}
 	backends = ['html5', 'docbook']
 	logDocuments = true
 	options = [
@@ -250,7 +233,7 @@ apply plugin: DocbookReferencePlugin
 
 reference {
 	sourceFileName = 'index.xml'
-	sourceDir = file("$buildDir/html")
+	sourceDir = file("$buildDir/reference-work/docbook")
 	pdfFilename = 'spring-kafka-reference.pdf'
 	expandPlaceholders = ''
 }
@@ -339,37 +322,6 @@ task distZip(type: Zip, dependsOn: [docsZip]) { //, schemaZip]) {
 	}
 }
 
-/*
-// Create an optional "with dependencies" distribution.
-// Not published by default; only for use when building from source.
-task depsZip(type: Zip, dependsOn: distZip) { zipTask ->
-	group = 'Distribution'
-	classifier = 'dist-with-deps'
-	description = "Builds -${classifier} archive, containing everything " +
-			"in the -${distZip.classifier} archive plus all dependencies."
-
-	from zipTree(distZip.archivePath)
-
-	gradle.taskGraph.whenReady { taskGraph ->
-		if (taskGraph.hasTask(":${zipTask.name}")) {
-			def projectName = rootProject.name
-			def artifacts = new HashSet()
-
-			rootProject.configurations.runtime.resolvedConfiguration.resolvedArtifacts.each { artifact ->
-				def dependency = artifact.moduleVersion.id
-				if (!projectName.equals(dependency.name)) {
-					artifacts << artifact.file
-				}
-			}
-
-			zipTask.from(artifacts) {
-				into "${distZip.baseDir}/deps"
-			}
-		}
-	}
-}
-*/
-
 artifacts {
 	archives distZip
 	archives docsZip

Diff for: gradle/wrapper/gradle-wrapper.jar

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