Add nohttp Gradle plugin (#1116)

* Add `nohttp` Gradle plugin

* * Upgrade to Kafka Client 2.2.1
* Fix test do not provide a `null` for headers into the `ConsumerRecord`:
it is not allowed any more in a new client version
* Upgrade some other dependencies including Checkstyle plugin

Author: artembilan

build.gradle

@@ -1,24 +1,27 @@
 buildscript {
-	ext.kotlinVersion = '1.3.21'
+	ext.kotlinVersion = '1.3.31'
 	repositories {
 		maven { url 'https://repo.spring.io/plugins-release' }
 	}
 	dependencies {
-		classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.16'
+		classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-alpha.18'
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 		classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
+		classpath 'io.spring.nohttp:nohttp-gradle:0.0.2.RELEASE'
 	}
 }
 
 plugins {
 	id 'base'
 	id 'project-report'
 	id 'idea'
-	id "org.sonarqube" version '2.7'
-	id 'org.asciidoctor.convert' version '1.5.10'
+	id "org.sonarqube" version '2.7.1'
+	id 'org.asciidoctor.convert' version '1.6.1'
 	id 'org.ajoberstar.grgit' version '3.1.1'
 }
 
+apply plugin: 'io.spring.nohttp'
+
 description = 'Spring Kafka'
 
 ext {
@@ -34,6 +37,11 @@ ext {
 			files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
 }
 
+nohttp {
+	source.include '**/src/**'
+	source.exclude '**/*.gif', '**/*.ks'
+}
+
 allprojects {
 	group = 'org.springframework.kafka'
 
@@ -78,15 +86,15 @@ subprojects { subproject ->
 		junit4Version = '4.12'
 		junitJupiterVersion = '5.4.2'
 		junitPlatformVersion = '1.4.2'
-		kafkaVersion = '2.2.0'
+		kafkaVersion = '2.2.1'
 		log4jVersion = '2.11.2'
-		mockitoVersion = '2.26.0'
+		mockitoVersion = '2.28.2'
 		scalaVersion = '2.12'
 		springRetryVersion = '1.2.4.RELEASE'
 		springVersion = '5.2.0.M2'
 		springDataCommonsVersion = '2.2.0.M4'
-		reactorVersion = '3.2.8.RELEASE'
-		reactorKafkaVersion = '1.1.0.RELEASE'
+		reactorVersion = '3.3.0.M1'
+		reactorKafkaVersion = '1.2.0.BUILD-SNAPSHOT'
 
 		idPrefix = 'kafka'
 
@@ -133,7 +141,7 @@ subprojects { subproject ->
 
 	checkstyle {
 		configFile = file("${rootDir}/src/checkstyle/checkstyle.xml")
-		toolVersion = "8.19"
+		toolVersion = "8.21"
 	}
 
 	jacocoTestReport {

spring-kafka/src/test/java/org/springframework/kafka/support/converter/BatchMessageConverterTests.java

@@ -43,6 +43,8 @@
 
 /**
  * @author Biju Kunjummen
+ * @author Artem Bilan
+ *
  * @since 1.3
  */
 public class BatchMessageConverterTests {
@@ -120,9 +122,7 @@ private MessageHeaders testGuts(BatchMessageConverter batchMessageConverter) {
 	@Test
 	public void missingHeaders() {
 		BatchMessageConverter converter = new BatchMessagingMessageConverter();
-		Headers nullHeaders = null;
-		ConsumerRecord<String, String> record = new ConsumerRecord<>("foo", 1, 42, -1L, null, 0L, 0, 0, "bar", "baz",
-				nullHeaders);
+		ConsumerRecord<String, String> record = new ConsumerRecord<>("foo", 1, 42, -1L, null, 0L, 0, 0, "bar", "baz");
 		List<ConsumerRecord<?, ?>> records = Collections.singletonList(record);
 		Message<?> message = converter.toMessage(records, null, null, null);
 		assertThat(((List<String>) message.getPayload())).contains("baz");

spring-kafka/src/test/java/org/springframework/kafka/support/converter/MessagingMessageConverterTests.java

@@ -19,14 +19,15 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import org.apache.kafka.clients.consumer.ConsumerRecord;
-import org.apache.kafka.common.header.Headers;
 import org.junit.jupiter.api.Test;
 
 import org.springframework.kafka.support.KafkaHeaders;
 import org.springframework.messaging.Message;
 
 /**
  * @author Gary Russell
+ * @author Artem Bilan
+ *
  * @since 2.1.13
  *
  */
@@ -35,9 +36,7 @@ public class MessagingMessageConverterTests {
 	@Test
 	void missingHeaders() {
 		MessagingMessageConverter converter = new MessagingMessageConverter();
-		Headers nullHeaders = null;
-		ConsumerRecord<String, String> record = new ConsumerRecord<>("foo", 1, 42, -1L, null, 0L, 0, 0, "bar", "baz",
-				nullHeaders);
+		ConsumerRecord<String, String> record = new ConsumerRecord<>("foo", 1, 42, -1L, null, 0L, 0, 0, "bar", "baz");
 		Message<?> message = converter.toMessage(record, null, null, null);
 		assertThat(message.getPayload()).isEqualTo("baz");
 		assertThat(message.getHeaders().get(KafkaHeaders.RECEIVED_TOPIC)).isEqualTo("foo");