Commit Graph

14435 Commits

Author SHA1 Message Date
Andy Wilkinson
6cae9257fe Merge branch '1.5.x' 2017-11-29 20:33:38 +00:00
Andy Wilkinson
a491727b7c Avoid creating unnecessary garbage during URL normalization
Closes gh-11207
2017-11-29 20:33:02 +00:00
Phillip Webb
07b7d1cbb1 Merge pull request #11206 from izeye/polish-20171130
* pr/11206:
  Polish
2017-11-29 09:37:49 -08:00
Johnny Lim
44299bb980 Polish
Closes gh-11206
2017-11-29 09:37:36 -08:00
Phillip Webb
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
Phillip Webb
d7251f52a4 Polish 2017-11-29 09:09:53 -08:00
Andy Wilkinson
159a758e19 Revert change accidentally committed in eb6182f5 2017-11-29 14:38:38 +00:00
Stephane Nicoll
b365e37850 Fix typo
Closes gh-11204
2017-11-29 14:25:32 +01:00
Stephane Nicoll
9965221378 Merge branch '1.5.x' 2017-11-29 14:21:45 +01:00
Stephane Nicoll
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
Sylwester Lachiewicz
0a6f5fb2be Update Apache Maven Central repository url
Closes gh-11190
2017-11-29 14:19:15 +01:00
Andy Wilkinson
eb6182f587 Remove redundant commons-logging exclusions
Closes gh-11148
2017-11-29 13:17:01 +00:00
Andy Wilkinson
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
Brian Clozel
8b98db401c Polish
Closes gh-11090
2017-11-29 12:00:00 +01:00
Brian Clozel
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
Stephane Nicoll
6be30045ec Polish
See gh-11071
2017-11-29 11:44:46 +01:00
Stephane Nicoll
d5c32333d5 Merge branch '1.5.x' 2017-11-29 11:19:24 +01:00
Stephane Nicoll
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
Sylwester Lachiewicz
7224d35322 Fix typo in StringUtils import
Closes gh-11189
2017-11-29 11:16:45 +01:00
Brian Clozel
e3c3bb0076 Rename spring.cache.control to spring.cache.cachecontrol
Closes #11090
2017-11-29 11:14:31 +01:00
Stephane Nicoll
55f7b3a535 Rename nettyServerCustomizers to serverCustomizers
Closes gh-11155
2017-11-29 11:11:00 +01:00
Stephane Nicoll
9044b5a215 Merge pull request #11193 from izeye:polish-20171129
* pr/11193:
  Polish
2017-11-29 10:50:58 +01:00
Johnny Lim
952224ef56 Polish
Closes gh-11193
2017-11-29 10:50:42 +01:00
Stephane Nicoll
33bd7ccc91 Merge branch '1.5.x' 2017-11-29 10:47:52 +01:00
Stephane Nicoll
d920b49ba1 Polish
See gh-11193
2017-11-29 10:47:09 +01:00
Brian Clozel
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
Phillip Webb
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
Madhura Bhave
9e95483645 Add cloudfoundry health extensions
Fixes gh-11192
2017-11-28 18:49:17 -08:00
Phillip Webb
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
Phillip Webb
e1306c6228 Polish micrometer rc.5 upgrade
Closes gh-11071
2017-11-28 16:58:53 -08:00
Jon Schneider
2e0a915281 Upgrade to micrometer 1.0.0-rc.5
See gh-11071
2017-11-28 16:58:53 -08:00
Phillip Webb
24f681826c Upgrade to artifactory resource 0.0.3
Fixes gh-10832
2017-11-28 16:23:02 -08:00
Phillip Webb
960083bd33 Polish 2017-11-28 16:21:09 -08:00
Madhura Bhave
2319d01feb Prevent race condition in ReactiveTokenValidator 2017-11-28 14:24:22 -08:00
Stephane Nicoll
85ba361198 Upgrade to Spring Integration 5.0.0.RELEASE
Closes gh-11085
2017-11-28 22:54:12 +01:00
Andy Wilkinson
acce64b47b Upgrade to Spring Amqp 2.0.1.RELEASE
Closes gh-11186
2017-11-28 18:45:28 +00:00
Andy Wilkinson
2db40db27a Upgrade to Groovy 2.5.0-beta-2
Closes gh-11184
2017-11-28 18:29:05 +00:00
Andy Wilkinson
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
Andy Wilkinson
1fbf5f5b27 Complete the removal of Spring Social starters and auto-configuration
Closes gh-11117
2017-11-28 15:32:19 +00:00
Craig Walls
64d02f8bb5 Remove Spring Social starters and auto-configuration
See gh-11117
2017-11-28 14:53:36 +00:00
Andy Wilkinson
93cac333e8 Clean up logging dependencies and exclusions
Closes gh-11148
2017-11-28 13:05:05 +00:00
Andy Wilkinson
74200f27a6 Drop jackson-module-kotlin from spring-boot-starter-json
Previously, a dependency on jackson-module-kotlin with Kotlin excluded
was added to spring-boot-starter-json. This gave Kotlin users a smooth
experience with Jackson and JSON at minimal, we thought, cost to other
users. We have since learned that this arrangement causes a
ClassNotFoundException at runtime when Jackson is configured to find
modules via the service loader. This makes the cost of including
jackson-module-kotlin to high for non-Kotlin users so this commit
removes it.

Closes gh-11133
2017-11-28 12:41:37 +00:00
Andy Wilkinson
579b36b502 Upgrade to Spring REST Docs 2.0.0.RELEASE
Closes gh-11174
2017-11-28 12:38:30 +00:00
Andy Wilkinson
bead5cfd2e Ignore duplicate module-info when validating starter dependencies
See gh-11178
2017-11-28 12:35:41 +00:00
Stephane Nicoll
ce97fe8bf8 Merge branch '1.5.x' 2017-11-28 12:28:44 +01:00
Stephane Nicoll
8efb608b7e Fixup version numbers following release 2017-11-28 12:28:33 +01:00
Andy Wilkinson
a803b88b03 Upgrade to Rxjava2 2.1.7
Closes gh-11180
2017-11-28 11:07:03 +00:00
Andy Wilkinson
22a426fe39 Polish 2017-11-28 10:50:28 +00:00
Andy Wilkinson
a454c1c121 Upgrade to Selenium Htmlunit 2.28.2
Closes gh-11179
2017-11-28 10:50:28 +00:00
Andy Wilkinson
69dcead839 Upgrade to Log4j2 2.10.0
Closes gh-11178
2017-11-28 10:50:28 +00:00