diff --git a/docs/build.gradle b/docs/build.gradle
index 7aea8d26..b40d9acb 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -16,10 +16,6 @@ liveReload {
 	docRoot asciidoctor.sourceDir.canonicalPath
 }
 
-repositories {
-	maven { url 'http://dist.gemstone.com/maven/release' }
-}
-
 asciidoctorj {
 
 }
@@ -31,7 +27,6 @@ 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/gradle.properties b/gradle.properties
index 0312c269..15da49e7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -21,6 +21,7 @@ h2Version=1.4.191
 springDataMongoVersion=1.9.1.RELEASE
 springShellVersion=1.1.0.RELEASE
 springDataGemFireVersion=1.8.1.RELEASE
+springDataGeodeVersion=1.0.0.APACHE-GEODE-INCUBATING-M2
 assertjVersion=2.3.0
 spockVersion=1.0-groovy-2.4
 jstlVersion=1.2.1
diff --git a/samples/httpsession-gemfire-clientserver-xml/build.gradle b/samples/httpsession-gemfire-clientserver-xml/build.gradle
index 58002084..a573ac46 100644
--- a/samples/httpsession-gemfire-clientserver-xml/build.gradle
+++ b/samples/httpsession-gemfire-clientserver-xml/build.gradle
@@ -13,7 +13,7 @@ configurations {
 }
 
 dependencies {
-	compile project(':spring-session-data-gemfire'),
+	compile project(':spring-session-data-geode'),
 		"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 e9ec3892..cfe2d7e8 100644
--- a/samples/httpsession-gemfire-clientserver/build.gradle
+++ b/samples/httpsession-gemfire-clientserver/build.gradle
@@ -20,15 +20,15 @@ dependencies {
 
 	integrationTestCompile gebDependencies
 
-	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE"
+	integrationTestRuntime "org.springframework.shell:spring-shell:1.0.0.RELEASE",
+		"xml-apis:xml-apis:1.4.01"
 }
 
+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
new file mode 100644
index 00000000..3ced2f2a
--- /dev/null
+++ b/samples/httpsession-gemfire-clientserver/src/main/java/sample/ClassLocator.java
@@ -0,0 +1,38 @@
+/*
+ * 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 3f03cfaf..cc2c8f18 100644
--- a/samples/httpsession-gemfire-p2p/build.gradle
+++ b/samples/httpsession-gemfire-p2p/build.gradle
@@ -7,7 +7,7 @@ configurations {
 }
 
 dependencies {
-	compile project(':spring-session-data-gemfire'),
+	compile project(':spring-session-data-geode'),
 		"org.springframework:spring-web:$springVersion",
 		"org.webjars:bootstrap:$bootstrapVersion",
 		"org.webjars:webjars-taglib:$webjarsTaglibVersion",
diff --git a/settings.gradle b/settings.gradle
index 97be7c15..91b11414 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -26,6 +26,7 @@ include 'samples:grails3'
 
 include 'spring-session'
 include 'spring-session-data-gemfire'
+include 'spring-session-data-geode'
 include 'spring-session-data-redis'
 include 'spring-session-jdbc'
 include 'spring-session-data-mongo'
diff --git a/spring-session-data-geode/build.gradle b/spring-session-data-geode/build.gradle
new file mode 100644
index 00000000..d765d405
--- /dev/null
+++ b/spring-session-data-geode/build.gradle
@@ -0,0 +1,21 @@
+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 929af674..91be2d41 100644
--- a/spring-session/build.gradle
+++ b/spring-session/build.gradle
@@ -42,7 +42,6 @@ dependencies {
 			"org.springframework.security:spring-security-core:$springSecurityVersion"
 
 	jacoco "org.jacoco:org.jacoco.agent:0.7.2.201409121644:runtime"
-
 }
 
 dependencyManagement {