98a3ae9ac4
Merge branch '1.5.x'
2016-10-31 23:13:37 -07:00
5b66ffbb4b
Merge branch '1.4.x' into 1.5.x
2016-10-31 23:09:36 -07:00
60355e0e11
Fix ResourceHttpRequestHandler delegate
...
Fix ResourceHttpRequestHandler to set the ServletContext following the
Spring Framework update for SPR-14851.
2016-10-31 15:04:43 -07:00
236f03c4bb
Merge branch '1.5.x'
2016-10-31 11:38:54 +01:00
7bb63238ab
Fix typo
...
Closes gh-7253
2016-10-31 11:37:52 +01:00
99af8ca414
Merge branch '1.5.x'
2016-10-30 10:59:22 +01:00
c4d8fb1c09
Merge branch '1.4.x' into 1.5.x
2016-10-30 10:59:02 +01:00
6d50e26b70
Polish contribution
...
Closes gh-7215
2016-10-30 10:57:58 +01:00
08229899b1
Merge branch '1.5.x'
2016-10-24 10:39:38 -07:00
9bde1e89cb
Move some tests to AbstractEndpointHandlerMapping
...
See gh-7108
2016-10-24 10:38:53 -07:00
2e4edf1804
Merge branch '1.5.x'
2016-10-24 10:26:40 -07:00
a448183681
Polish `/loggers` actuator endpoint
...
See gh-7086
2016-10-24 10:24:36 -07:00
06cb4fcca5
Add `/loggers` actuator endpoint
...
Add `LoggersEndpoint` that can enables listing and configuration of log
levels. This actuator builds on top of the `LoggingSystem` abstraction
and implements support for Logback, Log4J2, and JUL. The LoggingSystem
interface is modified to require each implementation to list the
configuration of all loggers as well as an individual logger by name.
The MVC endpoint exposes these behaviors at `GET /loggers` and
`GET /loggers/{name}` (much like the metrics actuator).
In addition `POST /loggers/{name}` allows users to modify the level for a given
logger. This modification is passed to the logging implementation, which
then decides, as an internal implementation detail, what the final outcome
of the modification is (e.g. changing all unconfigured children). Users
are then expected to request the listing of all loggers to see what has
changed internally to the logging system.
Closes gh-7086
2016-10-24 10:24:36 -07:00
0541c14684
Merge branch '1.5.x'
2016-10-24 10:08:32 +02:00
aec85787d2
Merge branch '1.4.x' into 1.5.x
2016-10-24 10:08:06 +02:00
eb7c0e4dc8
Remove unused
...
Closes gh-6966
2016-10-24 10:07:10 +02:00
df3c152813
Merge '1.5.x'
2016-10-21 10:25:07 -07:00
2ba978b4ad
Polish
2016-10-21 10:23:13 -07:00
1e1d929dde
Merge branch '1.5.x'
2016-10-21 10:16:59 -07:00
ab81d993e6
Add CloudFoundryDiscoveryMvcEndpoint
...
Update Cloud Foundry support with a discovery endpoint that shows what
endpoints are available.
See gh-7108
2016-10-21 10:16:09 -07:00
7afb161fcf
Add CloudFoundry EndpointHandlerMapping
...
Add a CloudFoundryEndpointHandlerMapping that can expose actuator
endpoints for Cloud Foundry "appsmanager" to use.
See gh-7108
2016-10-21 10:06:34 -07:00
a416f496c0
Clean up deprecation and unused code warnings
2016-10-18 20:43:05 +01:00
277d01ab53
Merge branch '1.5.x'
2016-10-12 13:35:21 -07:00
7352d8e303
Improve EndpointHandlerMapping subclassing support
...
Update EndpointHandlerMapping so that it can be subclasses easily.
Subclasses can override the `path` that is used to map the endpoint,
allowing different mapping strategies to be used.
See gh-7108
2016-10-12 13:32:39 -07:00
0be8a30276
Add EndpointHandlerMapping.getEndpoints(Class)
...
Add an additional method to EndpointHandlerMapping which allows
endpoints of a specific type to be returned.
See gh-7108
2016-10-12 13:32:38 -07:00
7f1ff968a1
Support NamedMvcEndpoints
...
Introduce a new NamedMvcEndpoint interface which can be used when an
MvcEndpoint also has a logical name. Existing MvcEndpoints have been
reworked to implement the NamedMvcEndpoint interface.
Fixes gh-7156
2016-10-12 13:32:38 -07:00
0f5007d69d
Drop superfluous disabled check
...
Remove EndpointWebMvcManagementContextConfiguration `disabled` logic
since the configuration should even be processed when the management
port is `-1`.
Closes gh-7154
2016-10-12 12:19:35 -07:00
84d0e8acd8
Fix EndpointHandlerMappingTests path references
...
Fix the TestEndpoint constructor to use an ID parameter rather than
path.
2016-10-12 12:19:35 -07:00
01900c8342
Merge branch '1.5.x'
2016-10-11 23:42:14 -07:00
d818a09ed8
Polish
2016-10-11 23:38:14 -07:00
c5cc626d48
Remove remote shell support
...
See gh-7044
2016-10-11 17:59:25 +02:00
66a3df454f
Merge branch '1.5.x'
2016-10-11 17:42:53 +02:00
cfee9bab81
Deprecate remote shell support
...
Closes gh-7044
2016-10-11 17:39:28 +02:00
cf038da083
Merge branch '1.5.x'
2016-10-06 17:15:46 +01:00
9b6fa1e8d7
Separate conditions that did and did not match in auto-config endpoint
...
Closes gh-7122
2016-10-06 17:15:38 +01:00
543498f040
Merge branch '1.5.x'
2016-10-05 15:21:23 +02:00
cf28663cd7
Deprecate commons-dbcp 1
...
Closes gh-6787
2016-10-05 15:21:09 +02:00
53f50eda39
Merge branch '1.5.x'
2016-10-03 22:47:11 -07:00
f2b0fa284e
Merge branch '1.4.x' into 1.5.x
2016-10-03 22:38:22 -07:00
3326841a97
Formatting
2016-10-03 22:19:35 -07:00
39ed0d4dfb
Polish
2016-10-03 21:58:13 -07:00
669b09cbde
Merge branch '1.5.x'
2016-10-03 10:42:18 +02:00
3d9c56fbf3
Merge branch '1.4.x' into 1.5.x
...
# Conflicts:
# spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java
# spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesAutoConfigurationTests.java
2016-10-03 10:42:07 +02:00
8c1b736bb0
Fix list property to be mutable
...
Closes gh-7068
2016-10-03 10:40:46 +02:00
f82dc8e043
Upgrade to JMS API 2.0
...
Closes gh-7049
2016-09-29 20:33:21 +01:00
8b6d7eedc0
Merge branch '1.5.x'
2016-09-29 10:38:42 +02:00
c4aa78679a
Upgrade Hazelcast to 3.7.1
...
In addition, dependency management for `hazelcast-hibernate5` module has
been added, and a separate dependency version was introduced for
`hazelcast-hibernate4` module.
Closes gh-7023
2016-09-29 10:37:29 +02:00
bd8a9bb310
Polish
...
See gh-6971 and commit ce1e41d
2016-09-21 19:54:55 +01:00
beca5e486e
Polish
2016-09-21 18:54:39 +01:00
312292b93e
Update Animal Sniffer and related annotations for Java 8 baseline
...
Closes gh-6981
2016-09-21 17:20:49 +01:00
Phillip Webb
Stephane Nicoll
Johnny Lim
Madhura Bhave
Ben Hale
Andy Wilkinson
Vedran Pavic