diff --git a/docs/build.gradle b/docs/build.gradle
index 3408de0a..14c51414 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -16,6 +16,10 @@ liveReload {
 	docRoot asciidoctor.sourceDir.canonicalPath
 }
 
+repositories {
+	maven { url 'http://dist.gemstone.com/maven/release' }
+}
+
 asciidoctorj {
 
 }
@@ -27,6 +31,7 @@ dependencies {
 				project(':spring-session-data-mongo'),
 				"org.springframework.data:spring-data-gemfire:$springDataGemFireVersion",
 				"org.springframework.data:spring-data-redis:$springDataRedisVersion",
+				"org.springframework.data:spring-data-gemfire:$springDataGemFireVersion",
 				"org.springframework:spring-websocket:${springVersion}",
 				"org.springframework:spring-messaging:${springVersion}",
 				"org.springframework:spring-jdbc:${springVersion}",
diff --git a/samples/httpsession-gemfire-clientserver-xml/build.gradle b/samples/httpsession-gemfire-clientserver-xml/build.gradle
index 9de908f9..96bdbf2d 100644
--- a/samples/httpsession-gemfire-clientserver-xml/build.gradle
+++ b/samples/httpsession-gemfire-clientserver-xml/build.gradle
@@ -9,7 +9,7 @@ sonarqube {
 }
 
 dependencies {
-	compile project(':spring-session-data-geode'),
+	compile project(':spring-session-data-gemfire'),
 		"org.springframework:spring-web:$springVersion",
 		"org.webjars:bootstrap:$bootstrapVersion",
 		"org.webjars:webjars-taglib:$webjarsTaglibVersion",
diff --git a/samples/httpsession-gemfire-clientserver/build.gradle b/samples/httpsession-gemfire-clientserver/build.gradle
index 29fa871f..673ffc7e 100644
--- a/samples/httpsession-gemfire-clientserver/build.gradle
+++ b/samples/httpsession-gemfire-clientserver/build.gradle
@@ -16,15 +16,15 @@ dependencies {
 
 	integrationTestCompile gebDependencies
 
-	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE",
-		"xml-apis:xml-apis:1.4.01"
+	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
 }
 
-mainClassName = "sample.ServerConfig"
 
 def port
 def process
 
+mainClassName = "sample.ServerConfig"
+
 task availablePort() << {
 	def serverSocket = new ServerSocket(0)
 	port = serverSocket.localPort
diff --git a/samples/httpsession-gemfire-clientserver/src/main/java/sample/ClassLocator.java b/samples/httpsession-gemfire-clientserver/src/main/java/sample/ClassLocator.java
deleted file mode 100644
index 3ced2f2a..00000000
--- a/samples/httpsession-gemfire-clientserver/src/main/java/sample/ClassLocator.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2014-2016 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package sample;
-
-/**
- * The ClassLocator class...
- *
- * @author John Blum
- * @since 1.0.0
- */
-public final class ClassLocator {
-
-	private ClassLocator() {
-	}
-
-	public static void main(final String[] args) throws ClassNotFoundException {
-		String className = "org.w3c.dom.ElementTraversal";
-		//String className = (args.length > 0 ? args[0] : "com.gemstone.gemfire.cache.Cache");
-		Class<?> type = Class.forName(className);
-		String resourceName = type.getName().replaceAll("\\.", "/").concat(".class");
-		System.out.printf("class [%1$s] with resource name [%2$s] is found in [%3$s]%n",
-			className, resourceName, type.getClassLoader().getResource(resourceName));
-	}
-}
diff --git a/samples/httpsession-gemfire-p2p/build.gradle b/samples/httpsession-gemfire-p2p/build.gradle
index d567b21d..e53487d0 100644
--- a/samples/httpsession-gemfire-p2p/build.gradle
+++ b/samples/httpsession-gemfire-p2p/build.gradle
@@ -3,7 +3,7 @@ apply from: TOMCAT_7_GRADLE
 apply from: SAMPLE_GRADLE
 
 dependencies {
-	compile project(':spring-session-data-geode'),
+	compile project(':spring-session-data-gemfire'),
 		"org.springframework:spring-web:$springVersion",
 		"org.webjars:bootstrap:$bootstrapVersion",
 		"org.webjars:webjars-taglib:$webjarsTaglibVersion",
diff --git a/settings.gradle b/settings.gradle
index 5cd65865..cd3e414f 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -27,7 +27,6 @@ include 'samples:grails3'
 
 include 'spring-session'
 include 'spring-session-data-gemfire'
-include 'spring-session-data-geode'
 include 'spring-session-data-mongo'
 include 'spring-session-data-redis'
 include 'spring-session-hazelcast'
diff --git a/spring-session-data-geode/build.gradle b/spring-session-data-geode/build.gradle
deleted file mode 100644
index d765d405..00000000
--- a/spring-session-data-geode/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-apply from: JAVA_GRADLE
-apply from: MAVEN_GRADLE
-apply plugin: 'spring-io'
-
-description = "Aggregator for Spring Session and Spring Data GemFire with Apache Geode support"
-
-dependencies {
-	compile project(':spring-session')
-	compile("org.springframework.data:spring-data-geode:$springDataGeodeVersion") {
-		exclude group: "org.slf4j", module: 'slf4j-api'
-		exclude group: "org.slf4j", module: 'jcl-over-slf4j'
-	}
-}
-
-dependencyManagement {
-	springIoTestRuntime {
-		imports {
-			mavenBom "io.spring.platform:platform-bom:${springIoVersion}"
-		}
-	}
-}
diff --git a/spring-session/build.gradle b/spring-session/build.gradle
index 25297615..726983eb 100644
--- a/spring-session/build.gradle
+++ b/spring-session/build.gradle
@@ -45,6 +45,7 @@ dependencies {
 			"org.springframework.security:spring-security-core:$springSecurityVersion"
 
 	jacoco "org.jacoco:org.jacoco.agent:0.7.2.201409121644:runtime"
+
 }
 
 dependencyManagement {