diff --git a/build.gradle b/build.gradle
index f1cbdacd..4c1184c0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -34,15 +34,6 @@ test {
 
 // Common dependencies
 dependencies {
-    // Logging
-    compile 'org.aspectj:aspectjweaver:1.7.4'
-    compile 'org.codehaus.jackson:jackson-core-asl:1.9.12'
-    compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.12'
-    compile "org.slf4j:slf4j-api:$slf4jVersion"
-    compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"
-    testRuntime "log4j:log4j:$log4jVersion"
-    testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion"
-
     // Spring Framework
     compile("org.springframework:spring-core:$springVersion") {
       exclude group: "commons-logging", module: "commons-logging"
@@ -57,26 +48,34 @@ dependencies {
       exclude group: "commons-logging", module: "commons-logging"
     }
 
-    // Spring Data
-    compile("org.springframework.data:spring-data-commons:${springDataCommonsVersion}") {
-      exclude group: "commons-logging", module: "commons-logging"
-    }
+	// Spring Data
+	compile("org.springframework.data:spring-data-commons:${springDataCommonsVersion}") {
+		exclude group: "commons-logging", module: "commons-logging"
+	}
 
-  // GemFire
-    compile("com.gemstone.gemfire:gemfire:$gemfireVersion")
-    runtime("antlr:antlr:2.7.7")
+	// GemFire
+	compile("com.gemstone.gemfire:gemfire:$gemfireVersion")
+	runtime("antlr:antlr:$antlrVersion")
+
+	compile "org.aspectj:aspectjweaver:$aspectjVersion"
+    compile "org.codehaus.jackson:jackson-core-asl:$jacksonVersion"
+    compile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
+    compile "org.slf4j:slf4j-api:$slf4jVersion"
+    compile "org.slf4j:jcl-over-slf4j:$slf4jVersion"
+    testRuntime "log4j:log4j:$log4jVersion"
+    testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion"
 
     // Testing
     testCompile("org.springframework:spring-test:$springVersion") {
       exclude group: "commons-logging", module: "commons-logging"
     }
     testCompile "junit:junit:$junitVersion"
-    testCompile "org.mockito:mockito-core:$mockitoVersion"
     testCompile "org.hamcrest:hamcrest-core:$hamcrestVersion"
     testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
+    testCompile "org.mockito:mockito-core:$mockitoVersion"
 
     testCompile "javax.annotation:jsr250-api:1.0", optional
-	  testCompile "org.apache.derby:derbyLocale_zh_TW:10.9.1.0"
+	testCompile "org.apache.derby:derbyLocale_zh_TW:10.9.1.0"
 }
 
 sourceCompatibility = 1.6
diff --git a/gradle.properties b/gradle.properties
index 6b0b8a9f..70dd4ba5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,14 @@
-slf4jVersion=1.7.6
-junitVersion=4.11
+antlrVersion=2.7.7
+aspectjVersion=1.7.4
+gemfire.range="[6.5, 8.0)"
 gemfireVersion=7.0.1
+hamcrestVersion=1.3
+jacksonVersion=1.9.12
+junitVersion=4.11
+log4jVersion=1.2.17
+mockitoVersion=1.9.5
+slf4jVersion=1.7.6
 spring.range="[3.2.0, 4.0.0)"
 springVersion=3.2.8.RELEASE
 springDataCommonsVersion=1.8.0.BUILD-SNAPSHOT
-log4jVersion=1.2.17
-hamcrestVersion=1.3
 version=1.4.0.BUILD-SNAPSHOT
-gemfire.range="[6.5, 8.0)"
-mockitoVersion=1.9.5
\ No newline at end of file