From 16cf170e17ba36f5437fe29912248c1ad5c28e08 Mon Sep 17 00:00:00 2001
From: jsgrah-spring <jsgrah.spring@gmail.com>
Date: Tue, 1 Nov 2022 14:05:34 +0100
Subject: [PATCH] JAVA-14499. Fix: Failed to read artifact descriptor for
 com.gemstone.gemfire:gemfire:jar:8.1.0: Could not transfer artifact
 com.gemstone.gemfire:gemfire:pom:8.1.0 from/to gemstone.

---
 persistence-modules/pom.xml                   |  2 +-
 .../spring-data-gemfire/pom.xml               | 35 +++----------------
 .../function/GemfireConfiguration.java        |  6 ++--
 .../spring/data/gemfire/model/Employee.java   |  2 +-
 4 files changed, 9 insertions(+), 36 deletions(-)

diff --git a/persistence-modules/pom.xml b/persistence-modules/pom.xml
index d549f7e2de..3684efe600 100644
--- a/persistence-modules/pom.xml
+++ b/persistence-modules/pom.xml
@@ -73,7 +73,7 @@
         <module>spring-data-dynamodb</module>
         <module>spring-data-eclipselink</module>
         <module>spring-data-elasticsearch</module>
-        <!-- <module>spring-data-gemfire</module> Fixing in JAVA-11854 -->
+        <module>spring-data-gemfire</module>
         <module>spring-data-geode</module>
         <module>spring-data-jpa-annotations</module>
         <module>spring-data-jpa-crud</module>
diff --git a/persistence-modules/spring-data-gemfire/pom.xml b/persistence-modules/spring-data-gemfire/pom.xml
index 53ce67fb6d..9b8ee89810 100644
--- a/persistence-modules/spring-data-gemfire/pom.xml
+++ b/persistence-modules/spring-data-gemfire/pom.xml
@@ -15,14 +15,9 @@
 
     <dependencies>
         <dependency>
-            <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>
+            <groupId>org.springframework.geode</groupId>
+            <artifactId>spring-geode-starter</artifactId>
+            <version>${spring-geode.version}</version>
         </dependency>
         <!-- Google List API -->
         <dependency>
@@ -30,17 +25,6 @@
             <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>
@@ -49,19 +33,10 @@
         </dependency>
     </dependencies>
 
-    <repositories>
-        <repository>
-            <id>gemstone</id>
-            <url>http://dist.gemstone.com.s3.amazonaws.com/maven/release/</url>
-        </repository>
-    </repositories>
-
     <properties>
-        <spring-data-gemfire-version>1.7.4.RELEASE</spring-data-gemfire-version>
-        <gemfire-version>7.0.1</gemfire-version>
+        <spring-geode.version>1.7.4</spring-geode.version>
         <google-collections-version>1.0</google-collections-version>
-        <spring-context-version>4.3.0.RELEASE</spring-context-version>
-        <spring-test-version>4.3.0.RELEASE</spring-test-version>
+        <spring-test-version>5.3.23</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 0049f82ddc..296516aec5 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 com.gemstone.gemfire.cache.DataPolicy;
-import com.gemstone.gemfire.cache.GemFireCache;
+import org.apache.geode.cache.DataPolicy;
+import org.apache.geode.cache.GemFireCache;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -39,7 +39,6 @@ public class GemfireConfiguration {
     }
 
     @Bean
-    @Autowired
     CacheFactoryBean gemfireCache() {
         CacheFactoryBean gemfireCache = new CacheFactoryBean();
         gemfireCache.setClose(true);
@@ -49,7 +48,6 @@ 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);
diff --git a/persistence-modules/spring-data-gemfire/src/main/java/com/baeldung/spring/data/gemfire/model/Employee.java b/persistence-modules/spring-data-gemfire/src/main/java/com/baeldung/spring/data/gemfire/model/Employee.java
index 9c29b28dca..576690ed00 100644
--- a/persistence-modules/spring-data-gemfire/src/main/java/com/baeldung/spring/data/gemfire/model/Employee.java
+++ b/persistence-modules/spring-data-gemfire/src/main/java/com/baeldung/spring/data/gemfire/model/Employee.java
@@ -2,7 +2,7 @@ package com.baeldung.spring.data.gemfire.model;
 
 import org.springframework.data.annotation.Id;
 import org.springframework.data.annotation.PersistenceConstructor;
-import org.springframework.data.gemfire.mapping.Region;
+import org.springframework.data.gemfire.mapping.annotation.Region;
 
 
 @Region("employee")