3419 Commits

Author SHA1 Message Date
Andy Wilkinson
5702f9ebc3 Merge branch '2.7.x' 2022-03-23 20:16:51 +00:00
Andy Wilkinson
5d55c663ba Allow spring.data.mongodb.uri to take precedence over separate props
Closes gh-30067
2022-03-23 20:15:04 +00:00
Andy Wilkinson
77e6279d03 Merge branch '2.7.x' 2022-03-23 12:11:24 +00:00
Andy Wilkinson
3255da23a2 Merge branch '2.6.x' into 2.7.x
Closes gh-30388
2022-03-23 12:11:13 +00:00
Andy Wilkinson
c739831087 Merge branch '2.5.x' into 2.6.x
Closes gh-30387
2022-03-23 12:11:02 +00:00
Andy Wilkinson
d8cf332c2e Document default value of spring.thymeleaf.reactive.media-types
Closes gh-30280
2022-03-23 12:09:48 +00:00
Andy Wilkinson
3ee44ca0b0 Merge branch '2.6.x' into 2.7.x
Closes gh-30386
2022-03-23 11:47:53 +00:00
Andy Wilkinson
f378627f94 Merge branch '2.5.x' into 2.6.x
Closes gh-30385
2022-03-23 11:45:31 +00:00
Andy Wilkinson
8d882fa09b Fix possible duplicate templateEngine bean in Thymeleaf auto-config
Closes gh-30384
2022-03-23 11:44:59 +00:00
Andy Wilkinson
3410dd67d0 Merge branch '2.7.x' 2022-03-23 09:58:56 +00:00
Andy Wilkinson
47540eec61 Align default indices options with Spring Data Elasticsearch
Closes gh-30378
2022-03-23 09:39:05 +00:00
Andy Wilkinson
c4425598cf Merge branch '2.7.x' 2022-03-22 20:13:16 +00:00
Andy Wilkinson
79ee53a587 Merge branch '2.6.x' into 2.7.x
Closes gh-30377
2022-03-22 20:13:04 +00:00
Andy Wilkinson
f063da30d2 Merge branch '2.5.x' into 2.6.x
Closes gh-30376
2022-03-22 20:12:48 +00:00
Andy Wilkinson
a8bddeb9cf Remove redundant setting of refresh policy
Closes gh-30375
2022-03-22 20:12:09 +00:00
Brian Clozel
bae62c39a9 Adapt to latest Spring GraphQL changes
This commit adapts to the latest Spring GraphQL changes, renaming
`GraphQlService` to `ExecutionGraphQlService` as well as the
`WebInterceptor` contract to `WebGraphQlHandlerInterceptor`.

See spring-projects/spring-graphql#332
2022-03-21 11:12:59 +01:00
Stephane Nicoll
2088381d4b Merge branch '2.7.x' 2022-03-21 10:06:56 +01:00
Stephane Nicoll
a2959bbcf2 Polish "Add support for cache2k in memory caching"
See gh-28498
2022-03-21 09:59:24 +01:00
Jens Wilke
774f61fcb5 Add support for cache2k in memory caching
See gh-28498
2022-03-21 08:22:19 +01:00
Chris Dennis
3ed3d3eb36 Restore Ehcache 3 Support
See gh-30002
2022-03-19 09:33:47 +01:00
Scott Frederick
cabfb98a89 Merge branch '2.7.x' 2022-03-18 16:52:47 -05:00
Scott Frederick
a14f3ed200 Use a ConfigurationProperties class for JMX properties
Closes gh-30327
2022-03-18 16:32:13 -05:00
Scott Frederick
e5a09b3b31 Apply unique-names consistently in JmxAutoConfiguration
Ensure that the `spring.jmx.unique-names` property is applied to the
auto-configured `MBeanExporter` as well as the `ObjectNamingStrategy`.

Fixes gh-29968
2022-03-18 16:32:13 -05:00
Stephane Nicoll
1169c6df16 Upgrade to Neo4j Java Driver 4.4.5
Closes gh-30326
2022-03-18 18:34:09 +01:00
Andy Wilkinson
12d9127d3b Merge branch '2.7.x' 2022-03-18 15:56:29 +00:00
Andy Wilkinson
c2d7e21312 Merge branch '2.6.x' into 2.7.x
Closes gh-30322
2022-03-18 15:56:13 +00:00
Andy Wilkinson
26719a211b Merge branch '2.5.x' into 2.6.x
Closes gh-30321
2022-03-18 15:55:39 +00:00
Andy Wilkinson
1669062231 Apply server.tomcat.keep-alive-timeout to HTTP/2
Closes gh-30267
2022-03-18 15:38:27 +00:00
Stephane Nicoll
39b6f2bd7d Merge branch '2.7.x' 2022-03-18 15:08:28 +01:00
Stephane Nicoll
2ab0ce3ea7 Upgrade to Neo4j Java Driver 4.4.5
Closes gh-30303
2022-03-18 14:52:46 +01:00
Andy Wilkinson
dd812a3f76 Upgrade to Groovy 4.0.1
Closes gh-30279
2022-03-18 12:38:41 +00:00
Andy Wilkinson
e60001fb16 Adapt to deprecations in Spring Data Redis
See gh-30200
2022-03-18 11:16:55 +00:00
Stephane Nicoll
2fbb36bd04 fixup! Upgrade to Flyway 8.5.4 2022-03-18 10:57:07 +01:00
Andy Wilkinson
f693d7dfad Merge branch '2.7.x' 2022-03-17 20:12:12 +00:00
Andy Wilkinson
b787ea4802 Add property for media types of reactive Mustache views
Closes gh-28858
2022-03-17 20:10:37 +00:00
Andy Wilkinson
36f24cf6bb Merge branch '2.7.x' 2022-03-17 19:31:59 +00:00
Andy Wilkinson
3a5a748ec0 Rework Mustache properties to show which are Servlet-specific
Closes gh-30273
2022-03-17 19:25:07 +00:00
Andy Wilkinson
6625a77f64 Merge branch '2.7.x' 2022-03-17 17:51:43 +00:00
Andy Wilkinson
2ba064c855 Merge branch '2.6.x' into 2.7.x
Closes gh-30277
2022-03-17 17:51:28 +00:00
Andy Wilkinson
3c117ca2d4 Merge branch '2.5.x' into 2.6.x
Closes gh-30276
2022-03-17 17:50:58 +00:00
Andy Wilkinson
2b75ea5fb8 Improve testing of spring.mustache.* properties
Closes gh-30274
2022-03-17 17:40:22 +00:00
Stephane Nicoll
1784fc19bb Adapt mock to API change 2022-03-17 10:34:22 +01:00
Andy Wilkinson
f3f5a87af4 Merge branch '2.7.x' 2022-03-16 19:42:36 +00:00
Andy Wilkinson
fee3b89b1b Merge branch '2.6.x' into 2.7.x
Closes gh-30257
2022-03-16 19:42:14 +00:00
Andy Wilkinson
cdaafce614 Merge branch '2.5.x' into 2.6.x
Closes gh-30256
2022-03-16 19:41:14 +00:00
Andy Wilkinson
7f036e35fd Make MustacheViewResolvers conditional onspring.mustache.enabled
Closes gh-30250
2022-03-16 19:09:13 +00:00
Andy Wilkinson
09510db630 Merge branch '2.7.x' 2022-03-16 17:07:29 +00:00
Andy Wilkinson
81383e552a Merge branch '2.6.x' into 2.7.x
Closes gh-30254
2022-03-16 17:06:43 +00:00
Andy Wilkinson
6bc000565d Merge branch '2.5.x' into 2.6.x
Closes gh-30253
2022-03-16 17:06:17 +00:00
Andy Wilkinson
0accc3d67d Convert MustacheAutoConfigurationTests to application context runner
Closes gh-30252
2022-03-16 15:28:48 +00:00