diff --git a/build.gradle b/build.gradle
index 9582c9ff64..572396d417 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,19 +25,21 @@ import org.springframework.build.Version
 // @author Mark Fisher
 // -----------------------------------------------------------------------------
 
-
 // -----------------------------------------------------------------------------
 // Configuration for the root project
 // -----------------------------------------------------------------------------
-def buildSrcDir = "$rootDir/buildSrc"
-
-apply from: "$buildSrcDir/wrapper.gradle"
-apply plugin: 'idea'
-
 // used for artifact names, building doc upload urls, etc.
 description = 'Spring Integration'
 abbreviation = 'INT'
 
+apply plugin: 'base'
+apply plugin: 'idea'
+
+def buildSrcDir = "$rootDir/buildSrc"
+apply from: "$buildSrcDir/wrapper.gradle"
+apply from: "$buildSrcDir/maven-root-pom.gradle"
+
+
 
 // -----------------------------------------------------------------------------
 // Configuration for all projects including this one (the root project)
@@ -75,11 +77,11 @@ allprojects {
 //
 // @see configure(*) sections below
 // -----------------------------------------------------------------------------
-
 javaprojects = subprojects.findAll { project ->
     project.path.startsWith(':spring-integration-')
 }
 
+
 // -----------------------------------------------------------------------------
 // Configuration for all java subprojects
 // -----------------------------------------------------------------------------
@@ -415,20 +417,12 @@ project('spring-integration-xmpp') {
     }
 }
 
+// -----------------------------------------------------------------------------
+// Configuration for the docs subproject
+// -----------------------------------------------------------------------------
 project('docs') {
     apply from: "$buildSrcDir/docs.gradle"
 }
 
-// add basic tasks like 'clean' and 'assemble' to the root project. e.g.: allows
-// running `gradle clean` from the root project and deleting the build directory
-apply plugin: 'base'
-
-// add tasks like 'distArchive'
 apply from: "$buildSrcDir/dist.gradle"
-
-// add tasks like 'snapshotDependencyCheck'
 apply from: "$buildSrcDir/checks.gradle"
-
-// add 'generatePom' task to generate root pom with <modules> section
-apply from: "$buildSrcDir/maven-root-pom.gradle"
-
diff --git a/buildSrc b/buildSrc
index 86070e09b5..7b64fc1098 160000
--- a/buildSrc
+++ b/buildSrc
@@ -1 +1 @@
-Subproject commit 86070e09b55613c3a97e462e25df7a5a5c572f74
+Subproject commit 7b64fc109828edf1b3d08c9bef07fc00a984c3dc
diff --git a/docs/src/reference/docbook/.index.xml.swo b/docs/src/reference/docbook/.index.xml.swo
deleted file mode 100644
index 782ad922c7..0000000000
Binary files a/docs/src/reference/docbook/.index.xml.swo and /dev/null differ
diff --git a/spring-integration-jdbc/build.gradle b/spring-integration-jdbc/build.gradle
index 92540e21a2..9bbfcaa323 100644
--- a/spring-integration-jdbc/build.gradle
+++ b/spring-integration-jdbc/build.gradle
@@ -1,3 +1,5 @@
+//apply plugin: 'java'
+
 /**
  * Generate schema creation and drop scripts for various databases
  * supported by the Spring Integration JDBC adapter.