root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '2.6.x' into 2.7.x

Browse Source 
Closes gh-30019
pull/30078/head
Andy Wilkinson 3 years ago
parent 9c958669f4 c8b849e2f6
commit 97c47123d5
4 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/attributes.adoc
Unescape Escape View File

@ -47,6 +47,8 @@
:spring-boot-cli-module-api: {spring-boot-api}/org/springframework/boot/cli :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-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-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-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-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 :spring-boot-test-autoconfigure-module-code: {spring-boot-code}/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure

1
spring-boot-project/spring-boot-docs/src/docs/asciidoc/data/nosql.adoc
Unescape Escape View File

@ -12,6 +12,7 @@ Spring Data provides additional projects that help you access a variety of NoSQL
* {spring-data-ldap}[LDAP] * {spring-data-ldap}[LDAP]
Spring Boot provides auto-configuration for Redis, MongoDB, Neo4j, Solr, Elasticsearch, Cassandra, Couchbase, LDAP and InfluxDB. 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. You can make use of the other projects, but you must configure them yourself.
See the appropriate reference documentation at {spring-data}. See the appropriate reference documentation at {spring-data}.

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/io/caching.adoc
Unescape Escape View File

@ -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.caffeine,Caffeine>>
. <<io#io.caching.provider.simple,Simple>> . <<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. 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). Use this property if you need to <<io#io.caching.provider.none,disable caching altogether>> in certain environments (such as tests).

2
spring-boot-project/spring-boot-docs/src/docs/asciidoc/web/spring-session.adoc
Unescape Escape View File

@ -8,6 +8,8 @@ When building a servlet web application, the following stores can be auto-config
* Hazelcast * Hazelcast
* MongoDB * 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`. The servlet auto-configuration replaces the need to use `@Enable*HttpSession`.
When building a reactive web application, the following stores can be auto-configured: When building a reactive web application, the following stores can be auto-configured:

Write Preview
Loading…
Cancel
Save