diff --git a/build.gradle b/build.gradle
index 8f670ba5..19111ab8 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,14 +16,6 @@ configurations {
     sharedResources
 }
 
-description = 'Spring Data GemFire'
-group = 'org.springframework.data'
-
-repositories {
-  maven { url "https://repo.spring.io/libs-snapshot" }
-  maven { url "https://repo.spring.io/plugins-release"}
-}
-
 apply plugin: "java"
 apply plugin: 'eclipse'
 apply plugin: 'idea'
@@ -33,7 +25,24 @@ apply plugin: 'propdeps'
 apply plugin: 'docbook-reference'
 apply plugin: 'org.asciidoctor.gradle.asciidoctor'
 
-//project.bundlor.bundleSymbolicName = "${bundleSymbolicName}"
+description = 'Spring Data GemFire'
+group = 'org.springframework.data'
+
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
+sourceSets {
+    main {
+        output.resourcesDir = 'build/classes/main'
+        output.classesDir   = 'build/classes/main'
+    }
+    test {
+        output.resourcesDir = 'build/classes/test'
+        output.classesDir   = 'build/classes/test'
+    }
+}
+
+[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-serial"]
 
 if (project.hasProperty('platformVersion')) {
     apply plugin: 'spring-io'
@@ -51,19 +60,14 @@ if (project.hasProperty('platformVersion')) {
     }
 }
 
-sourceSets {
-    main {
-        output.resourcesDir = 'build/classes/main'
-        output.classesDir   = 'build/classes/main'
-    }
-    test {
-        output.resourcesDir = 'build/classes/test'
-        output.classesDir   = 'build/classes/test'
+if (JavaVersion.current().isJava8Compatible()) {
+    allprojects {
+        tasks.withType(Javadoc) {
+            options.addStringOption('Xdoclint:none', '-quiet')
+        }
     }
 }
 
-[compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-serial"]
-
 tasks.withType(Test).all {
     forkEvery = 1
     systemProperties['gemfire.disableShutdownHook'] = 'true'
@@ -71,7 +75,11 @@ tasks.withType(Test).all {
     systemProperties['org.springframework.data.gemfire.test.GemfireTestRunner.nomock'] = System.getProperty('org.springframework.data.gemfire.test.GemfireTestRunner.nomock')
 }
 
-// Common dependencies
+repositories {
+    maven { url "https://repo.spring.io/libs-snapshot" }
+    maven { url "https://repo.spring.io/plugins-release"}
+}
+
 dependencies {
     // Spring Framework
     compile("org.springframework:spring-context-support:$springVersion") {
@@ -102,10 +110,11 @@ dependencies {
         exclude group: "commons-logging", module: "commons-logging"
     }
     testCompile "org.assertj:assertj-core:$assertjVersion"
-    testCompile "junit:junit:$junitVersion"
     testCompile "org.hamcrest:hamcrest-core:$hamcrestVersion"
     testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
+    testCompile "org.projectlombok:lombok:$lombokVersion"
     testCompile "org.mockito:mockito-core:$mockitoVersion"
+    testCompile "junit:junit:$junitVersion"
     testCompile "edu.umd.cs.mtc:multithreadedtc:$multiThreadedtcVersion"
     testCompile "org.apache.openwebbeans.test:cditest-owb:$openwebbeansVersion"
 
@@ -120,51 +129,11 @@ dependencies {
     sharedResources "org.springframework.data.build:spring-data-build-resources:$springDataBuildVersion@zip"
 }
 
-sourceCompatibility = 1.6
-targetCompatibility = 1.6
-
-if (JavaVersion.current().isJava8Compatible()) {
-    allprojects {
-      tasks.withType(Javadoc) {
-        options.addStringOption('Xdoclint:none', '-quiet')
-      }
-    }
-  }
-
-javadoc {
-  dependsOn = [ 'extractSharedResources' ]
-
-  ext.srcDir = file("${projectDir}/docs/src/api")
-  destinationDir = file("${buildDir}/api")
-  ext.tmpDir = file("${buildDir}/api-work")
-
-  configure(options) {
-      stylesheetFile = file("$buildDir/shared-resources/javadoc/spring-javadoc.css")
-      docFilesSubDirs = true
-      outputLevel = org.gradle.external.javadoc.JavadocOutputLevel.QUIET
-      breakIterator = true
-      showFromProtected()
-      groups = [
-        'Spring GemFire' : ['org.springframework.data.gemfire*'],
-      ]
-
-     links = [
-        "http://static.springframework.org/spring/docs/3.1.x/javadoc-api",
-        "http://download.oracle.com/javase/6/docs/api",
-        "http://www.gemstone.com/docs/6.5.1/product/docs/japi/",
-        "http://asm.objectweb.org/asm223/javadoc/user",
-        "http://logging.apache.org/log4j/docs/api/",
-        "http://atinject.googlecode.com/svn/trunk/javadoc/"
-     ]
-
-     exclude "org/springframework/data/gemfire/config/**"
-  }
-
-  title = "${rootProject.description} ${version} API"
+bundlor {
+    manifestTemplate = file("template.mf").text
 }
 
 jar {
-
     dependsOn = [ 'bundlor' ]
 
     manifest.attributes['Implementation-Title'] = 'spring-data-gemfire'
@@ -178,20 +147,44 @@ jar {
     }
 }
 
-bundlor {
-    manifestTemplate = file("template.mf").text
+task extractSharedResources(type: Copy) {
+    from { // use of closure defers evaluation until execution time
+        configurations.sharedResources.collect { zipTree(it) }
+    }
+
+    into "$buildDir/shared-resources"
 }
 
-// Reference documentation
+javadoc {
+    dependsOn = [ 'extractSharedResources' ]
 
-reference {
-    // Avoid copy with expansions
-    expandPlaceholders = '';
-}
+    ext.srcDir = file("${projectDir}/docs/src/api")
+    destinationDir = file("${buildDir}/api")
+    ext.tmpDir = file("${buildDir}/api-work")
 
-referencePdf {
-    dependsOn = [ 'asciidoctor' ]
-    sourceDir = asciidoctor.outputDir
+    configure(options) {
+        stylesheetFile = file("$buildDir/shared-resources/javadoc/spring-javadoc.css")
+        docFilesSubDirs = true
+        outputLevel = org.gradle.external.javadoc.JavadocOutputLevel.QUIET
+        breakIterator = true
+        showFromProtected()
+        groups = [
+            'Spring GemFire' : ['org.springframework.data.gemfire*'],
+        ]
+
+        links = [
+            "http://static.springframework.org/spring/docs/3.1.x/javadoc-api",
+            "http://download.oracle.com/javase/6/docs/api",
+            "http://www.gemstone.com/docs/6.5.1/product/docs/japi/",
+            "http://asm.objectweb.org/asm223/javadoc/user",
+            "http://logging.apache.org/log4j/docs/api/",
+            "http://atinject.googlecode.com/svn/trunk/javadoc/"
+        ]
+
+        exclude "org/springframework/data/gemfire/config/**"
+    }
+
+    title = "${rootProject.description} ${version} API"
 }
 
 asciidoctor {
@@ -217,6 +210,15 @@ asciidoctor {
     ]
 }
 
+reference {
+    expandPlaceholders = ''; // avoid copy with expansions
+}
+
+referencePdf {
+    dependsOn = [ 'asciidoctor' ]
+    sourceDir = asciidoctor.outputDir
+}
+
 task sourcesJar(type: Jar, dependsOn:classes) {
     classifier = 'sources'
     from sourceSets.main.allJava
@@ -320,7 +322,6 @@ task distZip(type: Zip, dependsOn: [jar, docsZip, schemaZip, sourcesJar, javadoc
 artifacts {
     archives sourcesJar
     archives javadocJar
-
     archives docsZip
     archives schemaZip
     archives distZip
@@ -342,14 +343,5 @@ task wrapper(type: Wrapper) {
   }
 }
 
-task extractSharedResources(type: Copy) {
-
-    from { // use of closure defers evaluation until execution time
-        configurations.sharedResources.collect { zipTree(it) }
-    }
-
-    into "$buildDir/shared-resources"
-}
-
 assemble.dependsOn = ['jar', 'sourcesJar']
 defaultTasks 'build'
diff --git a/gradle.properties b/gradle.properties
index 477f6663..ac8a03e9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,19 +1,20 @@
 antlrVersion=2.7.7
-aspectjVersion=1.8.5
+aspectjVersion=1.8.9
 assertjVersion=3.5.2
 cdiVersion=1.0
 gemfireVersion=8.2.0
 hamcrestVersion=1.3
-jacksonVersion=2.6.0
+jacksonVersion=2.6.7
 junitVersion=4.12
 log4jVersion=1.2.17
+lombokVersion=1.16.10
 mockitoVersion=1.10.19
 multiThreadedtcVersion=1.01
 openwebbeansVersion=1.2.8
 servletApiVersion=2.5
-slf4jVersion=1.7.12
+slf4jVersion=1.7.21
 spring.range="[4.0.0, 5.0.0)"
-springVersion=4.2.6.RELEASE
-springDataBuildVersion=1.8.3.BUILD-SNAPSHOT
-springDataCommonsVersion=1.12.3.BUILD-SNAPSHOT
-version=1.8.3.BUILD-SNAPSHOT
+springVersion=4.2.8.RELEASE
+springDataBuildVersion=1.8.4.RELEASE
+springDataCommonsVersion=1.12.4.RELEASE
+version=1.8.4.RELEASE-PATCH01
diff --git a/pom.xml b/pom.xml
index 27d5eaaa..f6e10b22 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,18 +3,18 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
-	<groupId>org.springframework.data</groupId>
-	<artifactId>spring-data-gemfire</artifactId>
-	<version>1.8.4.RELEASE</version>
-
-	<name>Spring Data Gemfire</name>
-
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
 		<version>1.8.4.RELEASE</version>
 	</parent>
 
+	<groupId>org.springframework.data</groupId>
+	<artifactId>spring-data-gemfire</artifactId>
+	<version>1.8.4.RELEASE-PATCH01</version>
+
+	<name>Spring Data Gemfire</name>
+
 	<properties>
 		<dist.key>SGF</dist.key>
 		<antlr.version>2.7.7</antlr.version>