diff --git a/build.gradle b/build.gradle
index ced6342ef7..dafeaedce6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,6 @@ buildscript {
 		classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 		classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlinVersion"
 		classpath 'org.asciidoctor:asciidoctorj-pdf:1.5.0-beta.2'
-		classpath 'io.spring.nohttp:nohttp-gradle:0.0.3.RELEASE'
 	}
 }
 
@@ -15,7 +14,8 @@ plugins {
 	id 'org.sonarqube' version '2.7.1'
 	id 'org.asciidoctor.convert' version '1.6.1'
 	id 'org.ajoberstar.grgit' version '3.1.1'
-	id "io.spring.dependency-management" version "1.0.8.RELEASE" apply false
+	id 'io.spring.nohttp' version '0.0.3.RELEASE' apply false
+	id 'io.spring.dependency-management' version '1.0.8.RELEASE' apply false
 }
 
 if (System.getenv('TRAVIS') || System.getenv('bamboo_buildKey')) {
@@ -44,11 +44,11 @@ ext {
 
 	activeMqVersion = '5.15.10'
 	apacheSshdVersion = '2.3.0'
-	avroVersion = '1.9.0'
+	avroVersion = '1.9.1'
 	aspectjVersion = '1.9.4'
 	assertjVersion = '3.13.2'
-	assertkVersion = '0.19'
-	awaitilityVersion = '4.0.0'
+	assertkVersion = '0.20'
+	awaitilityVersion = '4.0.1'
 	boonVersion = '0.34'
 	commonsDbcp2Version = '2.6.0'
 	commonsIoVersion = '2.6'
@@ -60,10 +60,10 @@ ext {
 	groovyVersion = '2.5.8'
 	hamcrestVersion = '2.1'
 	hazelcastVersion = '3.12.2'
-	hibernateVersion = '5.4.4.Final'
+	hibernateVersion = '5.4.5.Final'
 	hsqldbVersion = '2.5.0'
 	h2Version = '1.4.199'
-	jackson2Version = '2.9.9.20190807'
+	jacksonVersion = '2.9.9.20190807'
 	javaxActivationVersion = '1.2.0'
 	javaxMailVersion = '1.6.2'
 	jmsApiVersion = '2.0.1'
@@ -74,7 +74,6 @@ ext {
 	jsonpathVersion = '2.4.0'
 	junit4Version = '4.12'
 	junitJupiterVersion = '5.5.2'
-	junitPlatformVersion = '1.5.2'
 	jythonVersion = '2.7.0'
 	kryoShadedVersion = '4.0.2'
 	lettuceVersion = '5.1.8.RELEASE'
@@ -84,18 +83,14 @@ ext {
 	mysqlVersion = '8.0.16'
 	pahoMqttClientVersion = '1.2.0'
 	postgresVersion = '42.2.6'
-	reactorNettyVersion = '0.9.0.RC1'
-	reactorVersion = '3.3.0.RC1'
-	resilience4jVersion = '0.17.0'
+	reactorVersion = 'Dysprosium-BUILD-SNAPSHOT'
+	resilience4jVersion = '1.0.0'
 	romeToolsVersion = '1.12.1'
 	rsocketVersion = '1.0.0-RC3'
 	servletApiVersion = '4.0.1'
 	smackVersion = '4.3.4'
 	springAmqpVersion = project.hasProperty('springAmqpVersion') ? project.springAmqpVersion : '2.2.0.BUILD-SNAPSHOT'
-	springDataJpaVersion = '2.2.0.BUILD-SNAPSHOT'
-	springDataMongoVersion = '2.2.0.BUILD-SNAPSHOT'
-	springDataRedisVersion = '2.2.0.BUILD-SNAPSHOT'
-	springGemfireVersion = '2.2.0.BUILD-SNAPSHOT'
+	springDataVersion = 'Moore-BUILD-SNAPSHOT'
 	springSecurityVersion = '5.2.0.BUILD-SNAPSHOT'
 	springRetryVersion = '1.2.4.RELEASE'
 	springVersion = project.hasProperty('springVersion') ? project.springVersion : '5.2.0.BUILD-SNAPSHOT'
@@ -127,6 +122,28 @@ allprojects {
 		'https://docs.spring.io/spring-ws/sites/2.0/apidocs/'
 	] as String[]
 
+	apply plugin: "io.spring.dependency-management"
+
+	dependencyManagement {
+		resolutionStrategy {
+			cacheChangingModulesFor 0, 'seconds'
+		}
+		applyMavenExclusions = false
+		generatedPomCustomization {
+			enabled = false
+		}
+
+		imports {
+			mavenBom "com.fasterxml.jackson:jackson-bom:$jacksonVersion"
+			mavenBom "org.junit:junit-bom:$junitJupiterVersion"
+			mavenBom "org.springframework:spring-framework-bom:$springVersion"
+			mavenBom "io.projectreactor:reactor-bom:$reactorVersion"
+			mavenBom "org.apache.logging.log4j:log4j-bom:$log4jVersion"
+			mavenBom "org.springframework.data:spring-data-releasetrain:$springDataVersion"
+		}
+
+	}
+
 }
 
 subprojects { subproject ->
@@ -139,17 +156,6 @@ subprojects { subproject ->
 	apply plugin: 'checkstyle'
 	apply plugin: 'kotlin'
 	apply plugin: 'kotlin-spring'
-	apply plugin: "io.spring.dependency-management"
-
-	dependencyManagement {
-		resolutionStrategy {
-			cacheChangingModulesFor 0, 'seconds'
-		}
-		applyMavenExclusions = false
-		generatedPomCustomization {
-			enabled = false
-		}
-	}
 
 	sourceSets {
 		test {
@@ -178,13 +184,13 @@ subprojects { subproject ->
 	}
 
 	jacoco {
-		toolVersion = "0.8.4"
+		toolVersion = '0.8.4'
 	}
 
 	// dependencies that are common across all java projects
 	dependencies {
 		if (!(subproject.name ==~ /.*-test.*/)) {
-			testCompile (project(":spring-integration-test-support")) {
+			testCompile (project(':spring-integration-test-support')) {
 				exclude group: 'org.hamcrest'
 			}
 		}
@@ -197,23 +203,23 @@ subprojects { subproject ->
 			exclude group: 'org.hamcrest'
 		}
 
-		testCompile "org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion"
-		testRuntime "org.junit.jupiter:junit-jupiter-engine:$junitJupiterVersion"
-		testRuntime "org.junit.platform:junit-platform-launcher:$junitPlatformVersion"
+		testCompile 'org.junit.jupiter:junit-jupiter-api'
+		testRuntime 'org.junit.jupiter:junit-jupiter-engine'
+		testRuntime 'org.junit.platform:junit-platform-launcher'
 
 		// To support JUnit 4 tests
-		testRuntime "org.junit.vintage:junit-vintage-engine:$junitJupiterVersion"
+		testRuntime 'org.junit.vintage:junit-vintage-engine'
 
 		// To avoid compiler warnings about @API annotations in JUnit code
 		testCompileOnly 'org.apiguardian:apiguardian-api:1.0.0'
 
-		testRuntime "org.apache.logging.log4j:log4j-slf4j-impl:$log4jVersion"
-		testRuntime "org.apache.logging.log4j:log4j-jcl:$log4jVersion"
+		testRuntime 'org.apache.logging.log4j:log4j-slf4j-impl'
+		testRuntime 'org.apache.logging.log4j:log4j-jcl'
 
 		testCompile "com.willowtreeapps.assertk:assertk-jvm:$assertkVersion"
 
-		testCompile "org.jetbrains.kotlin:kotlin-reflect"
-		testCompile "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
+		testCompile 'org.jetbrains.kotlin:kotlin-reflect'
+		testCompile 'org.jetbrains.kotlin:kotlin-stdlib-jdk8'
 
 	}
 
@@ -284,14 +290,14 @@ subprojects { subproject ->
 	}
 
 	test {
-		maxHeapSize = "1536m"
+		maxHeapSize = '1536m'
 		jacoco {
 			append = false
 			destinationFile = file("$buildDir/jacoco.exec")
 		}
 	}
 
-	task testAll(type: Test, dependsOn: [":checkAsciidocLinks",'check'])
+	task testAll(type: Test, dependsOn: [':checkAsciidocLinks','check'])
 
 	gradle.taskGraph.whenReady { graph ->
 		if (graph.hasTask(testAll)) {
@@ -325,7 +331,7 @@ subprojects { subproject ->
 
 	checkstyle {
 		configFile = file("$rootDir/src/checkstyle/checkstyle.xml")
-		toolVersion = "8.24"
+		toolVersion = '8.24'
 	}
 
 	artifacts {
@@ -347,10 +353,10 @@ subprojects { subproject ->
 		}
 
 		from("${rootProject.projectDir}/src/dist") {
-			include "license.txt"
-			include "notice.txt"
-			into "META-INF"
-			expand(copyright: new Date().format("yyyy"), version: project.version)
+			include 'license.txt'
+			include 'notice.txt'
+			into 'META-INF'
+			expand(copyright: new Date().format('yyyy'), version: project.version)
 		}
 	}
 
@@ -361,25 +367,25 @@ subprojects { subproject ->
 project('spring-integration-test-support') {
 	description = 'Spring Integration Test Support - **No SI Dependencies Allowed**'
 	dependencies {
+		compileOnly 'org.apiguardian:apiguardian-api:1.0.0'
 		compile "org.hamcrest:hamcrest-library:$hamcrestVersion"
 		compile ("junit:junit:$junit4Version") {
 			exclude group: 'org.hamcrest'
 		}
-		compile ("org.junit.jupiter:junit-jupiter-api:$junitJupiterVersion", optional)
-		compileOnly 'org.apiguardian:apiguardian-api:1.0.0'
 		compile "org.mockito:mockito-core:$mockitoVersion"
 		compile "org.assertj:assertj-core:$assertjVersion"
-		compile "org.springframework:spring-context:$springVersion"
-		compile "org.springframework:spring-messaging:$springVersion"
-		compile "org.springframework:spring-test:$springVersion"
-		compile ("org.apache.logging.log4j:log4j-core:$log4jVersion" , optional)
+		compile 'org.springframework:spring-context'
+		compile 'org.springframework:spring-messaging'
+		compile 'org.springframework:spring-test'
+		compile ('org.junit.jupiter:junit-jupiter-api', optional)
+		compile ('org.apache.logging.log4j:log4j-core', optional)
 	}
 }
 
 project('spring-integration-amqp') {
 	description = 'Spring Integration AMQP Support'
 	dependencies {
-		compile project(":spring-integration-core")
+		compile project(':spring-integration-core')
 		compile("org.springframework.amqp:spring-rabbit:$springAmqpVersion") {
 			exclude group: 'org.springframework'
 		}
@@ -387,30 +393,24 @@ project('spring-integration-amqp') {
 		testCompile("org.springframework.amqp:spring-rabbit-junit:$springAmqpVersion") {
 					exclude group: 'org.springframework'
 				}
-		testCompile project(":spring-integration-stream")
-		testCompile "org.springframework:spring-web:$springVersion"
+		testCompile project(':spring-integration-stream')
+		testCompile 'org.springframework:spring-web'
 	}
 }
 
 project('spring-integration-core') {
 	description = 'Spring Integration Core'
 
-	dependencyManagement {
-		imports {
-			mavenBom "com.fasterxml.jackson:jackson-bom:$jackson2Version"
-		}
-	}
-
 	dependencies {
-		compile "org.springframework:spring-core:$springVersion"
-		compile "org.springframework:spring-aop:$springVersion"
-		compile "org.springframework:spring-context:$springVersion"
-		compile "org.springframework:spring-messaging:$springVersion"
-		compile "org.springframework:spring-tx:$springVersion"
+		compile 'org.springframework:spring-core'
+		compile 'org.springframework:spring-aop'
+		compile 'org.springframework:spring-context'
+		compile 'org.springframework:spring-messaging'
+		compile 'org.springframework:spring-tx'
 		compile ("org.springframework.retry:spring-retry:$springRetryVersion") {
 			exclude group: 'org.springframework'
 		}
-		compile "io.projectreactor:reactor-core:$reactorVersion"
+		compile 'io.projectreactor:reactor-core'
 		compile('com.fasterxml.jackson.core:jackson-databind', optional)
 		compile("com.jayway.jsonpath:json-path:$jsonpathVersion", optional)
 		compile("io.fastjson:boon:$boonVersion", optional)
@@ -420,7 +420,7 @@ project('spring-integration-core') {
 		compile("org.apache.avro:avro:$avroVersion", optional)
 
 		testCompile ("org.aspectj:aspectjweaver:$aspectjVersion")
-		testCompile "io.projectreactor:reactor-test:$reactorVersion"
+		testCompile 'io.projectreactor:reactor-test'
 		testCompile ('com.fasterxml.jackson.datatype:jackson-datatype-jsr310')
 	}
 }
@@ -428,14 +428,14 @@ project('spring-integration-core') {
 project('spring-integration-event') {
 	description = 'Spring Integration ApplicationEvent Support'
 	dependencies {
-		compile project(":spring-integration-core")
+		compile project(':spring-integration-core')
 	}
 }
 
 project('spring-integration-feed') {
 	description = 'Spring Integration RSS Feed Support'
 	dependencies {
-		compile project(":spring-integration-core")
+		compile project(':spring-integration-core')
 		compile "com.rometools:rome:$romeToolsVersion"
 	}
 }
@@ -443,40 +443,40 @@ project('spring-integration-feed') {
 project('spring-integration-file') {
 	description = 'Spring Integration File Support'
 	dependencies {
-		compile project(":spring-integration-core")
+		compile project(':spring-integration-core')
 		compile "commons-io:commons-io:$commonsIoVersion"
 
-		testCompile project(":spring-integration-redis")
-		testCompile project(":spring-integration-redis").sourceSets.test.output
-		testCompile project(":spring-integration-gemfire")
-		testCompile project(":spring-integration-jdbc")
+		testCompile project(':spring-integration-redis')
+		testCompile project(':spring-integration-redis').sourceSets.test.output
+		testCompile project(':spring-integration-gemfire')
+		testCompile project(':spring-integration-jdbc')
 		testCompile "com.h2database:h2:$h2Version"
 		testCompile "io.lettuce:lettuce-core:$lettuceVersion"
-		testCompile "io.projectreactor:reactor-test:$reactorVersion"
+		testCompile 'io.projectreactor:reactor-test'
 	}
 }
 
 project('spring-integration-ftp') {
 	description = 'Spring Integration FTP Support'
 	dependencies {
-		compile project(":spring-integration-file")
+		compile project(':spring-integration-file')
 		compile "commons-net:commons-net:$commonsNetVersion"
-		compile "org.springframework:spring-context-support:$springVersion"
+		compile 'org.springframework:spring-context-support'
 		compile ("javax.activation:javax.activation-api:$javaxActivationVersion", optional)
 		compile ("org.apache.ftpserver:ftpserver-core:$ftpServerVersion", optional)
 
-		testCompile project(":spring-integration-file").sourceSets.test.output
+		testCompile project(':spring-integration-file').sourceSets.test.output
 	}
 }
 
 project('spring-integration-gemfire') {
 	description = 'Spring Integration GemFire Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile ("org.springframework.data:spring-data-geode:$springGemfireVersion")
+		compile project(':spring-integration-core')
+		compile ('org.springframework.data:spring-data-geode')
 		compile "commons-io:commons-io:$commonsIoVersion"
 
-		testCompile project(":spring-integration-stream")
+		testCompile project(':spring-integration-stream')
 
 	}
 }
@@ -484,12 +484,11 @@ project('spring-integration-gemfire') {
 project('spring-integration-groovy') {
 	description = 'Spring Integration Groovy Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile project(":spring-integration-scripting")
+		compile project(':spring-integration-scripting')
 		compile "org.codehaus.groovy:groovy:$groovyVersion"
-		compile "org.springframework:spring-context-support:$springVersion"
+		compile 'org.springframework:spring-context-support'
 
-		testCompile "org.springframework:spring-web:$springVersion"
+		testCompile 'org.springframework:spring-web'
 
 		testRuntime "org.codehaus.groovy:groovy-dateutil:$groovyVersion"
 	}
@@ -498,12 +497,12 @@ project('spring-integration-groovy') {
 project('spring-integration-http') {
 	description = 'Spring Integration HTTP Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile "org.springframework:spring-webmvc:$springVersion"
+		compile project(':spring-integration-core')
+		compile 'org.springframework:spring-webmvc'
 		compile ("javax.servlet:javax.servlet-api:$servletApiVersion", provided)
 		compile ("com.rometools:rome:$romeToolsVersion", optional)
 
-		testCompile project(":spring-integration-security")
+		testCompile project(':spring-integration-security')
 		testCompile "org.hamcrest:hamcrest-core:$hamcrestVersion"
 		testCompile ("org.springframework.security:spring-security-config:$springSecurityVersion") {
 			exclude group: 'org.springframework'
@@ -517,17 +516,17 @@ project('spring-integration-http') {
 project('spring-integration-ip') {
 	description = 'Spring Integration IP Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		testCompile project(":spring-integration-stream")
-		testCompile project(":spring-integration-event")
+		compile project(':spring-integration-core')
+		testCompile project(':spring-integration-stream')
+		testCompile project(':spring-integration-event')
 	}
 }
 
 project('spring-integration-jdbc') {
 	description = 'Spring Integration JDBC Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile "org.springframework:spring-jdbc:$springVersion"
+		compile project(':spring-integration-core')
+		compile 'org.springframework:spring-jdbc'
 
 		testCompile "com.h2database:h2:$h2Version"
 		testCompile "org.hsqldb:hsqldb:$hsqldbVersion"
@@ -536,26 +535,25 @@ project('spring-integration-jdbc') {
 		testCompile "org.postgresql:postgresql:$postgresVersion"
 		testCompile "mysql:mysql-connector-java:$mysqlVersion"
 		testCompile "org.apache.commons:commons-dbcp2:$commonsDbcp2Version"
-
 	}
 }
 
 project('spring-integration-jms') {
 	description = 'Spring Integration JMS Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile "org.springframework:spring-jms:$springVersion"
+		compile project(':spring-integration-core')
+		compile 'org.springframework:spring-jms'
 		compile ("javax.jms:javax.jms-api:$jmsApiVersion", provided)
 		testCompile("org.apache.activemq:activemq-broker:$activeMqVersion")
 
-		testCompile "org.springframework:spring-oxm:$springVersion"
+		testCompile 'org.springframework:spring-oxm'
 	}
 }
 
 project('spring-integration-jmx') {
 	description = 'Spring Integration JMX Support'
 	dependencies {
-		compile project(":spring-integration-core")
+		compile project(':spring-integration-core')
 
 		testCompile "org.aspectj:aspectjweaver:$aspectjVersion"
 		testCompile "com.hazelcast:hazelcast:$hazelcastVersion"
@@ -565,11 +563,11 @@ project('spring-integration-jmx') {
 project('spring-integration-jpa') {
 	description = 'Spring Integration JPA Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile "org.springframework:spring-orm:$springVersion"
+		compile project(':spring-integration-core')
+		compile 'org.springframework:spring-orm'
 		compile ("org.eclipse.persistence:javax.persistence:$jpaApiVersion", optional)
 
-		testCompile ("org.springframework.data:spring-data-jpa:$springDataJpaVersion") {
+		testCompile ('org.springframework.data:spring-data-jpa') {
 			exclude group: 'org.springframework'
 		}
 		testCompile "com.h2database:h2:$h2Version"
@@ -582,8 +580,8 @@ project('spring-integration-jpa') {
 project('spring-integration-mail') {
 	description = 'Spring Integration Mail Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile "org.springframework:spring-context-support:$springVersion"
+		compile project(':spring-integration-core')
+		compile 'org.springframework:spring-context-support'
 		compile("javax.mail:javax.mail-api:$javaxMailVersion", provided)
 		compile("com.sun.mail:imap:$javaxMailVersion", provided)
 		compile("com.sun.mail:javax.mail:$javaxMailVersion", provided);
@@ -594,8 +592,8 @@ project('spring-integration-mail') {
 project('spring-integration-mongodb') {
 	description = 'Spring Integration MongoDB Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile("org.springframework.data:spring-data-mongodb:$springDataMongoVersion") {
+		compile project(':spring-integration-core')
+		compile('org.springframework.data:spring-data-mongodb') {
 			exclude group: 'org.springframework'
 		}
 	}
@@ -604,18 +602,18 @@ project('spring-integration-mongodb') {
 project('spring-integration-mqtt') {
 	description = 'Spring Integration MQTT Support'
 	dependencies {
-		compile project(":spring-integration-core")
+		compile project(':spring-integration-core')
 		compile "org.eclipse.paho:org.eclipse.paho.client.mqttv3:$pahoMqttClientVersion"
 
-		testCompile project(":spring-integration-jmx")
+		testCompile project(':spring-integration-jmx')
 	}
 }
 
 project('spring-integration-redis') {
 	description = 'Spring Integration Redis Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile ("org.springframework.data:spring-data-redis:$springDataRedisVersion") {
+		compile project(':spring-integration-core')
+		compile ('org.springframework.data:spring-data-redis') {
 			exclude group: 'org.springframework'
 		}
 
@@ -626,24 +624,24 @@ project('spring-integration-redis') {
 project('spring-integration-rmi') {
 	description = 'Spring Integration RMI Support'
 	dependencies {
-		compile project(":spring-integration-core")
+		compile project(':spring-integration-core')
 	}
 }
 
 project('spring-integration-rsocket') {
 	description = 'Spring Integration RSocket Support'
 	dependencies {
-		compile project(":spring-integration-core")
+		compile project(':spring-integration-core')
 		compile("io.rsocket:rsocket-transport-netty:$rsocketVersion")
 
-		testCompile "io.projectreactor:reactor-test:$reactorVersion"
+		testCompile 'io.projectreactor:reactor-test'
 	}
 }
 
 project('spring-integration-scripting') {
 	description = 'Spring Integration Scripting Support'
 	dependencies {
-		compile project(":spring-integration-core")
+		compile project(':spring-integration-core')
 		compile ('org.jetbrains.kotlin:kotlin-script-util', optional)
 		compile ('org.jetbrains.kotlin:kotlin-compiler-embeddable', optional)
 
@@ -659,7 +657,7 @@ project('spring-integration-scripting') {
 project('spring-integration-security') {
 	description = 'Spring Integration Security Support'
 	dependencies {
-		compile project(":spring-integration-core")
+		compile project(':spring-integration-core')
 		compile("org.springframework.security:spring-security-core:$springSecurityVersion") {
 			exclude group: 'org.springframework'
 		}
@@ -673,29 +671,29 @@ project('spring-integration-security') {
 project('spring-integration-sftp') {
 	description = 'Spring Integration SFTP Support'
 	dependencies {
-		compile project(":spring-integration-file")
-		compile project(":spring-integration-stream")
+		compile project(':spring-integration-file')
+		compile project(':spring-integration-stream')
 		compile "com.jcraft:jsch:$jschVersion"
-		compile "org.springframework:spring-context-support:$springVersion"
+		compile 'org.springframework:spring-context-support'
 		compile ("javax.activation:javax.activation-api:$javaxActivationVersion", optional)
 		compile ("org.apache.sshd:sshd-sftp:$apacheSshdVersion", optional)
 
 		testCompile "org.apache.sshd:sshd-core:$apacheSshdVersion"
-		testCompile project(":spring-integration-event")
-		testCompile project(":spring-integration-file").sourceSets.test.output
+		testCompile project(':spring-integration-event')
+		testCompile project(':spring-integration-file').sourceSets.test.output
 	}
 }
 
 project('spring-integration-stomp') {
 	description = 'Spring Integration STOMP Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile ("org.springframework:spring-websocket:$springVersion", optional)
-		compile ("io.projectreactor.netty:reactor-netty:$reactorNettyVersion" , optional)
+		compile project(':spring-integration-core')
+		compile ('org.springframework:spring-websocket', optional)
+		compile ('io.projectreactor.netty:reactor-netty', optional)
 
-		testCompile project(":spring-integration-websocket")
-		testCompile project(":spring-integration-websocket").sourceSets.test.output
-		testCompile project(":spring-integration-event")
+		testCompile project(':spring-integration-websocket')
+		testCompile project(':spring-integration-websocket').sourceSets.test.output
+		testCompile project(':spring-integration-event')
 		testCompile "org.apache.activemq:activemq-stomp:$activeMqVersion"
 		testCompile "org.apache.tomcat.embed:tomcat-embed-websocket:$tomcatVersion"
 	}
@@ -704,54 +702,54 @@ project('spring-integration-stomp') {
 project('spring-integration-stream') {
 	description = 'Spring Integration Stream Support'
 	dependencies {
-		compile project(":spring-integration-core")
+		compile project(':spring-integration-core')
 	}
 }
 
 project('spring-integration-syslog') {
 	description = 'Spring Integration Syslog Support'
 	dependencies {
-		compile project(":spring-integration-ip")
+		compile project(':spring-integration-ip')
 	}
 }
 
 project('spring-integration-test') {
 	description = 'Spring Integration Testing Framework'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile project(":spring-integration-test-support")
+		compile project(':spring-integration-core')
+		compile project(':spring-integration-test-support')
 	}
 }
 
 project('spring-integration-webflux') {
 	description = 'Spring Integration HTTP Support'
 	dependencies {
-		compile (project(":spring-integration-http")) {
+		compile (project(':spring-integration-http')) {
 			exclude group: 'org.springframework', module: 'spring-webmvc'
 		}
-		compile "org.springframework:spring-webflux:$springVersion"
-		compile ("io.projectreactor.netty:reactor-netty:$reactorNettyVersion" , optional)
+		compile 'org.springframework:spring-webflux'
+		compile ('io.projectreactor.netty:reactor-netty', optional)
 
 		testCompile "org.hamcrest:hamcrest-core:$hamcrestVersion"
-		testCompile "org.springframework:spring-webmvc:$springVersion"
+		testCompile 'org.springframework:spring-webmvc'
 		testCompile ("org.springframework.security:spring-security-config:$springSecurityVersion") {
 			exclude group: 'org.springframework'
 		}
 		testCompile ("org.springframework.security:spring-security-test:$springSecurityVersion") {
 			exclude group: 'org.springframework'
 		}
-		testCompile "io.projectreactor:reactor-test:$reactorVersion"
+		testCompile 'io.projectreactor:reactor-test'
 	}
 }
 
 project('spring-integration-websocket') {
 	description = 'Spring Integration WebSockets Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile "org.springframework:spring-websocket:$springVersion"
-		compile ("org.springframework:spring-webmvc:$springVersion", optional)
+		compile project(':spring-integration-core')
+		compile 'org.springframework:spring-websocket'
+		compile ('org.springframework:spring-webmvc', optional)
 
-		testCompile project(":spring-integration-event")
+		testCompile project(':spring-integration-event')
 		testCompile "org.apache.tomcat.embed:tomcat-embed-websocket:$tomcatVersion"
 	}
 }
@@ -759,9 +757,9 @@ project('spring-integration-websocket') {
 project('spring-integration-ws') {
 	description = 'Spring Integration Web Services Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile "org.springframework:spring-oxm:$springVersion"
-		compile "org.springframework:spring-webmvc:$springVersion"
+		compile project(':spring-integration-core')
+		compile 'org.springframework:spring-oxm'
+		compile 'org.springframework:spring-webmvc'
 		compile ("org.springframework.ws:spring-ws-core:$springWsVersion")  {
 			exclude group: 'org.springframework'
 		}
@@ -770,7 +768,7 @@ project('spring-integration-ws') {
 		testCompile ("org.springframework.ws:spring-ws-support:$springWsVersion") {
 			exclude group: 'org.springframework'
 		}
-		testCompile ("org.springframework:spring-jms:$springVersion")
+		testCompile ('org.springframework:spring-jms')
 		testCompile "javax.jms:javax.jms-api:$jmsApiVersion"
 		testCompile "org.igniterealtime.smack:smack-tcp:$smackVersion"
 		testCompile "org.igniterealtime.smack:smack-java7:$smackVersion"
@@ -785,8 +783,8 @@ project('spring-integration-ws') {
 project('spring-integration-xml') {
 	description = 'Spring Integration XML Support'
 	dependencies {
-		compile project(":spring-integration-core")
-		compile "org.springframework:spring-oxm:$springVersion"
+		compile project(':spring-integration-core')
+		compile 'org.springframework:spring-oxm'
 		compile ("org.springframework.ws:spring-xml:$springWsVersion") {
 			exclude group: 'org.springframework'
 		}
@@ -800,12 +798,12 @@ project('spring-integration-xml') {
 project('spring-integration-xmpp') {
 	description = 'Spring Integration XMPP Support'
 	dependencies {
-		compile project(":spring-integration-core")
+		compile project(':spring-integration-core')
 		compile "org.igniterealtime.smack:smack-tcp:$smackVersion"
 		compile "org.igniterealtime.smack:smack-java7:$smackVersion"
 		compile "org.igniterealtime.smack:smack-extensions:$smackVersion"
 
-		testCompile project(":spring-integration-stream")
+		testCompile project(':spring-integration-stream')
 		testCompile "org.igniterealtime.smack:smack-experimental:$smackVersion"
 	}
 }
@@ -813,7 +811,7 @@ project('spring-integration-xmpp') {
 project('spring-integration-zookeeper') {
 	description = 'Spring Integration Zookeeper Support'
 	dependencies {
-		compile project(":spring-integration-core")
+		compile project(':spring-integration-core')
 		compile("org.apache.curator:curator-recipes:$curatorVersion")
 
 		testCompile "org.apache.curator:curator-test:$curatorVersion"
@@ -821,18 +819,18 @@ project('spring-integration-zookeeper') {
 }
 
 project("spring-integration-bom") {
-	description = "Spring Integration (Bill of Materials)"
+	description = 'Spring Integration (Bill of Materials)'
 
 	configurations.archives.artifacts.clear()
 	artifacts {
 		// work around GRADLE-2406 by attaching text artifact
-		archives(file("spring-integration-bom.txt"))
+		archives(file('spring-integration-bom.txt'))
 	}
 
 	install {
 		repositories.mavenInstaller {
 			pom.whenConfigured {
-				packaging = "pom"
+				packaging = 'pom'
 				withXml {
 					asNode().children().last() + {
 						delegate.dependencyManagement {
@@ -855,12 +853,6 @@ project("spring-integration-bom") {
 	}
 }
 
-apply plugin: "org.asciidoctor.convert"
-
-asciidoctorj {
-	version = '1.5.5'
-}
-
 configurations {
 	docs
 }
@@ -883,7 +875,7 @@ task checkAsciidocLinks {
 	inputs.dir("$buildDir/asciidoc")
 	doLast {
 		def errors = new ArrayList<>();
-		errors.add("*** Anchor reference errors found:")
+		errors.add('*** Anchor reference errors found:')
 		inputs.files.filter{ f -> f.path.endsWith('.adoc') }.each { file ->
 			def doc = file.text
 			def anchors = new HashSet<>()
@@ -975,13 +967,13 @@ reference.onlyIf { "$System.env.NO_REFERENCE_TASK" != 'true' || project.hasPrope
 
 sonarqube {
 	properties {
-		property "sonar.jacoco.reportPath", "${buildDir.name}/jacoco.exec"
-		property "sonar.links.homepage", linkHomepage
-		property "sonar.links.ci", linkCi
-		property "sonar.links.issue", linkIssue
-		property "sonar.links.scm", linkScmUrl
-		property "sonar.links.scm_dev", linkScmDevConnection
-		property "sonar.java.coveragePlugin", "jacoco"
+		property 'sonar.jacoco.reportPath', "${buildDir.name}/jacoco.exec"
+		property 'sonar.links.homepage', linkHomepage
+		property 'sonar.links.ci', linkCi
+		property 'sonar.links.issue', linkIssue
+		property 'sonar.links.scm', linkScmUrl
+		property 'sonar.links.scm_dev', linkScmDevConnection
+		property 'sonar.java.coveragePlugin', 'jacoco'
 	}
 }
 
@@ -993,12 +985,12 @@ task api(type: Javadoc) {
 	options.author = true
 	options.header = rootProject.description
 	options.overview = 'src/api/overview.html'
-	options.stylesheetFile = file("src/api/stylesheet.css")
+	options.stylesheetFile = file('src/api/stylesheet.css')
 	options.links(project.ext.javadocLinks)
 	source subprojects.collect { project ->
 		project.sourceSets.main.allJava
 	}
-	destinationDir = new File(buildDir, "api")
+	destinationDir = new File(buildDir, 'api')
 	classpath = files(subprojects.collect { project ->
 		project.sourceSets.main.compileClasspath
 	})
diff --git a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java
index a588877dd6..e9c4750b81 100644
--- a/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java
+++ b/spring-integration-rsocket/src/main/java/org/springframework/integration/rsocket/outbound/RSocketOutboundGateway.java
@@ -172,8 +172,8 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
 	 * Specify the expected response type for the RSocket response.
 	 * @param expectedResponseType The expected type.
 	 * @see #setExpectedResponseTypeExpression(Expression)
-	 * @see RSocketRequester.ResponseSpec#retrieveMono
-	 * @see RSocketRequester.ResponseSpec#retrieveFlux
+	 * @see RSocketRequester.RequestSpec#retrieveMono
+	 * @see RSocketRequester.RequestSpec#retrieveFlux
 	 */
 	public void setExpectedResponseType(Class<?> expectedResponseType) {
 		setExpectedResponseTypeExpression(new ValueExpression<>(expectedResponseType));
@@ -182,8 +182,8 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
 	/**
 	 * Specify the {@link Expression} to determine the type for the RSocket response.
 	 * @param expectedResponseTypeExpression The expected response type expression.
-	 * @see RSocketRequester.ResponseSpec#retrieveMono
-	 * @see RSocketRequester.ResponseSpec#retrieveFlux
+	 * @see RSocketRequester.RequestSpec#retrieveMono
+	 * @see RSocketRequester.RequestSpec#retrieveFlux
 	 */
 	public void setExpectedResponseTypeExpression(Expression expectedResponseTypeExpression) {
 		this.expectedResponseTypeExpression = expectedResponseTypeExpression;
@@ -225,7 +225,7 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
 
 		return requesterMono
 				.map((rSocketRequester) -> createRequestSpec(rSocketRequester, requestMessage))
-				.map((requestSpec) -> createResponseSpec(requestSpec, requestMessage))
+				.map((requestSpec) -> prepareRequestSpec(requestSpec, requestMessage))
 				.flatMap((responseSpec) -> performRequest(responseSpec, requestMessage));
 	}
 
@@ -248,21 +248,21 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
 		return requestSpec;
 	}
 
-	private RSocketRequester.ResponseSpec createResponseSpec(RSocketRequester.RequestSpec requestSpec,
+	private RSocketRequester.RequestSpec prepareRequestSpec(RSocketRequester.RequestSpec requestSpec,
 			Message<?> requestMessage) {
 
 		Object payload = requestMessage.getPayload();
 		if (payload instanceof Publisher<?> && this.publisherElementTypeExpression != null) {
 			Object publisherElementType = evaluateExpressionForType(requestMessage, this.publisherElementTypeExpression,
 					"publisherElementType");
-			return responseSpecForPublisher(requestSpec, (Publisher<?>) payload, publisherElementType);
+			return prepareRequestSpecForPublisher(requestSpec, (Publisher<?>) payload, publisherElementType);
 		}
 		else {
 			return requestSpec.data(payload);
 		}
 	}
 
-	private RSocketRequester.ResponseSpec responseSpecForPublisher(RSocketRequester.RequestSpec requestSpec,
+	private RSocketRequester.RequestSpec prepareRequestSpecForPublisher(RSocketRequester.RequestSpec requestSpec,
 			Publisher<?> payload, Object publisherElementType) {
 
 		if (publisherElementType instanceof Class<?>) {
@@ -273,7 +273,7 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
 		}
 	}
 
-	private Mono<?> performRequest(RSocketRequester.ResponseSpec responseSpec, Message<?> requestMessage) {
+	private Mono<?> performRequest(RSocketRequester.RequestSpec requestSpec, Message<?> requestMessage) {
 		Command command = this.commandExpression.getValue(this.evaluationContext, requestMessage, Command.class);
 		Assert.notNull(command,
 				() -> "The 'command' [" + this.commandExpression + "] must not evaluate to null");
@@ -286,20 +286,20 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
 
 		switch (command) {
 			case fireAndForget:
-				return responseSpec.send();
+				return requestSpec.send();
 			case requestResponse:
 				if (expectedResponseType instanceof Class<?>) {
-					return responseSpec.retrieveMono((Class<?>) expectedResponseType);
+					return requestSpec.retrieveMono((Class<?>) expectedResponseType);
 				}
 				else {
-					return responseSpec.retrieveMono((ParameterizedTypeReference<?>) expectedResponseType);
+					return requestSpec.retrieveMono((ParameterizedTypeReference<?>) expectedResponseType);
 				}
 			case requestStreamOrChannel:
 				if (expectedResponseType instanceof Class<?>) {
-					return Mono.just(responseSpec.retrieveFlux((Class<?>) expectedResponseType));
+					return Mono.just(requestSpec.retrieveFlux((Class<?>) expectedResponseType));
 				}
 				else {
-					return Mono.just(responseSpec.retrieveFlux((ParameterizedTypeReference<?>) expectedResponseType));
+					return Mono.just(requestSpec.retrieveFlux((ParameterizedTypeReference<?>) expectedResponseType));
 				}
 			default:
 				throw new UnsupportedOperationException("Unsupported command: " + command);
@@ -335,13 +335,13 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
 
 		/**
 		 * Perform {@link io.rsocket.RSocket#fireAndForget fireAndForget}.
-		 * @see RSocketRequester.ResponseSpec#send()
+		 * @see RSocketRequester.RequestSpec#send()
 		 */
 		fireAndForget,
 
 		/**
 		 * Perform {@link io.rsocket.RSocket#requestResponse requestResponse}.
-		 * @see RSocketRequester.ResponseSpec#retrieveMono
+		 * @see RSocketRequester.RequestSpec#retrieveMono
 		 */
 		requestResponse,
 
@@ -349,7 +349,7 @@ public class RSocketOutboundGateway extends AbstractReplyProducingMessageHandler
 		 * Perform {@link io.rsocket.RSocket#requestStream requestStream} or
 		 * {@link io.rsocket.RSocket#requestChannel requestChannel} depending on whether
 		 * the request input consists of a single or multiple payloads.
-		 * @see RSocketRequester.ResponseSpec#retrieveFlux
+		 * @see RSocketRequester.RequestSpec#retrieveFlux
 		 */
 		requestStreamOrChannel