root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch '1.5.x' into 2.0.x

This commit is contained in:
Stephane Nicoll 2018-09-22 20:24:46 +02:00
parent ed615d4267 3b51d79353
commit f225945218
3 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-samples/spring-boot-sample-cache/README.adoc
View File

@ -46,10 +46,13 @@ compliant implementation and the JSR-107 api. You first need to add
* `Hazelcast`: add `com.hazelcast:hazelcast` * `Hazelcast`: add `com.hazelcast:hazelcast`
* `Infinispan`: add `org.infinispan:infinispan-jcache` * `Infinispan`: add `org.infinispan:infinispan-jcache`
TIP: Certain cache providers do not create a default cache on-the-fly if it does not TIP: Run sample cache application using JCache and EhCache3 by uncommenting the
exist so you might need to update the sample to create the caches on startup or `spring.cache.jcache.config` property and `$mvn spring-boot:run -Pehcache`.
specify the location to the provider-specific file via the
`spring.cache.jcache.config` property. TIP: Refer to the documentation of the JSR-107 implementation you want to use: certain
cache providers do not create a default cache on-the-fly if it does not exist so you might
need to update the sample to create the caches on startup or specify the location to the
provider-specific file via the `spring.cache.jcache.config` property.
NOTE: Any other JSR-107 compliant provider is also supported but Spring Boot may not NOTE: Any other JSR-107 compliant provider is also supported but Spring Boot may not
offer a dependency management entry for it. You will have to add it with the version offer a dependency management entry for it. You will have to add it with the version

9
spring-boot-samples/spring-boot-sample-cache/pom.xml
View File

@ -45,15 +45,6 @@
</plugins> </plugins>
</build> </build>
<profiles> <profiles>
<profile>
<id>jcache</id>
<dependencies>
<dependency>
<groupId>javax.cache</groupId>
<artifactId>cache-api</artifactId>
</dependency>
</dependencies>
</profile>
<profile> <profile>
<id>caffeine</id> <id>caffeine</id>
<dependencies> <dependencies>

4
spring-boot-samples/spring-boot-sample-cache/src/main/resources/application.properties
View File

@ -3,13 +3,13 @@ management.endpoints.web.exposure.include=*
# #
# Infinispan configuration file location. # Infinispan configuration file location.
# #
spring.cache.infinispan.config=infinispan.xml spring.cache.infinispan.config=classpath:infinispan.xml
# #
# JCache configuration (example with ehcache 3). # JCache configuration (example with ehcache 3).
# #
#spring.cache.jcache.config=ehcache3.xml #spring.cache.jcache.config=classpath:ehcache3.xml
# #