SGF-827 - More URL cleanup caught by Checkstyle.

src/main/asciidoc/index.adoc

@@ -11,7 +11,7 @@ Costin Leau; David Turanski; John Blum; Oliver Gierke; Jay Bryant
 :data-store-name-symbolic: gemfire
 :data-store-name-simple: GemFire
 :data-store-name: Pivotal {data-store-name-simple}
-:data-store-version: 9.8.0
+:data-store-version: 9.8.2
 :pivotal-gemfire-version: 98
 :pivotal-gemfire-docs: https://gemfire.docs.pivotal.io/{pivotal-gemfire-version}
 :pivotal-gemfire-javadoc: https://gemfire-{pivotal-gemfire-version}-javadocs.docs.pivotal.io/
@@ -22,13 +22,13 @@ Costin Leau; David Turanski; John Blum; Oliver Gierke; Jay Bryant
 :sdg-name: Spring Data for {data-store-name}
 :sdg-website: https://projects.spring.io/spring-data-gemfire
 :spring-data-access-schema-location: https://www.springframework.org/schema/data/gemfire/spring-data-gemfire.xsd
-:spring-data-access-schema-namespace: http://www.springframework.org/schema/data/gemfire
+:spring-data-access-schema-namespace: https://www.springframework.org/schema/data/gemfire
 :spring-data-commons-docs: https://docs.spring.io/spring-data/commons/docs/current/reference
 :spring-data-commons-include: ../../../../spring-data-commons/src/main/asciidoc
 :spring-data-commons-docs-html: {spring-data-commons-docs}/html
 :spring-data-commons-javadoc: https://docs.spring.io/spring-data/commons/docs/current/api
 :spring-data-schema-location: https://www.springframework.org/schema/gemfire/spring-gemfire.xsd
-:spring-data-schema-namespace: http://www.springframework.org/schema/gemfire
+:spring-data-schema-namespace: https://www.springframework.org/schema/gemfire
 :spring-data-website: https://spring.io/projects/spring-data
 :spring-framework-docs: https://docs.spring.io/spring/docs/current/spring-framework-reference
 :spring-framework-javadoc: https://docs.spring.io/spring/docs/current/javadoc-api

src/main/asciidoc/reference/region.adoc

@@ -69,7 +69,7 @@ For instance, consider the following `cache.xml` file:
 [source,xml]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
+<cache xmlns="https://geode.apache.org/schema/cache"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
        version="1.0">
@@ -569,7 +569,7 @@ Consider the following native {data-store-name} `cache.xml` configuration file:
 [source,xml]
 ----
 <?xml version="1.0" encoding="UTF-8"?>
-<cache xmlns="http://geode.apache.org/schema/cache"
+<cache xmlns="https://geode.apache.org/schema/cache"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://geode.apache.org/schema/cache https://geode.apache.org/schema/cache/cache-1.0.xsd"
        version="1.0">

src/main/java/org/springframework/data/gemfire/config/annotation/AbstractCacheConfiguration.java

@@ -14,7 +14,6 @@
  * limitations under the License.
  *
  */
-
 package org.springframework.data.gemfire.config.annotation;
 
 import static org.springframework.data.gemfire.CacheFactoryBean.DynamicRegionSupport;
@@ -33,6 +32,7 @@ import org.apache.geode.cache.TransactionWriter;
 import org.apache.geode.cache.client.ClientCache;
 import org.apache.geode.cache.server.CacheServer;
 import org.apache.geode.cache.util.GatewayConflictResolver;
+
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.context.annotation.Bean;

src/main/java/org/springframework/data/gemfire/config/annotation/EnableExpiration.java

@@ -14,7 +14,6 @@
  * limitations under the License.
  *
  */
-
 package org.springframework.data.gemfire.config.annotation;
 
 import static org.springframework.data.gemfire.config.annotation.EnableExpiration.ExpirationType.IDLE_TIMEOUT;
@@ -27,6 +26,7 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
 import org.apache.geode.cache.Region;
+
 import org.springframework.context.annotation.Import;
 import org.springframework.data.gemfire.expiration.Expiration;
 import org.springframework.data.gemfire.expiration.ExpirationActionType;
@@ -48,7 +48,7 @@ import org.springframework.data.gemfire.expiration.TimeToLiveExpiration;
  * @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">Pivotal GemFire Expiration</a>
- * @see <a href="https://geode.incubator.apache.org/docs/guide/developing/expiration/chapter_overview.html">Geode Expiration</a>
+ * @see <a href="https://geode.incubator.apache.org/docs/guide/developing/expiration/chapter_overview.html">Apache Geode Expiration</a>
  * @since 1.9.0
  */
 @Target(ElementType.TYPE)
@@ -131,7 +131,7 @@ public @interface EnableExpiration {
 	 * (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">Pivotal GemFire Expiration</a>
-	 * @see <a href="https://geode.incubator.apache.org/docs/guide/developing/expiration/chapter_overview.html">Geode Expiration</a>
+	 * @see <a href="https://geode.docs.pivotal.io/docs/guide/developing/expiration/chapter_overview.html">Apache Geode Expiration</a>
 	 */
 	enum ExpirationType {
 

src/main/java/org/springframework/data/gemfire/config/annotation/EnableGemFireProperties.java

@@ -33,7 +33,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">Pivotal 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.docs.pivotal.io/docs/reference/topics/gemfire_properties.html">Apache Geode System Properties</a>
  * @since 1.9.0
  */
 @Target(ElementType.TYPE)

src/main/java/org/springframework/data/gemfire/config/xml/package-info.java

@@ -2,6 +2,6 @@
  * This package provides classes and components for configuring Pivotal GemFire using Spring Data's
  * XML namespace support.  See more details here...
  *
- * <a href="https://docs.spring.io/spring-data-gemfire/docs/current/reference/html/#_spring_data_gemfire_core_schema_gfe">SDG Core Schema (gfe)</a>
+ * <a href="https://docs.spring.io/spring-data-gemfire/docs/current/reference/html/#_spring_data_gemfire_core_schema_gfe">Spring Data GemFire Core Schema (gfe)</a>
  */
 package org.springframework.data.gemfire.config.xml;

src/main/java/org/springframework/data/gemfire/package-info.java

@@ -1,7 +1,10 @@
-
 /**
  * Package providing integration of
+<<<<<<< HEAD
  * <a href="https://www.gemstone.com/products/gemfire">GemFire</a>
+=======
+ * <a href="https://pivotal.io/pivotal-gemfire">GemFire</a>
+>>>>>>> d6800dda... SGF-827 - More URL cleanup caught by Checkstyle.
  * with Spring concepts.
  *
  * Contains helper classes, a template plus callback for GemFire
@@ -9,4 +12,3 @@
  * Pivotal GemFire transactions.
  */
 package org.springframework.data.gemfire;
-

src/main/java/org/springframework/data/gemfire/transaction/config/EnableGemfireCacheTransactions.java

@@ -36,7 +36,7 @@ import org.springframework.context.annotation.Import;
  * @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-data-gemfire/docs/current/reference/html/#apis:transaction-management">SDG 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">Pivotal GemFire Cache Transactions</a>
  * @see <a href="https://geode.apache.org/docs/guide/12/developing/transactions/cache_transactions.html">Apache Geode Cache Transactions</a>
  * @since 2.0.0

src/main/resources/changelog.txt

@@ -1,7 +1,7 @@
 SPRING DATA GEMFIRE CHANGELOG
 -----------------------------
 https://www.springsource.org/spring-gemfire
-=============================
+===========================================
 
 Changes in version 2.2.0.RC1 (2019-06-14)
 -----------------------------------------

src/main/resources/readme.txt

@@ -15,10 +15,18 @@ details, consult the provided javadoc for specific packages and classes.
 
 3. GETTING STARTED
 
+<<<<<<< HEAD
 Please see the reference documentation at https://www.springsource.org/spring-gemfire/
+=======
+Please see the reference documentation at https://spring.io/projects/spring-data-geode
+>>>>>>> d6800dda... SGF-827 - More URL cleanup caught by Checkstyle.
 and the Spring GemFire Examples at https://github.com/SpringSource/spring-gemfire-examples
 
 ADDITIONAL RESOURCES
 Spring Data GemFire Homepage  : https://www.springsource.org/spring-gemfire
 VMware vFabric GemFire Documentation: https://www.vmware.com/products/application-platform/vfabric-gemfire/overview.html
-VMware vFabric GemFire product page: https://www.vmware.com/products/application-platform/vfabric-gemfire
+<<<<<<< HEAD
+VMware vFabric GemFire product page: https://www.vmware.com/products/application-platform/vfabric-gemfire
+=======
+VMware vFabric GemFire product page: https://www.vmware.com/products/application-platform/vfabric-gemfire
+>>>>>>> d6800dda... SGF-827 - More URL cleanup caught by Checkstyle.

src/test/java/org/springframework/data/gemfire/repository/query/GemfireQueryMethodUnitTests.java

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.springframework.data.gemfire.repository.query;
 
 import static org.hamcrest.CoreMatchers.equalTo;