diff --git a/build.gradle b/build.gradle
index 06801e33..4cef17e2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,37 +42,43 @@ dependencies {
     
     // Spring Framework
     compile("org.springframework:spring-core:$springVersion") {
-        exclude module: "commons-logging"
+        exclude group: "commons-logging", module: "commons-logging"
+    }
+	  compile("org.springframework:spring-aop:$springVersion") {
+      exclude group: "commons-logging", module: "commons-logging"
+    }
+    compile("org.springframework:spring-context-support:$springVersion") {
+      exclude group: "commons-logging", module: "commons-logging"
+    }
+    compile("org.springframework:spring-tx:$springVersion") {
+      exclude group: "commons-logging", module: "commons-logging"
+    }
+
+    // Spring Data
+    compile("org.springframework.data:spring-data-commons:${springDataCommonsVersion}") {
+      exclude group: "commons-logging", module: "commons-logging"
     }
-    compile "org.springframework:spring-context-support:$springVersion"
-    compile "org.springframework:spring-tx:$springVersion"
-	compile "org.springframework:spring-aop:$springVersion"
-	compile 'org.aspectj:aspectjweaver:1.7.2'
-	compile 'org.aspectj:aspectjrt:1.7.2'
-	compile 'org.codehaus.jackson:jackson-core-asl:1.9.12'
-	compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.12'
 
     // GemFire
     compile("com.gemstone.gemfire:gemfire:$gemfireVersion")
     runtime("antlr:antlr:2.7.7")
-    runtime("commons-modeler:commons-modeler:2.0.1")
 
-   
-    
-    
+    compile 'org.aspectj:aspectjrt:1.7.2'
+    compile 'org.aspectj:aspectjweaver:1.7.2'
+	  compile 'org.codehaus.jackson:jackson-core-asl:1.9.12'
+	  compile 'org.codehaus.jackson:jackson-mapper-asl:1.9.12'
+
     // Testing
-    testCompile "org.mockito:mockito-core:$mockitoVersion"
-    testCompile "org.springframework:spring-test:$springVersion"
+    testCompile("org.springframework:spring-test:$springVersion") {
+      exclude group: "commons-logging", module: "commons-logging"
+    }
     testCompile "junit:junit-dep:$junitVersion"
+    testCompile "org.mockito:mockito-core:$mockitoVersion"
+    testCompile "cglib:cglib:${cglibVersion}"
     testCompile "org.hamcrest:hamcrest-core:$hamcrestVersion"
     testCompile "org.hamcrest:hamcrest-library:$hamcrestVersion"
     testCompile "javax.annotation:jsr250-api:1.0", optional
-
-    // Spring Data
-    compile "org.springframework.data:spring-data-commons:${springDataCommonsVersion}"
-	//
-	testCompile "cglib:cglib:${cglibVersion}"
-	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