diff --git a/build.gradle b/build.gradle
index e54095e5..bf4762ef 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,3 @@
-import java.util.stream.Collectors
-
 buildscript {
     repositories {
         maven { url 'https://repo.spring.io/plugins-release' }
@@ -12,15 +10,9 @@ buildscript {
         classpath 'org.asciidoctor:asciidoctorj:1.5.0'
         classpath 'org.springframework.build.gradle:bundlor-plugin:0.1.3'
         classpath 'org.springframework.build.gradle:propdeps-plugin:0.0.6'
-        classpath 'io.spring.gradle:docbook-reference-plugin:0.3.0'
-        classpath 'io.spring.gradle:spring-io-plugin:0.0.4.RELEASE'
     }
 }
 
-configurations {
-    sharedResources
-}
-
 apply plugin: "java"
 apply plugin: 'eclipse'
 apply plugin: 'idea'
@@ -37,6 +29,10 @@ archivesBaseName = project.name
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
+configurations {
+    sharedResources
+}
+
 sourceSets {
     main {
         output.classesDir   = 'build/classes/main'
@@ -96,6 +92,9 @@ repositories {
 }
 
 dependencies {
+    // Core/Enterprise Java dependencies
+    optional "javax.enterprise:cdi-api:$cdiVersion"
+
     // Spring Framework
     compile("org.springframework:spring-context-support:$springVersion") {
         exclude group: "commons-logging", module: "commons-logging"
@@ -117,13 +116,12 @@ dependencies {
     }
     compile("org.apache.geode:geode-cq:$gemfireVersion")
     compile("org.apache.geode:geode-wan:$gemfireVersion")
+    optional "org.apache.shiro:shiro-spring:$shiroVersion"
     optional("com.google.code.findbugs:annotations:$googleCodeFindbugsVersion")
     runtime("antlr:antlr:$antlrVersion")
 
-    // Java & 3rd Party Dependencies
-    optional "javax.enterprise:cdi-api:$cdiVersion"
+    // 3rd Party Dependencies
     compile "org.aspectj:aspectjweaver:$aspectjVersion"
-    optional "org.apache.shiro:shiro-spring:$shiroVersion"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion"
     compile "com.fasterxml.jackson.core:jackson-databind:$jacksonVersion"
 
@@ -141,13 +139,9 @@ dependencies {
     testCompile "junit:junit:$junitVersion"
     testCompile "edu.umd.cs.mtc:multithreadedtc:$multiThreadedtcVersion"
 
-    testCompile "javax.annotation:jsr250-api:1.0", optional
-
     testRuntime "javax.el:el-api:$cdiVersion"
     testRuntime "javax.servlet:servlet-api:$servletApiVersion"
-    testRuntime "log4j:log4j:$log4jVersion"
     testRuntime "org.apache.derby:derbyLocale_zh_TW:10.9.1.0"
-    testRuntime "org.slf4j:slf4j-log4j12:$slf4jVersion"
     testRuntime ("org.springframework.shell:spring-shell:$springShellVersion") {
         exclude group: "com.google.guava", module: "guava"
     }
diff --git a/gradle.properties b/gradle.properties
index 1dae6cd0..83e75438 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -7,7 +7,6 @@ googleCodeFindbugsVersion=2.0.2
 hamcrestVersion=1.3
 jacksonVersion=2.7.6
 junitVersion=4.12
-log4jVersion=1.2.17
 lombokVersion=1.16.10
 mockitoVersion=1.10.19
 multiThreadedtcVersion=1.01
diff --git a/pom.xml b/pom.xml
index b6e7355b..aac569c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,6 +52,14 @@
 
 	<dependencies>
 
+		<dependency>
+			<groupId>javax.enterprise</groupId>
+			<artifactId>cdi-api</artifactId>
+			<version>${cdi}</version>
+			<scope>provided</scope>
+			<optional>true</optional>
+		</dependency>
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-context-support</artifactId>
@@ -68,14 +76,6 @@
 			<version>${springdata.commons}</version>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.enterprise</groupId>
-			<artifactId>cdi-api</artifactId>
-			<version>${cdi}</version>
-			<scope>provided</scope>
-			<optional>true</optional>
-		</dependency>
-
 		<dependency>
 			<groupId>org.apache.geode</groupId>
 			<artifactId>geode-core</artifactId>
@@ -113,25 +113,6 @@
 			<scope>runtime</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>com.google.code.findbugs</groupId>
-			<artifactId>annotations</artifactId>
-			<version>${google-code-findbugs.version}</version>
-			<optional>true</optional>
-		</dependency>
-
-		<dependency>
-			<groupId>org.aspectj</groupId>
-			<artifactId>aspectjweaver</artifactId>
-			<version>${aspectj}</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.apache.shiro</groupId>
-			<artifactId>shiro-spring</artifactId>
-			<version>${apache-shiro.version}</version>
-		</dependency>
-
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-annotations</artifactId>
@@ -144,6 +125,25 @@
 			<version>${jackson}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>annotations</artifactId>
+			<version>${google-code-findbugs.version}</version>
+			<optional>true</optional>
+		</dependency>
+
+		<dependency>
+			<groupId>org.apache.shiro</groupId>
+			<artifactId>shiro-spring</artifactId>
+			<version>${apache-shiro.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.aspectj</groupId>
+			<artifactId>aspectjweaver</artifactId>
+			<version>${aspectj}</version>
+		</dependency>
+
 		<!-- Logging -->
 		<!-- Slf4j JCL bridge redeclared to be available in compile scope -->
 		<!-- TODO Remove -->
@@ -161,6 +161,7 @@
 			<version>${cdi}</version>
 			<scope>test</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>