Commit Graph

6962 Commits

Author SHA1 Message Date
Andy Wilkinson
01b8e2c834 Polish “Replace custom Neo4j container with Testcontainers version”
See gh-15638
2019-02-12 09:25:07 +00:00
Michael Simons
316126e8f0 Replace custom Neo4j container with Testcontainers version
See gh-15638
2019-02-12 09:24:44 +00:00
Andy Wilkinson
8e0cc278b2 Merge branch '2.1.x' 2019-02-11 20:00:09 +00:00
Andy Wilkinson
a5aceb35d7 Upgrade to Testcontainers 1.10.6
Closes gh-15893
2019-02-11 19:59:32 +00:00
Andy Wilkinson
6fe226d781 Merge branch '2.1.x' 2019-02-11 17:38:24 +00:00
Andy Wilkinson
20f26c4d30 Polish "Fix stopping of Embedded Mongo before context is closed"
See gh-15692
2019-02-11 17:34:40 +00:00
Eugene
750246f021 Fix stopping of Embedded Mongo before context is closed
See gh-15692
2019-02-11 17:33:59 +00:00
Johnny Lim
9f6c5e4e39 Polish 2019-02-11 17:19:19 +00:00
Andy Wilkinson
b5c9afc055 Merge branch '2.1.x' 2019-02-11 17:12:51 +00:00
Andy Wilkinson
295a660e35 Polish "Set NO_REQUEST_TIMEOUT as a server option not a socket option"
See gh-15822
2019-02-11 17:11:20 +00:00
ayudovin
dbce3731a4 Set NO_REQUEST_TIMEOUT as a server option not a socket option
See gh-15822
2019-02-11 17:08:16 +00:00
dreis2211
3fb87a4506 Clean up SpringPropertyAction.getValue()
See gh-15885
2019-02-11 16:58:40 +00:00
Andy Wilkinson
648cbaaceb Merge pull request #15854 from Camille Vienot
* gh-15854:
  Polish "Remove dependency management for xml-apis"
  Remove dependency management for xml-apis

Closes gh-15854
2019-02-11 16:54:13 +00:00
Andy Wilkinson
c2c971e755 Polish "Remove dependency management for xml-apis"
See gh-15854
2019-02-11 16:53:05 +00:00
Camille Vienot
c7dba26812 Remove dependency management for xml-apis
See gh-15854
2019-02-11 16:52:44 +00:00
Andy Wilkinson
c6a1df6cd4 Merge branch '2.1.x' 2019-02-11 16:42:29 +00:00
Jeffrey van der Laan
4f86233ca7 Do not auto-configure OEMIV filter when user defines registration bean
See gh-15889
2019-02-11 16:33:06 +00:00
Andy Wilkinson
d9ec48ef12 Merge branch '2.1.x' 2019-02-11 16:13:52 +00:00
Andy Wilkinson
3f32fbd0de Polish "Remove unwanted @Nullable annotations"
See gh-15876
2019-02-11 16:11:40 +00:00
wonwoo
2855321074 Remove unwanted @Nullable annotations
See gh-15876
2019-02-11 16:07:29 +00:00
Andy Wilkinson
2cda30988e Merge branch '2.1.x' 2019-02-11 16:00:55 +00:00
Andy Wilkinson
6fe9e3a0e1 Test the Gradle plugin against Gradle 5.2.1
Closes gh-15892
2019-02-11 15:51:14 +00:00
Andy Wilkinson
4faa0f51b7 Polish "Test the Gradle plugin against Gradle 4.10.3 and 5.1.1"
Closes gh-15791
2019-02-11 15:49:59 +00:00
dreis2211
1de372d896 Test the Gradle plugin against Gradle 4.10.3 and 5.1.1
See gh-15791
2019-02-11 15:35:06 +00:00
dreis2211
1c50e7cf87 Polish
Closes gh-15823
2019-02-10 10:36:37 +01:00
Kedar Joshi
4a253ff87c Polish
1. Removed unnecessary null checks
2. Combined collection initialization and modification
3. Minor collections related optimizations

Closes gh-15837
2019-02-10 10:35:36 +01:00
tim-toady
4acebf45be Fix broken link to Appendix
Closes gh-15883
2019-02-09 09:34:49 +01:00
Madhura Bhave
4d69e127c8 Merge branch '2.1.x' 2019-02-08 18:38:21 -08:00
Madhura Bhave
26da45aa9a Configure a JerseyApplicationPath bean for the actuators
This commit also ensures that Jersey-based actuator endpoints are
available before the user has configured a `ResourceConfig` bean

Fixes gh-15625
Fixes gh-15877
2019-02-08 18:38:01 -08:00
Brian Clozel
8bcbcf6c27 Merge branch '2.1.x' 2019-02-08 19:48:49 +01:00
Brian Clozel
c24f02696f Upgrade to Californium-BUILD-SNAPSHOT
See gh-15878
2019-02-08 19:45:24 +01:00
Madhura Bhave
8528f7c140 Make spring.profiles.include behave consistently
Previously, if profiles were included via a property source with higher
precedence than config files, profiles activated via config files would
not be taken into account. This commit makes spring.profiles.include
behave consistently where it adds to active profiles rather than replacing
them, regardless of property source.

Fixes gh-15344
2019-02-08 10:28:52 -08:00
Brian Clozel
99656b9dd8 Merge branch '2.1.x' 2019-02-08 18:35:12 +01:00
Brian Clozel
72c8e5d366 Collect HTTP trace at commit time for WebFlux
Prior to this commit, the `HttpTraceWebFilter` would collect the
response information (status and headers) for tracing purposes, after
the handling chain is done with the exchange - inside a
`doAfterSuccessOrError`.

Once the handler has processed the exchange, there is no strong
guarantee about the HTTP resources being still present. Depending on the
web server implementation, HTTP resources (including HTTP header maps)
might be recycled, because pooled in the first place.

This commit moves the collection and processing of the HTTP trace right
before the response is committed. This removes the need to handle
special cases with exceptions, since by that time all exception handlers
have processed the response and the information that we extract is the
information that's about to be written to the network.

Fixes gh-15819
2019-02-08 18:16:39 +01:00
Brian Clozel
e8fef97335 Merge branch '2.1.x' 2019-02-08 12:29:39 +01:00
Brian Clozel
cba6079b7b Log unhandled server exceptions in WebFlux
Prior to this commit, errors unhandled by custom `WebExceptionHandler`
and resulting in an HTTP 500 status would not be logged at ERROR level,
giving no information to developers about the actual exception.

This commit ensures that such exceptions are logged at the ERROR level
with their exception. By the time the exception hits the
`DefaultErrorWebExceptionHandler`, if the response is already committed
or if the exception is due to a client disconnecting, the error is
delegated to Framework support as Spring Boot won't be able to render an
error page as expected.

Fixes gh-15769
2019-02-08 12:25:05 +01:00
Stephane Nicoll
380d7ec01c Merge branch '2.1.x' 2019-02-08 09:21:06 +01:00
Johnny Lim
885c28891b Polish
Closes gh-15873
2019-02-08 09:20:15 +01:00
Stephane Nicoll
9eccf6c367 Merge branch '2.1.x' 2019-02-08 08:45:43 +01:00
dreis2211
48295e16fc Fix assertion
Closes gh-15871
2019-02-08 08:45:12 +01:00
Madhura Bhave
e3fad4e973 Merge branch '2.1.x' 2019-02-07 16:42:10 -08:00
Madhura Bhave
dc31f617b3 Document limitations of YAML documents & profile-specific files
Fixes gh-15790
2019-02-07 16:40:53 -08:00
Andy Wilkinson
88f563ab4f Merge branch '2.1.x' 2019-02-07 14:36:19 +00:00
Andy Wilkinson
688eb894d0 Start building against Micrometer 1.1.3 snapshots
See gh-15869
2019-02-07 12:44:10 +00:00
Andy Wilkinson
4efca4a455 Start building against Spring Session Bean-SR3 snapshots
See gh-15868
2019-02-07 12:43:26 +00:00
Andy Wilkinson
01693bb1fd Start building against Spring Kafka 2.2.4 snapshots
See gh-15867
2019-02-07 12:42:45 +00:00
Andy Wilkinson
474a706cc3 Start building against Spring Integration 5.1.3 snapshots
See gh-15866
2019-02-07 12:42:09 +00:00
Andy Wilkinson
245d3cf9f4 Start building against Spring AMQP 2.1.4 snapshots
See gh-15865
2019-02-07 12:41:28 +00:00
Andy Wilkinson
96cf7b1e64 Start building against Spring Data Lovelace-SR5 snapshots
See gh-15864
2019-02-07 12:40:49 +00:00
Andy Wilkinson
333fe77f58 Start building against Spring Security 5.1.4 snapshots
See gh-15863
2019-02-07 12:40:11 +00:00