From c156539e0c91dbe2c70e863be93a87c8505cfa3f Mon Sep 17 00:00:00 2001
From: Gary Russell <grussell@pivotal.io>
Date: Fri, 4 Dec 2020 13:39:23 -0500
Subject: [PATCH] Upgrade dependency and gradle versions

---
 build.gradle                             | 29 ++++++++++++------------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/build.gradle b/build.gradle
index a068d800..b0fd77c6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-	ext.kotlinVersion = '1.3.61'
+	ext.kotlinVersion = '1.4.20'
 	repositories {
 		mavenCentral()
 		maven { url 'https://repo.spring.io/plugins-release' }
@@ -16,12 +16,12 @@ plugins {
 	id 'idea'
 	id 'org.sonarqube' version '2.8'
 	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'
+	id 'io.spring.nohttp' version '0.0.5.RELEASE'
+	id 'io.spring.dependency-management' version '1.0.10.RELEASE' apply false
+	id 'com.jfrog.artifactory' version '4.18.2' apply false
+	id 'org.asciidoctor.jvm.pdf' version '3.3.0'
+	id 'org.asciidoctor.jvm.gems' version '3.3.0'
+	id 'org.asciidoctor.jvm.convert' version '3.3.0'
 }
 
 apply plugin: 'io.spring.nohttp'
@@ -49,21 +49,21 @@ ext {
 			files(grgit.status().unstaged.modified).filter{ f -> f.name.endsWith('.java') || f.name.endsWith('.kt') }
 	}
 
-	assertjVersion = '3.17.2'
+	assertjVersion = '3.18.1'
 	googleJsr305Version = '3.0.2'
 	hamcrestVersion = '2.2'
 	hibernateValidationVersion = '6.1.6.Final'
-	jacksonVersion = '2.11.3'
+	jacksonVersion = '2.12.0'
 	jaywayJsonPathVersion = '2.4.0'
 	junit4Version = '4.13.1'
 	junitJupiterVersion = '5.7.0'
 	kafkaVersion = '2.7.0'
-	log4jVersion = '2.13.3'
-	micrometerVersion = '1.5.7'
-	mockitoVersion = '3.5.13'
+	log4jVersion = '2.14.0'
+	micrometerVersion = '1.6.1'
+	mockitoVersion = '3.6.28'
 	reactorVersion = '2020.0.1'
 	scalaVersion = '2.13'
-	springDataCommonsVersion = '2.4.1'
+	springDataVersion = '2021.0.0-SNAPSHOT'
 	springRetryVersion = '1.3.0'
 	springVersion = '5.3.1'
 
@@ -94,6 +94,7 @@ allprojects {
 			mavenBom "org.junit:junit-bom:$junitJupiterVersion"
 			mavenBom "org.springframework:spring-framework-bom:$springVersion"
 			mavenBom "io.projectreactor:reactor-bom:$reactorVersion"
+			mavenBom "org.springframework.data:spring-data-bom:$springDataVersion"
 		}
 	}
 
@@ -291,7 +292,7 @@ project ('spring-kafka') {
 		optionalApi 'com.fasterxml.jackson.core:jackson-databind'
 
 		// Spring Data projection message binding support
-		optionalApi ("org.springframework.data:spring-data-commons:$springDataCommonsVersion") {
+		optionalApi ("org.springframework.data:spring-data-commons") {
 			exclude group: 'org.springframework'
 		}
 		optionalApi "com.jayway.jsonpath:json-path:$jaywayJsonPathVersion"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 12d38de6..4d9ca164 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists