diff --git a/build.gradle b/build.gradle
index d737aae..0535f76 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,7 +3,7 @@ plugins {
 	id 'eclipse'
 	id 'idea'
 	id 'jacoco'
-	id 'org.sonarqube' version '2.7.1'
+	id 'org.sonarqube' version '2.8'
 	id 'checkstyle'
 	id 'org.ajoberstar.grgit' version '3.1.1'
 	id "io.spring.dependency-management" version '1.0.8.RELEASE'
@@ -31,9 +31,9 @@ ext {
 	servletApiVersion = '4.0.1'
     localstackVersion = '0.1.22'
 	log4jVersion = '2.12.1'
-	springCloudAwsVersion = '2.2.0.BUILD-SNAPSHOT'
+	springCloudAwsVersion = '2.2.0.RC1'
 	springIntegrationVersion = '5.2.1.BUILD-SNAPSHOT'
-	kinesisClientVersion = '1.11.2'
+	kinesisClientVersion = '1.12.0'
 	kinesisProducerVersion = '0.13.1'
 
 	idPrefix = 'aws'
@@ -88,7 +88,7 @@ jacoco {
 
 checkstyle {
 	configFile = file("${rootDir}/src/checkstyle/checkstyle.xml")
-	toolVersion = '8.24'
+	toolVersion = '8.25'
 }
 
 dependencies {
@@ -211,12 +211,12 @@ task updateCopyrights {
 compileJava.dependsOn updateCopyrights
 
 task sourcesJar(type: Jar) {
-	classifier = 'sources'
+	archiveClassifier = 'sources'
 	from sourceSets.main.allJava
 }
 
 task javadocJar(type: Jar) {
-	classifier = 'javadoc'
+	archiveClassifier = 'javadoc'
 	from javadoc
 }
 
@@ -239,8 +239,8 @@ sonarqube {
 
 task schemaZip(type: Zip) {
 	group = 'Distribution'
-	classifier = 'schema'
-	description = "Builds -${classifier} archive containing all " +
+	archiveClassifier = 'schema'
+	description = "Builds -${archiveClassifier} archive containing all " +
 			"XSDs for deployment at static.springframework.org/schema."
 
 	def Properties schemas = new Properties();
@@ -264,8 +264,8 @@ task schemaZip(type: Zip) {
 
 task docsZip(type: Zip) {
 	group = 'Distribution'
-	classifier = 'docs'
-	description = "Builds -${classifier} archive containing the JavaDoc api " +
+	archiveClassifier = 'docs'
+	description = "Builds -${archiveClassifier} archive containing the JavaDoc api " +
 			"for deployment at static.springframework.org/spring-integration/docs."
 
 	from('.') {
@@ -280,8 +280,8 @@ task docsZip(type: Zip) {
 
 task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
 	group = 'Distribution'
-	classifier = 'dist'
-	description = "Builds -${classifier} archive, containing all jars and docs, " +
+	archiveClassifier = 'dist'
+	description = "Builds -${archiveClassifier} archive, containing all jars and docs, " +
 			"suitable for community download page."
 
 	ext.baseDir = "${project.name}-${project.version}";
@@ -297,7 +297,7 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
 		into "${baseDir}"
 	}
 
-	from(zipTree(schemaZip.archivePath)) {
+	from(zipTree(schemaZip.archiveFile)) {
 		into "${baseDir}/schema"
 	}
 
@@ -312,11 +312,11 @@ task distZip(type: Zip, dependsOn: [docsZip, schemaZip]) {
 // Not published by default; only for use when building from source.
 task depsZip(type: Zip, dependsOn: distZip) { zipTask ->
 	group = 'Distribution'
-	classifier = 'dist-with-deps'
-	description = "Builds -${classifier} archive, containing everything " +
-			"in the -${distZip.classifier} archive plus all dependencies."
+	archiveClassifier = 'dist-with-deps'
+	description = "Builds -${archiveClassifier} archive, containing everything " +
+			"in the -${distZip.archiveClassifier} archive plus all dependencies."
 
-	from zipTree(distZip.archivePath)
+	from zipTree(distZip.archiveFile)
 
 	gradle.taskGraph.whenReady { taskGraph ->
 		if (taskGraph.hasTask(":${zipTask.name}")) {