Merge branch '3.3.x'

Closes gh-42597

buildSrc/src/main/resources/org/springframework/boot/build/antora/antora-asciidoc-attributes.properties

@@ -43,7 +43,6 @@ url-spring-data-elasticsearch-javadoc=https://docs.spring.io/spring-data/elastic
 url-spring-data-elasticsearch-docs=https://docs.spring.io/spring-data/elasticsearch/reference/{version-spring-data-elasticsearch-docs}
 url-spring-data-elasticsearch-site=https://spring.io/projects/spring-data-elasticsearch
 url-spring-data-envers-site=https://spring.io/projects/spring-data-envers
-url-spring-data-gemfire-site=https://spring.io/projects/spring-data-gemfire
 url-spring-data-geode-site=https://spring.io/projects/spring-data-geode
 url-spring-data-jdbc-docs=https://docs.spring.io/spring-data/relational/reference/{version-spring-data-jdbc-docs}
 url-spring-data-jpa-javadoc=https://docs.spring.io/spring-data/jpa/docs/{version-spring-data-jpa-javadoc}/api

spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/data/nosql.adoc

@@ -6,7 +6,7 @@ Spring Data provides additional projects that help you access a variety of NoSQL
 * {url-spring-data-cassandra-site}[Cassandra]
 * {url-spring-data-couchbase-site}[Couchbase]
 * {url-spring-data-elasticsearch-site}[Elasticsearch]
-* {url-spring-data-gemfire-site}[GemFire] or {url-spring-data-geode-site}[Geode]
+* {url-spring-data-geode-site}[Geode]
 * {url-spring-data-ldap-site}[LDAP]
 * {url-spring-data-mongodb-site}[MongoDB]
 * {url-spring-data-neo4j-site}[Neo4J]