diff --git a/build.gradle b/build.gradle
index 575ed060..e6e07093 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 	}
 	dependencies {
 		classpath 'io.spring.gradle:dependency-management-plugin:0.6.1.RELEASE'
-		classpath 'io.spring.gradle:spring-io-plugin:0.0.5.RELEASE'
+		classpath 'io.spring.gradle:spring-io-plugin:0.0.6.RELEASE'
 		classpath 'io.spring.gradle:docbook-reference-plugin:0.3.1'
 		classpath 'org.asciidoctor:asciidoctor-gradle-plugin:1.5.0'
 	}
@@ -76,17 +76,17 @@ subprojects { subproject ->
 	}
 
 	ext {
-		assertjVersion = '2.5.0'
+		assertjVersion = '2.6.0'
 		hamcrestVersion = '1.3'
 		jacksonVersion = '2.6.7'
 		junitVersion = '4.12'
-		kafkaVersion = '0.10.1.0'
+		kafkaVersion = '0.10.1.1'
 		log4jVersion = '1.2.17'
 		mockitoVersion = '1.10.19'
 		scalaVersion = '2.11'
 		slf4jVersion = '1.7.21'
 		springRetryVersion = '1.1.3.RELEASE'
-		springVersion = '4.3.4.RELEASE'
+		springVersion = '4.3.5.RELEASE'
 
 		idPrefix = 'kafka'
 
@@ -95,7 +95,7 @@ subprojects { subproject ->
 	eclipse.project.natures += 'org.springframework.ide.eclipse.core.springnature'
 
 	jacoco {
-		toolVersion = '0.7.7.201606060606'
+		toolVersion = '0.7.8'
 	}
 
 	// enable all compiler warnings; individual projects may customize further
@@ -159,8 +159,6 @@ project ('spring-kafka') {
 		testCompile "org.assertj:assertj-core:$assertjVersion"
 		testCompile "org.springframework:spring-tx:$springVersion"
 
-		testCompile "org.springframework.integration:spring-integration-test:4.3.1.RELEASE"
-
 		testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion"
 	}
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index d6e2637a..c89470b3 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 02d46192..622d6e12 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Fri Nov 18 13:13:14 EST 2016
+#Wed Jan 04 10:29:38 EST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
diff --git a/gradlew b/gradlew
index 4ef3a871..4453ccea 100755
--- a/gradlew
+++ b/gradlew
@@ -155,13 +155,14 @@ if $cygwin ; then
 fi
 
 # Escape application args
-for s in "${@}" ; do
-    s=\"$s\"
-    APP_ARGS=$APP_ARGS" "$s
-done
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- "$DEFAULT_JVM_OPTS" "$JAVA_OPTS" "$GRADLE_OPTS" "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
 if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
diff --git a/spring-kafka/src/test/java/adapter/MessagingMessageListenerAdapterTests.java b/spring-kafka/src/test/java/org/springframework/kafka/adapter/MessagingMessageListenerAdapterTests.java
similarity index 98%
rename from spring-kafka/src/test/java/adapter/MessagingMessageListenerAdapterTests.java
rename to spring-kafka/src/test/java/org/springframework/kafka/adapter/MessagingMessageListenerAdapterTests.java
index f4f10e05..9712dcd9 100644
--- a/spring-kafka/src/test/java/adapter/MessagingMessageListenerAdapterTests.java
+++ b/spring-kafka/src/test/java/org/springframework/kafka/adapter/MessagingMessageListenerAdapterTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package adapter;
+package org.springframework.kafka.adapter;
 
 import static org.mockito.BDDMockito.willReturn;
 import static org.mockito.Mockito.mock;