diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/config/EnableGemfireCaching.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/config/EnableGemfireCaching.java
index e070952c..f40f0e5d 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/config/EnableGemfireCaching.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/config/EnableGemfireCaching.java
@@ -35,8 +35,8 @@ import org.springframework.context.annotation.Import;
  * @see java.lang.annotation.Retention
  * @see java.lang.annotation.Target
  * @see org.springframework.context.annotation.Import
- * @see <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#cache">Cache Abstraction</a>
- * @see <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#cache-store-configuration-gemfire">GemFire-based Cache</a>
+ * @see <a href="https://docs.spring.io/spring-framework/docs/current/reference/html/integration.html#cache">Cache Abstraction</a>
+ * @see <a href="https://docs.spring.io/spring-framework/docs/current/reference/html/integration.html#cache-store-configuration-gemfire">GemFire-based Cache</a>
  * @see <a href="https://docs.spring.io/spring-data-gemfire/docs/current/reference/html/#apis:spring-cache-abstraction">Support for Spring Cache Abstraction</a>
  * @since 2.0.0
  */
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/config/GemfireCachingConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/config/GemfireCachingConfiguration.java
index b07f2506..4c33afea 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/config/GemfireCachingConfiguration.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/cache/config/GemfireCachingConfiguration.java
@@ -42,8 +42,8 @@ import org.springframework.data.gemfire.cache.GemfireCacheManager;
  * @see org.springframework.context.annotation.Configuration
  * @see org.springframework.data.gemfire.cache.GemfireCacheManager
  * @see org.springframework.data.gemfire.cache.config.EnableGemfireCaching
- * @see <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#cache">Cache Abstraction</a>
- * @see <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#cache-store-configuration-gemfire">GemFire-based Cache</a>
+ * @see <a href="https://docs.spring.io/spring-framework/docs/current/reference/html/integration.html#cache">Cache Abstraction</a>
+ * @see <a href="https://docs.spring.io/spring-framework/docs/current/reference/html/integration.html#cache-store-configuration-gemfire">GemFire-based Cache</a>
  * @see <a href="https://docs.spring.io/spring-data-gemfire/docs/current/reference/html/#apis:spring-cache-abstraction">Support for Spring Cache Abstraction</a>
  * @since 2.0.0
  */
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java
index de9d20dd..98e5a542 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java
@@ -147,7 +147,7 @@ public abstract class AbstractCacheConfiguration extends AbstractAnnotationConfi
 	 *
 	 * @return a {@link Properties} object containing Pivotal GemFire/Apache Geode properties used to configure
 	 * the Pivotal GemFire/Apache Geode cache instance.
-	 * @see <a href="https://gemfire.docs.pivotal.io/docs-gemfire/reference/topics/gemfire_properties.html">GemFire Properties</a>
+	 * @see <a href="https://geode.apache.org/docs/guide/113/reference/topics/gemfire_properties.html">Geode Properties</a>
 	 * @see java.util.Properties
 	 * @see #locators()
 	 * @see #logLevel()
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AuthConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AuthConfiguration.java
index 22e7d74e..e6dbcbd8 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AuthConfiguration.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/AuthConfiguration.java
@@ -34,7 +34,7 @@ import org.springframework.data.gemfire.util.PropertiesBuilder;
  * @see org.springframework.context.annotation.ImportBeanDefinitionRegistrar
  * @see org.springframework.data.gemfire.config.annotation.EnableAuth
  * @see org.springframework.data.gemfire.config.annotation.support.EmbeddedServiceConfigurationSupport
- * @see <a href="Security">https://gemfire.docs.pivotal.io/docs-gemfire/managing/security/chapter_overview.html</a>
+ * @see <a href="https://geode.apache.org/docs/guide/113/managing/security/chapter_overview.html">Security</a>
  * @since 1.9.0
  */
 public class AuthConfiguration extends EmbeddedServiceConfigurationSupport {
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java
index 0e7f92e9..6aa96022 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableAuth.java
@@ -42,8 +42,8 @@ import org.springframework.context.annotation.Import;
  * @see org.apache.geode.security.Authenticator
  * @see org.springframework.context.annotation.Import
  * @see org.springframework.data.gemfire.config.annotation.AuthConfiguration
- * @see <a href="https://gemfire.docs.pivotal.io/docs-gemfire/latest/managing/security/authentication_overview.html">Authentication</a>
- * @see <a href="https://gemfire.docs.pivotal.io/docs-gemfire/latest/managing/security/authorization_overview.html">Authorization</a>
+ * @see <a href="https://geode.apache.org/docs/guide/113/managing/security/authentication_overview.html">Authentication</a>
+ * @see <a href="https://geode.apache.org/docs/guide/113/managing/security/authorization_overview.html">Authorization</a>
  * @since 1.9.0
  */
 @Target(ElementType.TYPE)
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java
index a3a880ed..b4134274 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java
@@ -47,8 +47,7 @@ import org.springframework.data.gemfire.expiration.TimeToLiveExpiration;
  * @see org.springframework.data.gemfire.expiration.IdleTimeoutExpiration
  * @see org.springframework.data.gemfire.expiration.TimeToLiveExpiration
  * @see <a href="https://docs.spring.io/spring-data-gemfire/docs/current/reference/html/#bootstrap:region:expiration:annotation">Annotation-based Data Expiration</a>
- * @see <a href="https://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/expiration/chapter_overview.html">GemFire Expiration</a>
- * @see <a href="https://geode.docs.pivotal.io/docs/guide/developing/expiration/chapter_overview.html">Geode Expiration</a>
+ * @see <a href="https://geode.apache.org/docs/guide/113/developing/expiration/chapter_overview.html">Geode Expiration</a>
  * @since 1.9.0
  */
 @Target(ElementType.TYPE)
@@ -130,8 +129,7 @@ public @interface EnableExpiration {
 	 * {@link ExpirationType} defines different types of GemFire/Geode Expiration policies such as
 	 * (Entry) Idle Timeout (TTI) and (Entry) Time to Live (TTL).
 	 *
-	 * @see <a href="https://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/expiration/chapter_overview.html">GemFire Expiration</a>
-	 * @see <a href="https://geode.docs.pivotal.io/docs/guide/developing/expiration/chapter_overview.html">Geode Expiration</a>
+	 * @see <a href="https://geode.apache.org/docs/guide/113/developing/expiration/chapter_overview.html">Geode Expiration</a>
 	 */
 	enum ExpirationType {
 
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireProperties.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireProperties.java
index 8b5563de..42440fde 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireProperties.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireProperties.java
@@ -32,8 +32,7 @@ import org.springframework.context.annotation.Import;
  *
  * @author John Blum
  * @see org.springframework.data.gemfire.config.annotation.GemFirePropertiesConfiguration
- * @see <a href="https://gemfire.docs.pivotal.io/docs-gemfire/reference/topics/gemfire_properties.html">GemFire System Properties</a>
- * @see <a href="https://geode.docs.pivotal.io/docs/reference/topics/gemfire_properties.html">Geode System Properties</a>
+ * @see <a href="https://geode.apache.org/docs/guide/113/reference/topics/gemfire_properties.html">Geode Properties</a>
  * @since 1.9.0
  */
 @Target(ElementType.TYPE)
@@ -320,7 +319,7 @@ public @interface EnableGemFireProperties {
 	 *
 	 * Defaults to unset.
 	 *
-	 * @see <a href="https://geode.docs.pivotal.io/docs/developing/partitioned_regions/configuring_ha_for_pr.html">Configure High Availability for a Partitioned Region</a>
+	 * @see <a href="https://geode.apache.org/docs/guide/113/developing/partitioned_regions/overview_how_pr_ha_works.html">Configure High Availability for a Partitioned Region</a>
 	 */
 	String redundancyZone() default GemFirePropertiesConfiguration.DEFAULT_REDUNDANCY_ZONE;
 
@@ -411,7 +410,7 @@ public @interface EnableGemFireProperties {
 	 *
 	 * Defaults to {@literal 100000} tombstones.
 	 *
-	 * @see <a href="https://geode.docs.pivotal.io/docs/developing/distributed_regions/how_region_versioning_works.html#topic_321B05044B6641FCAEFABBF5066BD399">How Destroy and Clear Operations Are Resolved</a>
+	 * @see <a href="https://geode.apache.org/docs/guide/113/developing/distributed_regions/how_region_versioning_works.html#topic_321B05044B6641FCAEFABBF5066BD399">How Destroy and Clear Operations Are Resolved</a>
 	 */
 	int tombstoneGcThreshold() default GemFirePropertiesConfiguration.DEFAULT_TOMBSTONE_THRESHOLD;
 
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableHttpService.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableHttpService.java
index fdf1d7dd..7c3356e0 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableHttpService.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/EnableHttpService.java
@@ -43,7 +43,7 @@ import org.springframework.context.annotation.Import;
  * @see java.lang.annotation.Annotation
  * @see org.springframework.context.annotation.Import
  * @see org.springframework.data.gemfire.config.annotation.HttpServiceConfiguration
- * @see <a href="https://geode.docs.pivotal.io/docs/rest_apps/book_intro.html">Developing REST Applications for Apache Geode</a>
+ * @see <a href="https://geode.apache.org/docs/guide/113/rest_apps/book_intro.html">Developing REST Applications for Apache Geode</a>
  * @since 1.9.0
  */
 @Target(ElementType.TYPE)
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/HttpServiceConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/HttpServiceConfiguration.java
index d1ca3ba2..d0d55c45 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/HttpServiceConfiguration.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/HttpServiceConfiguration.java
@@ -35,7 +35,7 @@ import org.springframework.data.gemfire.util.PropertiesBuilder;
  * @see org.springframework.context.annotation.ImportBeanDefinitionRegistrar
  * @see org.springframework.data.gemfire.config.annotation.EnableHttpService
  * @see org.springframework.data.gemfire.config.annotation.support.EmbeddedServiceConfigurationSupport
- * @see <a href="https://geode.docs.pivotal.io/docs/rest_apps/book_intro.html">Developing REST Applications for Apache Geode</a>
+ * @see <a href="https://geode.apache.org/docs/guide/113/rest_apps/book_intro.html">Developing REST Applications for Apache Geode</a>
  * @since 1.9.0
  */
 public class HttpServiceConfiguration extends EmbeddedServiceConfigurationSupport {
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PdxConfiguration.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PdxConfiguration.java
index 20a136fb..8e99b7c3 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PdxConfiguration.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/config/annotation/PdxConfiguration.java
@@ -187,7 +187,7 @@ public class PdxConfiguration extends AbstractAnnotationConfigSupport implements
 	 * @param cacheFactoryBean {@link CacheFactoryBean} instance on which to configure PDX.
 	 * with PDX de/serialization capabilities.
 	 * @see org.springframework.data.gemfire.CacheFactoryBean
-	 * @see <a href="https://gemfire.docs.pivotal.io/docs-gemfire/latest/developing/data_serialization/gemfire_pdx_serialization.html">GemFire PDX Serialization</a>
+	 * @see <a href="https://geode.apache.org/docs/guide/113/developing/data_serialization/gemfire_pdx_serialization.html">Geode PDX Serialization</a>
 	 */
 	protected void configurePdx(CacheFactoryBean cacheFactoryBean) {
 
diff --git a/spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactions.java b/spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactions.java
index 4b68393d..80f34be3 100644
--- a/spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactions.java
+++ b/spring-data-geode/src/main/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactions.java
@@ -35,10 +35,9 @@ import org.springframework.data.gemfire.transaction.event.TransactionApplication
  * @see java.lang.annotation.Retention
  * @see java.lang.annotation.Target
  * @see org.springframework.context.annotation.Import
- * @see <a href="https://docs.spring.io/spring/docs/current/spring-framework-reference/htmlsingle/#transaction">Spring Transaction Management</a>
+ * @see <a href="https://docs.spring.io/spring-framework/docs/current/reference/html/data-access.html#transaction">Spring Transaction Management</a>
  * @see <a href="https://docs.spring.io/spring-data-gemfire/docs/current/reference/html/#apis:transaction-management">Spring Data GemFire Transaction Management</a>
- * @see <a href="https://gemfire.docs.pivotal.io/geode/developing/transactions/cache_transactions.html">GemFire Cache Transactions</a>
- * @see <a href="https://geode.apache.org/docs/guide/12/developing/transactions/cache_transactions.html">Geode Cache Transactions</a>
+ * @see <a href="https://geode.apache.org/docs/guide/113/developing/transactions/chapter_overview.html">Geode Transactions</a>
  * @since 2.0.0
  */
 @Target(ElementType.TYPE)
diff --git a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java
index 47ec0ea1..a33d5fb1 100644
--- a/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java
+++ b/spring-data-geode/src/test/java/org/springframework/data/gemfire/config/xml/support/PoolAlreadyExistsIntegrationTests.java
@@ -43,7 +43,6 @@ import org.springframework.test.context.junit4.SpringRunner;
  * @see org.apache.geode.cache.Region
  * @see org.apache.geode.cache.client.ClientCache
  * @see org.apache.geode.cache.client.Pool
- * @see <a href=""></a>
  * @since 1.0.0
  */
 @RunWith(SpringRunner.class)