From 1707013cb612b980aebbd00d9599ffb6973f6cfc Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 3 Aug 2020 15:01:15 -0700 Subject: [PATCH] Rename 'master' version documentation attributes. Rename 'master-apache-geode-version' to 'apache-geode-doc-version'. Rename 'master-pivotal-cloudcache-version' to 'pivotal-cloudcache-doc-version'. Rename 'master-pivotal-gemfire-version' to 'pivotal-gemfire-doc-version'. --- spring-geode-docs/spring-geode-docs.gradle | 6 +++--- .../src/docs/asciidoc/guides/boot-actuator.adoc | 2 +- .../src/docs/asciidoc/guides/boot-configuration.adoc | 2 +- .../src/docs/asciidoc/guides/caching-http-session.adoc | 2 +- .../src/docs/asciidoc/guides/caching-inline.adoc | 2 +- .../src/docs/asciidoc/guides/caching-look-aside.adoc | 2 +- .../src/docs/asciidoc/guides/caching-multi-site.adoc | 2 +- .../src/docs/asciidoc/guides/caching-near.adoc | 2 +- .../src/docs/asciidoc/guides/getting-started.adoc | 6 +++--- spring-geode-docs/src/docs/asciidoc/index.adoc | 6 +++--- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/spring-geode-docs/spring-geode-docs.gradle b/spring-geode-docs/spring-geode-docs.gradle index 8d3007bc..903461b9 100644 --- a/spring-geode-docs/spring-geode-docs.gradle +++ b/spring-geode-docs/spring-geode-docs.gradle @@ -51,11 +51,11 @@ asciidoctorj { 'highlightjsdir@': "js/highlight", 'docinfodir@': ".", 'apache-geode-artifact-version' : "${apacheGeodeVersion}", + 'apache-geode-doc-version' : "112", 'pivotal-cloudcache-artifact-version' : "${pivotalCloudCacheVersion}", + 'pivotal-cloudcache-doc-version' : "1-12", 'pivotal-gemfire-artifact-version' : "${pivotalGemFireVersion}", - 'master-apache-geode-version' : "112", - 'master-pivotal-gemfire-version' : "910", - 'master-pivotal-cloudcache-version' : "1-12", + 'pivotal-gemfire-doc-version' : "910", 'spring-version' : versions['org.springframework:spring-core'], 'spring-boot-version' : "${springBootVersion}", 'spring-boot-data-geode-version' : project.version, diff --git a/spring-geode-docs/src/docs/asciidoc/guides/boot-actuator.adoc b/spring-geode-docs/src/docs/asciidoc/guides/boot-actuator.adoc index a5ca6331..91148af5 100644 --- a/spring-geode-docs/src/docs/asciidoc/guides/boot-actuator.adoc +++ b/spring-geode-docs/src/docs/asciidoc/guides/boot-actuator.adoc @@ -1,6 +1,6 @@ [[geode-samples-boot-actuator]] = Spring Boot Actuator for Apache Geode & Pivotal GemFire -:apache-geode-version: {master-apache-geode-version} +:apache-geode-version: {apache-geode-doc-version} :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version} :images-dir: ./images :spring-boot-docs: https://docs.spring.io/spring-boot/docs/current/reference/html diff --git a/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc b/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc index 084c4ee9..b4d26d9f 100644 --- a/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc +++ b/spring-geode-docs/src/docs/asciidoc/guides/boot-configuration.adoc @@ -1,7 +1,7 @@ [[geode-samples-boot-configuration]] = Spring Boot Auto-configuration for Apache Geode & Pivotal GemFire John Blum -:apache-geode-version: {master-apache-geode-version} +:apache-geode-version: {apache-geode-doc-version} :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version} :toc: left :toclevels: 2 diff --git a/spring-geode-docs/src/docs/asciidoc/guides/caching-http-session.adoc b/spring-geode-docs/src/docs/asciidoc/guides/caching-http-session.adoc index c2a94e0e..a0d207eb 100644 --- a/spring-geode-docs/src/docs/asciidoc/guides/caching-http-session.adoc +++ b/spring-geode-docs/src/docs/asciidoc/guides/caching-http-session.adoc @@ -1,6 +1,6 @@ [[geode-samples-caching-http-session]] = HTTP Session State Caching with Spring -:apache-geode-version: {master-apache-geode-version} +:apache-geode-version: {apache-geode-doc-version} :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version} :apache-geode-javadoc: https://geode.apache.org/releases/latest/javadoc :apache-geode-website: https://geode.apache.org/ diff --git a/spring-geode-docs/src/docs/asciidoc/guides/caching-inline.adoc b/spring-geode-docs/src/docs/asciidoc/guides/caching-inline.adoc index b0b2cadf..e47dc0ef 100644 --- a/spring-geode-docs/src/docs/asciidoc/guides/caching-inline.adoc +++ b/spring-geode-docs/src/docs/asciidoc/guides/caching-inline.adoc @@ -1,6 +1,6 @@ [[geode-samples-caching-inline]] = Inline Caching with Spring -:apache-geode-version: {master-apache-geode-version} +:apache-geode-version: {apache-geode-doc-version} :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version} :apache-geode-javadoc: https://geode.apache.org/releases/latest/javadoc :images-dir: ./images diff --git a/spring-geode-docs/src/docs/asciidoc/guides/caching-look-aside.adoc b/spring-geode-docs/src/docs/asciidoc/guides/caching-look-aside.adoc index 1f255254..3fe62685 100644 --- a/spring-geode-docs/src/docs/asciidoc/guides/caching-look-aside.adoc +++ b/spring-geode-docs/src/docs/asciidoc/guides/caching-look-aside.adoc @@ -1,6 +1,6 @@ [[geode-samples-caching-lookaside]] = Look-Aside Caching with Spring -:apache-geode-version: {master-apache-geode-version} +:apache-geode-version: {apache-geode-doc-version} :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version} :apache-geode-javadoc: https://geode.apache.org/releases/latest/javadoc :images-dir: ./images diff --git a/spring-geode-docs/src/docs/asciidoc/guides/caching-multi-site.adoc b/spring-geode-docs/src/docs/asciidoc/guides/caching-multi-site.adoc index 7b8e01e3..ed1ba008 100644 --- a/spring-geode-docs/src/docs/asciidoc/guides/caching-multi-site.adoc +++ b/spring-geode-docs/src/docs/asciidoc/guides/caching-multi-site.adoc @@ -1,6 +1,6 @@ [[geode-samples-caching-multisite]] = Multi-Site Caching with Spring -:apache-geode-version: {master-apache-geode-version} +:apache-geode-version: {apache-geode-doc-version} :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version} :apache-geode-javadoc: https://geode.apache.org/releases/latest/javadoc :gemfire-name: VMware Tanzu GemFire diff --git a/spring-geode-docs/src/docs/asciidoc/guides/caching-near.adoc b/spring-geode-docs/src/docs/asciidoc/guides/caching-near.adoc index 553f78a6..5a7248c2 100644 --- a/spring-geode-docs/src/docs/asciidoc/guides/caching-near.adoc +++ b/spring-geode-docs/src/docs/asciidoc/guides/caching-near.adoc @@ -1,6 +1,6 @@ [[geode-samples-caching-near]] = Near Caching with Spring -:apache-geode-version: {master-apache-geode-version} +:apache-geode-version: {apache-geode-doc-version} :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version} :apache-geode-javadoc: https://geode.apache.org/releases/latest/javadoc :images-dir: ./images diff --git a/spring-geode-docs/src/docs/asciidoc/guides/getting-started.adoc b/spring-geode-docs/src/docs/asciidoc/guides/getting-started.adoc index 670e87e6..8b30b478 100644 --- a/spring-geode-docs/src/docs/asciidoc/guides/getting-started.adoc +++ b/spring-geode-docs/src/docs/asciidoc/guides/getting-started.adoc @@ -1,7 +1,7 @@ [[geode-samples-getting-started]] = Getting Started Quickly, Easily and Reliably with Spring Boot for Apache Geode & Pivotal Cloud Cache John Blum -:apache-geode-version: {master-apache-geode-version} +:apache-geode-version: {apache-geode-doc-version} :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version} :apache-geode-javadoc: https://geode.apache.org/releases/latest/javadoc :apache-geode-website: https://geode.apache.org/ @@ -9,11 +9,11 @@ John Blum :gemfire-name: Pivotal GemFire :geode-name: Apache Geode :images-dir: ./images -:pivotal-cloudcache-version: {master-pivotal-cloudcache-version} +:pivotal-cloudcache-version: {pivotal-cloudcache-doc-version} :pivotal-cloudcache-docs: https://docs.pivotal.io/p-cloud-cache/{pivotal-cloudcache-version} :pivotal-cloudcache-website: https://pivotal.io/pivotal-cloud-cache :pivotal-cloudfoundry-website: https://pivotal.io/platform -:pivotal-gemfire-version: {master-pivotal-gemfire-version} +:pivotal-gemfire-version: {pivotal-gemfire-doc-version} :pivotal-gemfire-docs: https://gemfire.docs.pivotal.io/{pivotal-gemfire-version}/geode/reference :pivotal-gemfire-javadoc: https://gemfire-{pivotal-gemfire-version}-javadocs.docs.pivotal.io/ :pivotal-gemfire-website: https://pivotal.io/pivotal-gemfire diff --git a/spring-geode-docs/src/docs/asciidoc/index.adoc b/spring-geode-docs/src/docs/asciidoc/index.adoc index d5d9b226..08623763 100644 --- a/spring-geode-docs/src/docs/asciidoc/index.adoc +++ b/spring-geode-docs/src/docs/asciidoc/index.adoc @@ -12,19 +12,19 @@ John Blum :toc: left :toclevels: 1 :apache-geode-name: Apache Geode -:apache-geode-version: {master-apache-geode-version} +:apache-geode-version: {apache-geode-doc-version} :apache-geode-docs: https://geode.apache.org/docs/guide/{apache-geode-version} :apache-geode-javadoc: https://geode.apache.org/releases/latest/javadoc :apache-geode-website: https://geode.apache.org/ :apache-geode-wiki: https://cwiki.apache.org/confluence/display/GEODE -:pivotal-cloudcache-version: {master-pivotal-cloudcache-version} +:pivotal-cloudcache-version: {pivotal-cloudcache-doc-version} :pivotal-cloudcache-docs: https://docs.pivotal.io/p-cloud-cache/{pivotal-cloudcache-version} :pivotal-cloudcache-website: https://pivotal.io/pivotal-cloud-cache :pivotal-cloudfoundry-version: 2-9 :pivotal-cloudfoundry-docs: https://docs.pivotal.io/platform/application-service/{pivotal-cloudfoundry-version} :pivotal-cloudfoundry-website: https://pivotal.io/platform :pivotal-gemfire-name: VMware GemFire -:pivotal-gemfire-version: {master-pivotal-gemfire-version} +:pivotal-gemfire-version: {pivotal-gemfire-doc-version} :pivotal-gemfire-docs: https://gemfire.docs.pivotal.io/{pivotal-gemfire-version}/geode/reference :pivotal-gemfire-javadoc: https://gemfire-{pivotal-gemfire-version}-javadocs.docs.pivotal.io/ :pivotal-gemfire-website: https://pivotal.io/pivotal-gemfire