diff --git a/persistence-modules/spring-data-gemfire/pom.xml b/persistence-modules/spring-data-gemfire/pom.xml
index 9b8ee89810..53ce67fb6d 100644
--- a/persistence-modules/spring-data-gemfire/pom.xml
+++ b/persistence-modules/spring-data-gemfire/pom.xml
@@ -15,9 +15,14 @@
 
     <dependencies>
         <dependency>
-            <groupId>org.springframework.geode</groupId>
-            <artifactId>spring-geode-starter</artifactId>
-            <version>${spring-geode.version}</version>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-gemfire</artifactId>
+            <version>${spring-data-gemfire-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.gemstone.gemfire</groupId>
+            <artifactId>gemfire</artifactId>
+            <version>${gemfire-version}</version>
         </dependency>
         <!-- Google List API -->
         <dependency>
@@ -25,6 +30,17 @@
             <artifactId>google-collections</artifactId>
             <version>${google-collections-version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <version>${spring-context-version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>commons-logging</artifactId>
+                    <groupId>commons-logging</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-test</artifactId>
@@ -33,10 +49,19 @@
         </dependency>
     </dependencies>
 
+    <repositories>
+        <repository>
+            <id>gemstone</id>
+            <url>http://dist.gemstone.com.s3.amazonaws.com/maven/release/</url>
+        </repository>
+    </repositories>
+
     <properties>
-        <spring-geode.version>1.7.4</spring-geode.version>
+        <spring-data-gemfire-version>1.7.4.RELEASE</spring-data-gemfire-version>
+        <gemfire-version>7.0.1</gemfire-version>
         <google-collections-version>1.0</google-collections-version>
-        <spring-test-version>5.3.23</spring-test-version>
+        <spring-context-version>4.3.0.RELEASE</spring-context-version>
+        <spring-test-version>4.3.0.RELEASE</spring-test-version>
     </properties>
 
 </project>
\ No newline at end of file
diff --git a/persistence-modules/spring-data-gemfire/src/main/java/com/baeldung/spring/data/gemfire/function/GemfireConfiguration.java b/persistence-modules/spring-data-gemfire/src/main/java/com/baeldung/spring/data/gemfire/function/GemfireConfiguration.java
index 296516aec5..0049f82ddc 100644
--- a/persistence-modules/spring-data-gemfire/src/main/java/com/baeldung/spring/data/gemfire/function/GemfireConfiguration.java
+++ b/persistence-modules/spring-data-gemfire/src/main/java/com/baeldung/spring/data/gemfire/function/GemfireConfiguration.java
@@ -2,8 +2,8 @@ package com.baeldung.spring.data.gemfire.function;
 
 import com.baeldung.spring.data.gemfire.model.Employee;
 import com.baeldung.spring.data.gemfire.repository.EmployeeRepository;
-import org.apache.geode.cache.DataPolicy;
-import org.apache.geode.cache.GemFireCache;
+import com.gemstone.gemfire.cache.DataPolicy;
+import com.gemstone.gemfire.cache.GemFireCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -39,6 +39,7 @@ public class GemfireConfiguration {
     }
 
     @Bean
+    @Autowired
     CacheFactoryBean gemfireCache() {
         CacheFactoryBean gemfireCache = new CacheFactoryBean();
         gemfireCache.setClose(true);
@@ -48,6 +49,7 @@ public class GemfireConfiguration {
 
 
     @Bean(name="employee")
+    @Autowired
     LocalRegionFactoryBean<String, Employee> getEmployee(final GemFireCache cache) {
         LocalRegionFactoryBean<String, Employee> employeeRegion = new LocalRegionFactoryBean<String, Employee>();
         employeeRegion.setCache(cache);