Merge branch '2.6.x' into 2.7.x

Closes gh-30019
spring-projects · Mar 1, 2022 · 97c4712 · 97c4712
2 parents 9c95866 + c8b849e
commit 97c4712
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 0 deletions.
diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc
@@ -47,6 +47,8 @@
 :spring-boot-cli-module-api: {spring-boot-api}/org/springframework/boot/cli
 :spring-boot-devtools-module-code: {spring-boot-code}/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools
 :spring-boot-devtools-module-api: {spring-boot-api}/org/springframework/boot/devtools
+:spring-boot-for-apache-geode: https://github.com/spring-projects/spring-boot-data-geode
+:spring-boot-for-apache-geode-docs: https://docs.spring.io/spring-boot-data-geode-build/1.7.x/reference/html5/
 :spring-boot-test-module-code: {spring-boot-code}/spring-boot-project/spring-boot-test/src/main/java/org/springframework/boot/test
 :spring-boot-test-module-api: {spring-boot-api}/org/springframework/boot/test
 :spring-boot-test-autoconfigure-module-code: {spring-boot-code}/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure

diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/nosql.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/nosql.adoc
@@ -12,6 +12,7 @@ Spring Data provides additional projects that help you access a variety of NoSQL
 * {spring-data-ldap}[LDAP]
 
 Spring Boot provides auto-configuration for Redis, MongoDB, Neo4j, Solr, Elasticsearch, Cassandra, Couchbase, LDAP and InfluxDB.
+Additionally, {spring-boot-for-apache-geode}[Spring Boot for Apache Geode] provides {spring-boot-for-apache-geode-docs}#geode-repositories[auto-configuration for Apache Geode].
 You can make use of the other projects, but you must configure them yourself.
 See the appropriate reference documentation at {spring-data}.
 

diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/io/caching.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/io/caching.adoc
@@ -46,6 +46,8 @@ If you have not defined a bean of type `CacheManager` or a `CacheResolver` named
 . <<io#io.caching.provider.caffeine,Caffeine>>
 . <<io#io.caching.provider.simple,Simple>>
 
+Additionally, {spring-boot-for-apache-geode}[Spring Boot for Apache Geode] provides {spring-boot-for-apache-geode-docs}#geode-caching-provider[auto-configuration for using Apache Geode as a cache provider].
+
 TIP: It is also possible to _force_ a particular cache provider by setting the configprop:spring.cache.type[] property.
 Use this property if you need to <<io#io.caching.provider.none,disable caching altogether>> in certain environments (such as tests).
 

diff --git a/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/spring-session.adoc b/spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/spring-session.adoc
@@ -8,6 +8,8 @@ When building a servlet web application, the following stores can be auto-config
 * Hazelcast
 * MongoDB
 
+Additionally, {spring-boot-for-apache-geode}[Spring Boot for Apache Geode] provides {spring-boot-for-apache-geode-docs}#geode-session[auto-configuration for using Apache Geode as a session store].
+
 The servlet auto-configuration replaces the need to use `@Enable*HttpSession`.
 
 When building a reactive web application, the following stores can be auto-configured: