From 80444209509e8d8926bc3ab3dd15fba9c024a96a Mon Sep 17 00:00:00 2001
From: John Blum <jblum@pivotal.io>
Date: Thu, 11 Feb 2016 12:56:49 -0800
Subject: [PATCH] SGF-471 - Perform pre-release cleanup.

---
 .gitignore        |  1 -
 build.gradle      | 39 ++++++++++-----------------------------
 gradle.properties |  2 +-
 3 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/.gitignore b/.gitignore
index aea1156e..c960a80b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,6 @@ build
 out
 .gradle
 .springBeans
-pom.xml
 *.iml
 *.ipr
 *.iws
diff --git a/build.gradle b/build.gradle
index 424cb6f3..efab809e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -54,15 +54,6 @@ if (project.hasProperty('platformVersion')) {
 
 [compileJava, compileTestJava]*.options*.compilerArgs = ["-Xlint:-serial"]
 
-tasks.withType(Test).all {
-    forkEvery = 1
-    systemProperties['gemfire.disableShutdownHook'] = 'true'
-	systemProperties['javax.net.ssl.keyStore'] = System.getProperty('user.dir') + '/src/test/resources/trusted.keystore'
-    systemProperties['org.springframework.data.gemfire.test.GemfireTestRunner.nomock'] = System.getProperty('org.springframework.data.gemfire.test.GemfireTestRunner.nomock')
-	systemProperties['product.name'] = 'Apache Geode'
-	systemProperties['spring.profiles.active'] = 'apache-geode'
-}
-
 // Common dependencies
 dependencies {
     // Spring Framework
@@ -88,6 +79,7 @@ dependencies {
 		exclude group: "org.springframework", module: "spring-beans"
 		exclude group: "org.springframework", module: "spring-context"
 		exclude group: "org.springframework", module: "spring-context-support"
+		exclude group: "org.springframework", module: "spring-core"
 		exclude group: "org.springframework", module: "spring-expression"
 		exclude group: "org.springframework", module: "spring-tx"
 		exclude group: "org.springframework", module: "spring-web"
@@ -95,26 +87,6 @@ dependencies {
 		exclude group: "org.springframework.data", module: "spring-data-commons"
 		exclude group: "org.springframework.shell", module: "spring-shell"
 	}
-	compile("org.apache.geode:gemfire-joptsimple:$gemfireVersion") {
-		exclude group: "org.springframework", module: "spring-aop"
-		exclude group: "org.springframework", module: "spring-beans"
-		exclude group: "org.springframework", module: "spring-context"
-		exclude group: "org.springframework", module: "spring-context-support"
-		exclude group: "org.springframework", module: "spring-expression"
-		exclude group: "org.springframework", module: "spring-tx"
-		exclude group: "org.springframework", module: "spring-web"
-		exclude group: "org.springframework", module: "spring-webmvc"
-	}
-	compile("org.apache.geode:gemfire-json:$gemfireVersion") {
-		exclude group: "org.springframework", module: "spring-aop"
-		exclude group: "org.springframework", module: "spring-beans"
-		exclude group: "org.springframework", module: "spring-context"
-		exclude group: "org.springframework", module: "spring-context-support"
-		exclude group: "org.springframework", module: "spring-expression"
-		exclude group: "org.springframework", module: "spring-tx"
-		exclude group: "org.springframework", module: "spring-web"
-		exclude group: "org.springframework", module: "spring-webmvc"
-	}
 	optional("com.google.code.findbugs:annotations:2.0.2")
 	runtime("antlr:antlr:$antlrVersion")
 
@@ -151,6 +123,15 @@ if (JavaVersion.current().isJava8Compatible()) {
     }
   }
 
+tasks.withType(Test).all {
+    forkEvery = 1
+    systemProperties['gemfire.disableShutdownHook'] = 'true'
+    systemProperties['javax.net.ssl.keyStore'] = System.getProperty('user.dir') + '/src/test/resources/trusted.keystore'
+    systemProperties['org.springframework.data.gemfire.test.GemfireTestRunner.nomock'] = System.getProperty('org.springframework.data.gemfire.test.GemfireTestRunner.nomock')
+    systemProperties['product.name'] = 'Apache Geode'
+    systemProperties['spring.profiles.active'] = 'apache-geode'
+}
+
 javadoc {
   dependsOn = [ 'extractSharedResources' ]
 
diff --git a/gradle.properties b/gradle.properties
index 08a93d52..94c48217 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ antlrVersion=2.7.7
 aspectjVersion=1.8.5
 gemfireVersion=1.0.0-incubating-SNAPSHOT
 hamcrestVersion=1.3
-jacksonVersion=2.5.1
+jacksonVersion=2.6.0
 junitVersion=4.12
 log4jVersion=1.2.17
 mockitoVersion=1.10.19