From 3058345648daff2e3be76a0afc8a790ede997941 Mon Sep 17 00:00:00 2001
From: Artem Bilan <abilan@pivotal.io>
Date: Fri, 13 Mar 2020 13:15:38 -0400
Subject: [PATCH] Upgrade to Gradle 6.2.2

* Improve `build.gradle`:
 - Upgrade some plugins
 - Remove unused (or mistaken) dependencies
 - Add transitive `exclude` into Spring Data dependencies
 - Add `inputs.dir(sourceDir)` for docs tasks in attempt to avoid their build because of `up-to-date`
---
 build.gradle                             | 16 ++++++++--------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 gradlew.bat                              |  3 +++
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1359853a5a..5d4eda2abd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ plugins {
 	id 'io.spring.nohttp' version '0.0.4.RELEASE' apply false
 	id 'org.ajoberstar.grgit' version '4.0.1'
 	id "io.spring.dependency-management" version '1.0.9.RELEASE'
-	id 'com.jfrog.artifactory' version '4.13.0' apply false
+	id 'com.jfrog.artifactory' version '4.14.1' apply false
 	id 'org.jetbrains.dokka' version '0.10.1'
 }
 
@@ -113,7 +113,6 @@ allprojects {
 		}
 		if (version.endsWith('BUILD-SNAPSHOT')) {
 			maven { url 'https://repo.spring.io/libs-snapshot' }
-			maven { url "https://oss.jfrog.org/artifactory/libs-snapshot" } // RSocket
 		}
 		maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
 //		maven { url 'https://repo.spring.io/libs-staging-local' }
@@ -227,7 +226,6 @@ configure(javaProjects) { subproject ->
 		}
 		testImplementation 'org.junit.jupiter:junit-jupiter-api'
 		testImplementation "com.willowtreeapps.assertk:assertk-jvm:$assertkVersion"
-		testImplementation 'org.jetbrains.kotlin:kotlin-reflect'
 		testImplementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 		testImplementation 'io.projectreactor:reactor-test'
 		testImplementation "com.jayway.jsonpath:json-path:$jsonpathVersion"
@@ -406,7 +404,6 @@ project('spring-integration-core') {
 	description = 'Spring Integration Core'
 
 	dependencies {
-		api 'org.springframework:spring-core'
 		api 'org.springframework:spring-aop'
 		api 'org.springframework:spring-context'
 		api 'org.springframework:spring-messaging'
@@ -421,7 +418,6 @@ project('spring-integration-core') {
 		optionalApi "io.micrometer:micrometer-core:$micrometerVersion"
 		optionalApi "io.github.resilience4j:resilience4j-ratelimiter:$resilience4jVersion"
 		optionalApi "org.apache.avro:avro:$avroVersion"
-		optionalApi 'org.jetbrains.kotlin:kotlin-reflect'
 		optionalApi 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 
 		testImplementation ("org.aspectj:aspectjweaver:$aspectjVersion")
@@ -477,7 +473,9 @@ project('spring-integration-gemfire') {
 	description = 'Spring Integration GemFire Support'
 	dependencies {
 		api project(':spring-integration-core')
-		api 'org.springframework.data:spring-data-geode'
+		api ('org.springframework.data:spring-data-geode')  {
+			exclude group: 'org.springframework'
+		}
 		api "commons-io:commons-io:$commonsIoVersion"
 
 		testImplementation project(':spring-integration-stream')
@@ -550,7 +548,6 @@ project('spring-integration-jms') {
 		providedImplementation "javax.jms:javax.jms-api:$jmsApiVersion"
 
 		testImplementation "org.apache.activemq:activemq-broker:$activeMqVersion"
-
 		testImplementation 'org.springframework:spring-oxm'
 	}
 }
@@ -587,9 +584,11 @@ project('spring-integration-mail') {
 	dependencies {
 		api project(':spring-integration-core')
 		api 'org.springframework:spring-context-support'
+
 		providedImplementation "javax.mail:javax.mail-api:$javaxMailVersion"
 		providedImplementation "com.sun.mail:imap:$javaxMailVersion"
 		providedImplementation "com.sun.mail:javax.mail:$javaxMailVersion"
+
 		optionalApi "javax.activation:javax.activation-api:$javaxActivationVersion"
 	}
 }
@@ -677,7 +676,6 @@ project('spring-integration-sftp') {
 	description = 'Spring Integration SFTP Support'
 	dependencies {
 		api project(':spring-integration-file')
-		api project(':spring-integration-stream')
 		api "com.jcraft:jsch:$jschVersion"
 		api 'org.springframework:spring-context-support'
 		optionalApi "javax.activation:javax.activation-api:$javaxActivationVersion"
@@ -910,6 +908,7 @@ task('makePDF', type: org.asciidoctor.gradle.AsciidoctorTask) {
 	dependsOn checkAsciidocLinks
 	backends 'pdf'
 	sourceDir "$buildDir/asciidoc"
+	inputs.dir(sourceDir)
 	sources {
 		include 'index-single.adoc'
 	}
@@ -926,6 +925,7 @@ asciidoctor {
 	dependsOn makePDF
 	backends 'html5'
 	sourceDir "$buildDir/asciidoc"
+	inputs.dir(sourceDir)
 	resources {
 		from(sourceDir) {
 			include 'images/*', 'css/**', 'js/**'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 1b16c34a71..a2bf1313b8 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.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew.bat b/gradlew.bat
index 24467a141f..9109989e3c 100755
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"