a4913712cb
Do not expose the composite ReactiveHealthIndicator as a bean
...
Previously, a `ReactiveHealthIndicator` bean was exposed to define the
health indicator to use for the reactive endpoint. Having it exposed as
a bean has the side effect that the regular `HealthIndicator` composite
is picked up and a "reactive" entry is added to the health details.
This commit creates such indicator internally as it should be.
Closes gh-11222
2017-12-02 08:29:07 +01:00
5dc28ec446
Merge branch '1.5.x'
2017-11-30 18:01:36 +01:00
7b8adfab41
Polish
2017-11-30 18:00:43 +01:00
e16579b416
Support Integer to Duration conversion during property binding
...
Closes gh-11216
2017-11-30 12:30:42 +00:00
8aeb245393
Merge pull request #11213 from vpavic:fix-docs
...
* pr/11213:
Polish "Update documentation references to `/status` endpoint"
Update documentation references to `/status` endpoint
2017-11-30 11:42:40 +01:00
a43dcfec6c
Polish "Update documentation references to `/status` endpoint"
...
Closes gh-11213
2017-11-30 11:42:06 +01:00
e88c266285
Update documentation references to `/status` endpoint
...
See gh-11213
2017-11-30 11:20:29 +01:00
a7fac3cbae
Merge pull request #11202 from ptahchiev:11201
...
* pr/11202:
Polish "Fix NullPointer when requesting a session that does not exist"
Fix NullPointer when requesting a session that does not exist
2017-11-30 10:05:49 +01:00
b6609ff392
Polish "Fix NullPointer when requesting a session that does not exist"
...
Closes gh-11202
2017-11-30 10:05:30 +01:00
35c6dc4e3b
Fix NullPointer when requesting a session that does not exist
...
See gh-11202
2017-11-30 09:56:43 +01:00
6cae9257fe
Merge branch '1.5.x'
2017-11-29 20:33:38 +00:00
a491727b7c
Avoid creating unnecessary garbage during URL normalization
...
Closes gh-11207
2017-11-29 20:33:02 +00:00
07b7d1cbb1
Merge pull request #11206 from izeye/polish-20171130
...
* pr/11206:
Polish
2017-11-29 09:37:49 -08:00
44299bb980
Polish
...
Closes gh-11206
2017-11-29 09:37:36 -08:00
7ebe4935ac
Restore dependency in `maven-shade-plugin`
...
Restore `spring-boot-maven-plugin` dependency in `maven-shade-plugin`
starter configuration. Required so that the shade plugin can use
`PropertiesMergingResourceTransformer` if wanted.
Fixes gh-11200
2017-11-29 09:30:53 -08:00
d7251f52a4
Polish
2017-11-29 09:09:53 -08:00
159a758e19
Revert change accidentally committed in eb6182f5
2017-11-29 14:38:38 +00:00
b365e37850
Fix typo
...
Closes gh-11204
2017-11-29 14:25:32 +01:00
9965221378
Merge branch '1.5.x'
2017-11-29 14:21:45 +01:00
5fd529279d
Merge pull request #11190 from slachiewicz:fix/maven-central-url
...
* pr/11190:
Update Apache Maven Central repository url
2017-11-29 14:20:29 +01:00
0a6f5fb2be
Update Apache Maven Central repository url
...
Closes gh-11190
2017-11-29 14:19:15 +01:00
eb6182f587
Remove redundant commons-logging exclusions
...
Closes gh-11148
2017-11-29 13:17:01 +00:00
80543250a2
Rework properties for enabling Spring Data repositories
...
Rather than using two properties to enable or disable reactive and
imperative repositories for a particular store, this commit introduces
a new repository type condition that's backed by a single
spring.data.<store>.repositories.type property. The type can be
auto (automatically enables whatever's available), imperative (enables
imperative repositories), none (enables nothing), or reactive (enables
reactive repositories). The default is auto.
Repositories do not have a reactive option (such as JPA) continue to
have a spring.data.<store>.repositories.enabled property that takes a
boolean value.
Closes gh-11134
2017-11-29 13:02:45 +00:00
8b98db401c
Polish
...
Closes gh-11090
2017-11-29 12:00:00 +01:00
de208cd372
Do not handle WebFlux errors if response is committed
...
If the WebFlux handler commits the response but still sends an error
signal in the reactive pipeline, Spring Boot error handling should not
try to handle that error: once committed, it is impossible to change the
response status or the response headers. Writing to the body might also
lead to invalid responses.
This commit skips error handling if the response is committed and
delegates to Spring Framework's `HttpWebHandlerAdapter` which will log
the error.
Fixes gh-11168
2017-11-29 11:45:12 +01:00
6be30045ec
Polish
...
See gh-11071
2017-11-29 11:44:46 +01:00
d5c32333d5
Merge branch '1.5.x'
2017-11-29 11:19:24 +01:00
ac316b502d
Merge pull request #11189 from slachiewicz:fix/plexus-typo
...
* pr/11189:
Fix typo in StringUtils import
2017-11-29 11:17:14 +01:00
7224d35322
Fix typo in StringUtils import
...
Closes gh-11189
2017-11-29 11:16:45 +01:00
e3c3bb0076
Rename spring.cache.control to spring.cache.cachecontrol
...
Closes #11090
2017-11-29 11:14:31 +01:00
55f7b3a535
Rename nettyServerCustomizers to serverCustomizers
...
Closes gh-11155
2017-11-29 11:11:00 +01:00
9044b5a215
Merge pull request #11193 from izeye:polish-20171129
...
* pr/11193:
Polish
2017-11-29 10:50:58 +01:00
952224ef56
Polish
...
Closes gh-11193
2017-11-29 10:50:42 +01:00
33bd7ccc91
Merge branch '1.5.x'
2017-11-29 10:47:52 +01:00
d920b49ba1
Polish
...
See gh-11193
2017-11-29 10:47:09 +01:00
ee62633e33
Auto-Configure Freemarker in WebFlux
...
This commit adds support for basic auto-configuration for the Freemarker
template engine in WebFlux.
A few configuration properties in the `spring.freemarker.*` namespace
aren't supported yet, since they mostly apply to MVC (Servlet request
and session attributes).
Closes gh-10094
2017-11-29 10:37:39 +01:00
2c959b8e2a
Polish health indicators
...
Align reactive and non-reactive web extensions and update `showDetails`
so that it only applies to web exposure.
See gh-11113
See gh-11192
2017-11-28 21:19:53 -08:00
9e95483645
Add cloudfoundry health extensions
...
Fixes gh-11192
2017-11-28 18:49:17 -08:00
1bdd42e379
Merge pull request #11071 from jkschneider/micrometer-rc4
...
* pr/11071:
Polish micrometer rc.5 upgrade
Upgrade to micrometer 1.0.0-rc.5
2017-11-28 17:32:11 -08:00
e1306c6228
Polish micrometer rc.5 upgrade
...
Closes gh-11071
2017-11-28 16:58:53 -08:00
2e0a915281
Upgrade to micrometer 1.0.0-rc.5
...
See gh-11071
2017-11-28 16:58:53 -08:00
24f681826c
Upgrade to artifactory resource 0.0.3
...
Fixes gh-10832
2017-11-28 16:23:02 -08:00
960083bd33
Polish
2017-11-28 16:21:09 -08:00
2319d01feb
Prevent race condition in ReactiveTokenValidator
2017-11-28 14:24:22 -08:00
85ba361198
Upgrade to Spring Integration 5.0.0.RELEASE
...
Closes gh-11085
2017-11-28 22:54:12 +01:00
acce64b47b
Upgrade to Spring Amqp 2.0.1.RELEASE
...
Closes gh-11186
2017-11-28 18:45:28 +00:00
2db40db27a
Upgrade to Groovy 2.5.0-beta-2
...
Closes gh-11184
2017-11-28 18:29:05 +00:00
abe010aba8
Merge pull request #11117 from Craig Walls
...
* gh-11117:
Complete the removal of Spring Social starters and auto-configuration
Remove Spring Social starters and auto-configuration
2017-11-28 15:33:37 +00:00
1fbf5f5b27
Complete the removal of Spring Social starters and auto-configuration
...
Closes gh-11117
2017-11-28 15:32:19 +00:00
64d02f8bb5
Remove Spring Social starters and auto-configuration
...
See gh-11117
2017-11-28 14:53:36 +00:00
Stephane Nicoll
Andy Wilkinson
Vedran Pavic
petar.tahchiev
Phillip Webb
Johnny Lim
Sylwester Lachiewicz
Brian Clozel
Madhura Bhave
Jon Schneider
Craig Walls