Commit Graph

2076 Commits

Author SHA1 Message Date
Stephane Nicoll
00a43d8f4d Merge branch '2.0.x' 2018-05-11 10:01:30 +02:00
Johnny Lim
75e591e76e Polish
Closes gh-13130
2018-05-11 10:00:15 +02:00
Stephane Nicoll
c35cb1b69f Merge branch '2.0.x' 2018-05-11 09:57:18 +02:00
Stephane Nicoll
4683940423 Merge branch '1.5.x' into 2.0.x 2018-05-11 09:56:54 +02:00
Stephane Nicoll
a11acbc829 Merge branch '2.0.x' 2018-05-11 08:55:21 +02:00
Stephane Nicoll
4bec3b7cd9 Polish
See gh-13123
2018-05-11 08:55:03 +02:00
Madhura Bhave
ea99d8cab0 Merge branch '2.0.x' 2018-05-10 11:53:25 -07:00
Madhura Bhave
05cf8229d9 Fix tests 2018-05-10 11:50:43 -07:00
Madhura Bhave
36c89e2383 Merge branch '2.0.x' 2018-05-10 10:01:42 -07:00
Madhura Bhave
c937bb68a0 ServletEndpoints should take servletPath into account
Fixes gh-13106
2018-05-10 10:01:11 -07:00
Andy Wilkinson
0b76fc8f8e Merge branch '2.0.x' 2018-05-10 15:46:47 +01:00
Andy Wilkinson
fbf974478a Merge branch '1.5.x' into 2.0.x 2018-05-10 15:46:28 +01:00
Madhura Bhave
36c7602f2a Merge branch '2.0.x' 2018-05-09 12:04:34 -07:00
Madhura Bhave
4ec87956f9 Fix EndpointRequest include/exclude for ServletEndpoints
Fixes gh-13089
2018-05-09 12:01:58 -07:00
Stephane Nicoll
c72df104d8 Improve caches endpoint format
This commit adds an intermediate "caches" element so that additional
cache manager attributes can be added in the future.

Closes gh-13079
2018-05-09 11:08:23 +02:00
Andy Wilkinson
d77c4c83a1 Polish 2018-05-09 09:19:03 +01:00
Andy Wilkinson
a41c9eb736 Merge branch '2.0.x' 2018-05-09 09:14:48 +01:00
Andy Wilkinson
e14a2e33ab Deprecate queue size property for StatsD metrics export
Closes gh-13108
2018-05-09 09:14:09 +01:00
Andy Wilkinson
c826310fd1 Polish 2018-05-09 08:44:15 +01:00
Andy Wilkinson
56fa85f179 Merge branch '2.0.x' 2018-05-09 06:40:39 +01:00
Jon Schneider
c6860cb431 Upgrade to Micrometer 1.0.4
Closes gh-13108
2018-05-09 06:38:55 +01:00
Andy Wilkinson
33861b3608 Upgrade to Spring Integration 5.0.5.RELEASE
Closes gh-13016
2018-05-09 06:37:22 +01:00
Andy Wilkinson
ba407da259 Merge branch '2.0.x' 2018-05-08 21:21:29 +01:00
Andy Wilkinson
e407ed5f92 Upgrade to Spring Session Apple-SR2
Closes gh-13103
2018-05-08 21:21:08 +01:00
Andy Wilkinson
3a3eeb0caf Merge branch '2.0.x' 2018-05-08 21:12:58 +01:00
Andy Wilkinson
8ce4110966 Allow Jersey-based Actuator to be used with separate management port
Previously, when the Jersey-based Actuator was configure with a
separate management port, the resulting child context would fail to
start due to their being no ResourceConfigCustomizer beans available.

This commit updates the configuration so that the customizer's are
injected using an ObjectProvider and an empty list is used in the
event of their being no customizer beans. This aligns the child
context configuration class with JerseyAutoConfiguration which
already used this approach.

Closes gh-12975
2018-05-08 21:00:05 +01:00
Andy Wilkinson
e45384bdfa Upgrade to Spring Kafka 2.1.6.RELEASE
Closes gh-13018
2018-05-08 20:16:41 +01:00
Andy Wilkinson
5dbba99aed Merge branch '2.0.x' 2018-05-08 20:15:02 +01:00
Andy Wilkinson
7a53623e1c Polish "Clarify deployment of Spring Boot apps to App Engine Standard"
See gh-13090
2018-05-08 20:12:46 +01:00
ifigotin
676b013998 Clarify deployment of Spring Boot apps to App Engine Standard
Closes gh-13090
2018-05-08 20:12:33 +01:00
Andy Wilkinson
95c415fd93 Merge branch '2.0.x' 2018-05-08 17:08:04 +01:00
Andy Wilkinson
5168766ebb Upgrade to Spring Security 5.0.5.RELEASE
Closes gh-13029
2018-05-08 17:07:17 +01:00
Andy Wilkinson
bca2756b46 Upgrade to Jaybird 3.0.4
Closes gh-13100
2018-05-08 17:06:55 +01:00
Andy Wilkinson
47c45539d9 Upgrade to Lettuce 5.0.4.RELEASE
Closes gh-13099
2018-05-08 17:06:40 +01:00
Stephane Nicoll
8fc997243a Merge branch '2.0.x' 2018-05-08 17:23:01 +02:00
Stephane Nicoll
f9134c9325 Upgrade to Spring Data Kay SR7
Closes gh-13017
2018-05-08 17:22:01 +02:00
Andy Wilkinson
e4bdf4e513 Polish 2018-05-08 12:14:39 +01:00
Andy Wilkinson
a1bea69555 Make Elasticsearch dependency available to javadoc generation
See gh-12600
2018-05-08 12:12:21 +01:00
Stephane Nicoll
503faf3153 Merge branch '2.0.x' 2018-05-08 12:45:17 +02:00
Stephane Nicoll
6577513464 Upgrade to Spring Framework 5.0.6.RELEASE
Closes gh-13021
2018-05-08 12:44:55 +02:00
Andy Wilkinson
5b26974000 Merge branch '2.0.x' 2018-05-08 11:30:37 +01:00
Andy Wilkinson
874650cb33 Merge branch '1.5.x' into 2.0.x 2018-05-08 11:30:30 +01:00
Brian Clozel
84c9a65e9d Auto-configure Elasticsearch REST clients
This commit adds auto-configuration support for both `RestClient` and
`RestHighLevelClient` which are provided by `elasticsearch-rest-client`
and `elasticsearch-rest-high-level-client` dependencies respectively.

`RestClient` is associated with configuration properties in the
`spring.elasticsearch.rest.*` namespace, since this is the component
taking care of HTTP communication with the actual Elasticsearch node.

`RestHighLevelClient` wraps the first one and naturally inherits that
configuration.

Closes gh-12600
2018-05-07 17:57:09 +02:00
Johnny Lim
96ce71ddc4 Polish
Closes gh-13078
2018-05-07 14:55:13 +02:00
Stephane Nicoll
3ad8f3fcbf Merge branch '2.0.x' 2018-05-07 14:53:58 +02:00
Stephane Nicoll
9dccf5b895 Polish
See gh-13078
2018-05-07 14:48:56 +02:00
Stephane Nicoll
7f50d49251 Merge branch '2.0.x' 2018-05-07 14:42:39 +02:00
dreis2211
15d67d6b12 Remove MockServletWebServer.emptyEnumeration()
Closes gh-13084
2018-05-07 14:41:06 +02:00
Stephane Nicoll
9cf68a2de4 Merge branch '2.0.x' 2018-05-07 14:38:52 +02:00
dreis2211
e3862d9bdf Fix deprecation warning in OriginTrackedYamlLoader
Closes gh-13085
2018-05-07 14:38:22 +02:00