Stephane Nicoll
00a43d8f4d
Merge branch '2.0.x'
2018-05-11 10:01:30 +02:00
Stephane Nicoll
6ddf1c27dd
Merge pull request #13130 from izeye:polish-20180510
...
* pr/13130:
Polish
2018-05-11 10:00:41 +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
b17a00d0c3
Merge pull request #13117 from reegnz:feature/support-jersey-wrapping-resource-config
...
* pr/13117:
Polish "Add support for Jersey WrappingResourceConfig"
Add support for Jersey WrappingResourceConfig
2018-05-11 09:52:30 +02:00
Stephane Nicoll
b48f34117e
Polish "Add support for Jersey WrappingResourceConfig"
...
Closes gh-13117
2018-05-11 09:29:36 +02:00
Zoltan Reegn
dfcd87207f
Add support for Jersey WrappingResourceConfig
...
See gh-13117
2018-05-11 09:29:09 +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
Andy Wilkinson
c8b3cea200
Clarify that registration bean URL patterns use Servlet spec format
...
Closes gh-13080
2018-05-10 15:45:16 +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
Andy Wilkinson
bdfcb0dc81
Merge branch '2.0.x'
2018-05-09 17:35:31 +01:00
Spring Buildmaster
81a4e5d58c
Next development version (v2.0.3.BUILD-SNAPSHOT)
2018-05-09 14:10:31 +00:00
Andy Wilkinson
dd76766a8d
Merge branch '2.0.x'
2018-05-09 14:06:55 +01:00
Andy Wilkinson
47138af538
Correct the CI badge and link for 2.0.x builds
2018-05-09 14:06:32 +01:00
Andy Wilkinson
073849b9e5
Merge branch '2.0.x'
2018-05-09 11:26:12 +01:00
Andy Wilkinson
989975bb67
Merge branch '1.5.x' into 2.0.x
2018-05-09 11:25:48 +01:00
Andy Wilkinson
d2cef484cb
Fix up version numbers following release
2018-05-09 11:25:21 +01:00
Spring Buildmaster
010b4fccbd
Next development version
2018-05-09 09:31:46 +00: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
Andy Wilkinson
ba16f135a6
Merge pull request #13108 from Jon Schneider
...
* gh-13108:
Upgrade to Micrometer 1.0.4
2018-05-09 06:39:33 +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
2cb775a90c
Merge branch '1.5.x' into 2.0.x
2018-05-09 06:36:07 +01:00
Andy Wilkinson
7cfaf5e287
Upgrade to Spring Integration 4.3.16.RELEASE
...
Closes gh-13015
2018-05-09 06:35:29 +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
8e909f69af
Merge branch '2.0.x'
2018-05-08 20:17:37 +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
3243ccd8b3
Merge pull request #13090 from ifigotin
...
* gh-13090:
Polish "Clarify deployment of Spring Boot apps to App Engine Standard"
Clarify deployment of Spring Boot apps to App Engine Standard
2018-05-08 20:14:34 +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
3183e2cb87
Merge branch '2.0.x'
2018-05-08 19:18:40 +01:00
Andy Wilkinson
ce8e1527ca
Merge branch '1.5.x' into 2.0.x
2018-05-08 19:18:34 +01:00
