From 62c363ff7b964d1271197d978e3d76cc7679dd09 Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Tue, 8 Aug 2017 09:16:56 -0400
Subject: [PATCH] Checkstyle Fix and Version Updates

---
 build.gradle                                   | 18 +++++++++---------
 .../kafka/test/context/EmbeddedKafka.java      |  1 -
 .../kafka/test/rule/KafkaEmbedded.java         |  1 -
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/build.gradle b/build.gradle
index fe2462e8..4cb93e20 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,15 +3,15 @@ buildscript {
 		maven { url 'https://repo.spring.io/plugins-release' }
 	}
 	dependencies {
-		classpath 'io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE'
-		classpath 'io.spring.gradle:spring-io-plugin:0.0.6.RELEASE'
+		classpath 'io.spring.gradle:dependency-management-plugin:1.0.2.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'
 	}
 }
 
 plugins {
-	id 'org.sonarqube' version '2.1'
+	id 'org.sonarqube' version '2.5'
 	id 'base'
 	id 'project-report'
 	id 'idea'
@@ -37,8 +37,8 @@ allprojects {
 	repositories {
 		maven { url 'https://repo.spring.io/libs-release' }
 		maven { url 'https://repo.spring.io/libs-milestone' }
-		if (project.hasProperty('platformVersion')) {
-			maven { url 'https://repo.spring.io/snapshot' }
+		if (version.endsWith('BUILD-SNAPSHOT') || project.hasProperty('platformVersion')) {
+			maven { url 'https://repo.spring.io/libs-snapshot' }
 		}
 	}
 
@@ -85,7 +85,7 @@ subprojects { subproject ->
 		mockitoVersion = '1.10.19'
 		scalaVersion = '2.11'
 		slf4jVersion = '1.7.22'
-		springRetryVersion = '1.1.3.RELEASE'
+		springRetryVersion = '1.2.0.RELEASE'
 		springVersion = '4.3.10.RELEASE'
 
 		idPrefix = 'kafka'
@@ -95,7 +95,7 @@ subprojects { subproject ->
 	eclipse.project.natures += 'org.springframework.ide.eclipse.core.springnature'
 
 	jacoco {
-		toolVersion = '0.7.8'
+		toolVersion = '0.7.9'
 	}
 
 	// enable all compiler warnings; individual projects may customize further
@@ -113,14 +113,14 @@ subprojects { subproject ->
 
 	checkstyle {
 		configFile = file("${rootDir}/src/checkstyle/checkstyle.xml")
-		toolVersion = "6.16.1"
+		toolVersion = "8.0"
 	}
 
 	jacocoTestReport {
 		reports {
 			xml.enabled false
 			csv.enabled false
-			html.destination "${buildDir}/reports/jacoco/html"
+			html.destination file("${buildDir}/reports/jacoco/html")
 		}
 	}
 
diff --git a/spring-kafka-test/src/main/java/org/springframework/kafka/test/context/EmbeddedKafka.java b/spring-kafka-test/src/main/java/org/springframework/kafka/test/context/EmbeddedKafka.java
index ff76a99a..2e081927 100644
--- a/spring-kafka-test/src/main/java/org/springframework/kafka/test/context/EmbeddedKafka.java
+++ b/spring-kafka-test/src/main/java/org/springframework/kafka/test/context/EmbeddedKafka.java
@@ -22,7 +22,6 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
-import java.util.Map;
 
 import org.springframework.core.annotation.AliasFor;
 import org.springframework.kafka.test.rule.KafkaEmbedded;
diff --git a/spring-kafka-test/src/main/java/org/springframework/kafka/test/rule/KafkaEmbedded.java b/spring-kafka-test/src/main/java/org/springframework/kafka/test/rule/KafkaEmbedded.java
index de361367..5af3d140 100644
--- a/spring-kafka-test/src/main/java/org/springframework/kafka/test/rule/KafkaEmbedded.java
+++ b/spring-kafka-test/src/main/java/org/springframework/kafka/test/rule/KafkaEmbedded.java
@@ -75,7 +75,6 @@ import scala.collection.Set;
  * @author Artem Bilan
  * @author Gary Russell
  */
-@SuppressWarnings("serial")
 public class KafkaEmbedded extends ExternalResource implements KafkaRule, InitializingBean, DisposableBean {
 
 	public static final String BEAN_NAME = "kafkaEmbedded";