Andy Wilkinson
e7ed7efb56
Merge branch '1.5.x'
2017-01-19 12:43:54 +00:00
Andy Wilkinson
3e88c366ec
Polish "Avoid property name collisions when serializing AuditEvent to JSON"
...
See gh-7990
2017-01-19 12:39:14 +00:00
Johannes Edmeier
fcf36ed091
Avoid property name collisions when serializing AuditEvent to JSON
...
Previously, in case the data for the audit event contained an entry
with the key "type", the member `type` from the AuditEvent would be
overwritten when rendering to JSON due to the use of @JsonAnyGetter on
the data property.
This commit removes @JsonAnyGetter so that the data map is rendered as
a separate property in the JSON.
Closes gh-7990
2017-01-19 12:33:15 +00:00
Stephane Nicoll
c54070d142
Merge branch '1.5.x'
2017-01-19 13:19:36 +01:00
Stephane Nicoll
c41ff17dd7
Provide relevant default values for Enums
...
This commits adds manual metadata for enums that have a default value
since the annotation processor is not able to detect that yet.
Closes gh-7890
2017-01-19 13:19:13 +01:00
Phillip Webb
5502fa2936
Merge branch '1.5.x'
2017-01-18 21:05:22 -08:00
Phillip Webb
f42ebe428c
Remove JSR-330 configuration annotations
...
Replace JSR-330 validation annotations from all internal
`@ConfigurationProperties` classes with standard Asserts.
Prior to this commit validation of our own configuration properties
would only occur when the user happens to have compliant JSR-330
implementation on their classpath.
See gh-7579
2017-01-18 20:51:35 -08:00
Phillip Webb
0a6456a748
Always use prefix config annotation attribute
...
Update use of `@ConfigurationProperties` to prefer the more explicit
`prefix` attribute, rather than `value`.
See gh-7579
2017-01-18 20:49:53 -08:00
Phillip Webb
43d432a527
Polish
2017-01-18 20:35:41 -08:00
Andy Wilkinson
f7f764ffe1
Merge branch '1.5.x'
2017-01-17 17:15:59 +00:00
Andy Wilkinson
5c9aa41c07
Update InMemoryRichGaugeRepository to support increments
...
Closes gh-2902
2017-01-17 17:15:26 +00:00
Andy Wilkinson
14e24462f2
Merge branch '1.5.x'
2017-01-17 15:00:06 +00:00
Andy Wilkinson
7fa33cddd7
Merge branch '1.4.x' into 1.5.x
2017-01-17 15:00:01 +00:00
Andy Wilkinson
a02c2d4155
Improve the documentation of Health.Status constants
...
Closes gh-7784
2017-01-17 14:59:53 +00:00
Stephane Nicoll
f4f5a70cb2
Merge branch '1.5.x'
2017-01-17 09:57:53 +01:00
Johnny Lim
acc36c076d
Polish
...
See gh-8004
2017-01-17 09:53:50 +01:00
Andy Wilkinson
9a4b6a90ae
Merge branch '1.5.x'
2017-01-16 11:47:59 +00:00
Andy Wilkinson
f72799186e
Merge branch '1.4.x' into 1.5.x
2017-01-16 11:47:52 +00:00
Andy Wilkinson
a72365e1a2
Expose context hierarchy in beans endpoint
...
Previously, the beans endpoint would only expose the context that
contained the endpoint. This commit updates the endpoint so that
the context that contains the endpoint and all of its ancestors are
exposed.
In a context hierarhcy, the relation ship is child -> parent and there
is no way to navigate from a parent to a child. As a result, any
contexts that are descendants of the context containing the endpoint
are not exposed.
Closes gh-5188
2017-01-16 11:47:14 +00:00
Stephane Nicoll
a9399639a0
Merge branch '1.5.x'
2017-01-16 11:25:39 +01:00
Stephane Nicoll
8bef0a1e60
Polish contribution
...
Closes gh-7905
2017-01-16 11:24:36 +01:00
Eddú Meléndez
b2250f4ad8
Add LDAP health actuator
...
Provide specific health actuator endpoint to verify if LDAP connection
is valid.
See gh-7905
2017-01-16 10:56:49 +01:00
Stephane Nicoll
e4876eb666
Merge branch '1.5.x'
2017-01-15 09:46:07 +01:00
Stephane Nicoll
f21c767356
Polish contribution
...
Closes gh-7914
2017-01-15 09:45:32 +01:00
Kazuki Shimizu
a6756c9ed3
Allow lowercase logger level on MVC endpoint
...
See gh-7914
2017-01-15 09:42:40 +01:00
Andy Wilkinson
ae3434ba4c
Merge branch '1.4.x' into 1.5.x
2017-01-13 18:45:50 -05:00
Andy Wilkinson
d2201d5284
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
2017-01-13 18:43:30 -05:00
Andy Wilkinson
3c35066ed5
Merge branch '1.5.x'
2017-01-13 15:40:53 -05:00
Andy Wilkinson
426435f4af
Merge branch '1.4.x' into 1.5.x
2017-01-13 15:40:11 -05:00
Andy Wilkinson
1afb050061
Correct copyright dates and enforce that starting year is 2012
...
Closes gh-7923
2017-01-13 15:36:06 -05:00
Andy Wilkinson
78a06c3278
Merge branch '1.5.x'
2017-01-10 17:05:09 -05:00
Phillip Webb
9159c87bf9
Polish
2017-01-10 09:51:11 -05:00
Stephane Nicoll
a2d55428ef
Merge branch '1.5.x'
2017-01-08 09:20:28 +01:00
Stephane Nicoll
fefc66625f
Merge branch '1.4.x' into 1.5.x
2017-01-08 09:20:00 +01:00
Eddú Meléndez
f896ff9a10
Fix incomplete assertions
...
Closes gh-7907
2017-01-08 09:12:54 +01:00
Phillip Webb
c35454e5f4
Merge branch '1.5.x'
2017-01-05 23:40:58 -08:00
Madhura Bhave
4ea47220e9
Match nested paths for insensitive actuators
...
Update `ManagementWebSecurityAutoConfiguration` to match nested path
for insensitive actuators.
Prior to this commit, when Spring Security was on the classpath
nested paths were considered sensitive (even if the actuator
endpoint was not sensitive). i.e. when setting
`endpoints.env.sensitive=false` `/env` could be accessed without
authentication but `/env/user` could not.
Fixes gh-7868
Closes gh-7881
2017-01-05 18:45:30 -08:00
Phillip Webb
77f9bb09ca
Further Polish Mockito 2 support
...
See gh-7770
2017-01-05 14:29:29 -08:00
Phillip Webb
0cc313f224
Polish
2017-01-05 11:30:33 -08:00
Stephane Nicoll
c28ff4314c
Upgrade to Mockito 2
...
Closes gh-7770
2017-01-05 12:22:15 +01:00
Stephane Nicoll
506f6497c0
Merge branch '1.5.x'
2017-01-04 09:56:19 +01:00
Johnny Lim
f915ae197a
Polish
2017-01-04 09:53:45 +01:00
Phillip Webb
24f5125a8b
Merge branch '1.5.x'
2017-01-03 19:01:17 -08:00
Madhura Bhave
530c3cd3be
Simplify HealthMvcEndpoint security
...
Expose full health details if management security is disabled or
management role is present.
Fixes gh-7604
Closes gh-7852
2017-01-03 19:00:14 -08:00
Phillip Webb
2fe4d60b47
Add management.cloudfoundry.* meta-data
...
Update configuration meta-data and appendix to include
`management.cloudfoundry.*` meta-data.
See gh-7108
2017-01-03 17:24:58 -08:00
Phillip Webb
b1cb8bb3d9
Merge branch '1.5.x'
2017-01-03 15:14:41 -08:00
Phillip Webb
8ccd4db513
Merge branch '1.4.x' into 1.5.x
2017-01-03 15:14:14 -08:00
Phillip Webb
732011987d
Fix ManagementContextConfiguration @Order support
...
Update `ManagementContextConfigurationsImportSelector` to instantiate
classes so that order annotations are respected.
Fixes gh-7814
2017-01-03 15:12:35 -08:00
Phillip Webb
b4b8370632
Fix AuditEventsJmxEndpoint bean name
...
See gh-6579
2017-01-03 14:43:24 -08:00
Phillip Webb
8a9a61b64f
Prevent duplicate JmxEndpoint MBean registration
...
Update JmxEndpoint support so that the `@ManagedResource` annotation
is no longer required. This prevents both `EndpointMBeanExporter` and
the regular `AnnotationMBeanExporter` from both registering the bean.
Fixes gh-7813
See gh-6579
2017-01-03 14:43:24 -08:00
