Phillip Webb
393c17b68b
Support @SpringBootTest with @ContextHierarchy
...
Update SpringBootTestContextBootstrapper to detect `@ContextHierarchy`
annotations so that only the last child creates a
`WebApplicationContext`.
Prior to this commit a context hierarchy would start two embedded web
servers which is inconsistent with the `SpringApplicationBuilder`
behavior.
Fixes gh-8311
2017-04-18 14:56:12 -07:00
Andy Wilkinson
b9be0e3e0f
Skip actuator path extension content negotiation
...
Allow `PathExtensionContentNegotiationStrategy` to be bypassed by
actuator endpoints. Prior to this commit calling `/loggers/com.aaa.cab`
would return a HTTP 406 response due to `.cab` being a known extension.
Fixes gh-8765
2017-04-18 14:56:11 -07:00
Phillip Webb
f3c45077ac
Merge pull request #8924 from walterjs/master
...
* pull8924:
Fail fast on getKeyFromServer() failure
2017-04-18 14:56:10 -07:00
Walter Seymore
f5f65463d2
Fail fast on getKeyFromServer() failure
...
Update `ResourceServerTokenServicesConfiguration` to fail fast if the
`getKeyFromServer()` call fails. Since the key is part of the singleton
`JwtAccessTokenConverter` bean there is not real way to refresh without
restarting the application.
A hard failure seems preferable to an inconsistent state.
Closes gh-8924
2017-04-18 14:56:10 -07:00
Phillip Webb
8eb79b3c0f
Polish
2017-04-18 11:13:12 -07:00
Stephane Nicoll
6c14420221
Merge branch '1.4.x' into 1.5.x
2017-04-18 10:42:48 +02:00
Stephane Nicoll
63cfad855c
Fix continuation indent
...
Closes gh-8497
2017-04-18 10:41:53 +02:00
Stephane Nicoll
38b7d0eb40
Merge pull request #8906 from odin-delrio:fix-statsd-metrics-collection
...
* pr/8906:
Polish "Fix statsd metrics collection for names with ":""
Fix statsd metrics collection for names with ":"
2017-04-18 10:40:41 +02:00
Stephane Nicoll
9a5346f29c
Polish "Fix statsd metrics collection for names with ":""
...
Closes gh-8906
2017-04-18 10:40:14 +02:00
Odín del Río
9e705c83c8
Fix statsd metrics collection for names with ":"
...
Statsd server is ignoring malformed metrics. This change introduces
a basic sanitizing to metric names for avoid losing those metrics.
See gh-8906
2017-04-18 10:40:14 +02:00
Phillip Webb
b2ae6b5f50
Merge branch '1.4.x' into 1.5.x
2017-04-17 22:14:45 -07:00
Phillip Webb
cdf3eadc95
Rename AbstractTemplateAvailabilityProvider
...
Rename `AbstractTemplateAvailabilityProvider` to
`PathBasedTemplateAvailabilityProvider`.
Closes gh-8913
2017-04-17 22:12:44 -07:00
Phillip Webb
f46d799f31
Polish
2017-04-17 22:08:51 -07:00
Madhura Bhave
3fe0b844a6
Make HealthMvcEndpoint conditional on missing bean
2017-04-17 14:49:45 -07:00
Madhura Bhave
9e2d54feae
Support json view with JacksonTester
...
Closes gh-8672
2017-04-17 11:14:26 -07:00
Stephane Nicoll
e1f727719a
Merge branch '1.4.x' into 1.5.x
2017-04-14 16:04:22 +02:00
Stephane Nicoll
b7efec5401
Support case insensitive value for Cassandra's SchemaAction
...
Closes gh-8903
2017-04-14 16:04:04 +02:00
Stephane Nicoll
8c21e16cf1
Add reference to Infinispan starter
...
Closes gh-8592
2017-04-14 13:57:47 +02:00
Stephane Nicoll
9d0340a5ae
Merge pull request #8889 from rajadilipkolli:patch-3
...
* pr/8889:
Upgrade to Apache Maven 3.5.0
2017-04-14 09:29:00 +02:00
Raja Kolli
01da13cfe3
Upgrade to Apache Maven 3.5.0
...
Closes gh-8889
2017-04-14 09:28:16 +02:00
Stephane Nicoll
b3c8511fb6
Merge branch '1.4.x' into 1.5.x
2017-04-13 10:24:07 +02:00
Stephane Nicoll
4fd9a8c468
Add missing spring.datasource.xa properties in the appendix
...
Closes gh-8895
2017-04-13 10:23:44 +02:00
Stephane Nicoll
584b61ecc1
Remove deprecated property
2017-04-12 16:16:19 +02:00
Stephane Nicoll
6567018b70
Merge branch '1.4.x' into 1.5.x
2017-04-12 14:36:48 +02:00
Stephane Nicoll
2579023035
Fix javadoc
...
Closes gh-8892
2017-04-12 14:36:02 +02:00
Stephane Nicoll
f4ab574ea1
Merge branch '1.4.x' into 1.5.x
2017-04-12 11:46:43 +02:00
Stephane Nicoll
072160863a
Add a note about transactional tests and webEnvironment
...
Closes gh-8232
2017-04-12 11:46:06 +02:00
Stephane Nicoll
68c90b24c2
Merge branch '1.4.x' into 1.5.x
2017-04-12 11:15:51 +02:00
Stephane Nicoll
40f4c89602
Document list merge restrictions with YAML
...
Closes gh-6911
2017-04-12 11:15:24 +02:00
Stephane Nicoll
715cf7da75
Do not enable cglib if spring.aop.proxy-target-class is configured
...
This commit makes sure to honour the `spring.aop.proxy-target-class`
property if set by the user. Previously, the
`PersistenceExceptionTranslationPostProcessor` was always configured to
use cglib, regardless of the value of that property.
Closes gh-8887
2017-04-12 10:55:43 +02:00
Stephane Nicoll
0affa3af3a
Merge branch '1.4.x' into 1.5.x
2017-04-12 10:28:32 +02:00
Stephane Nicoll
be3b5a9dc2
Only apply editorconfig for certain files
...
Closes gh-8497
2017-04-12 10:28:00 +02:00
Phillip Webb
c97268981a
Polish
2017-04-11 20:59:03 -07:00
Phillip Webb
d301d0f4c3
Merge branch '1.4.x' into 1.5.x
2017-04-11 20:42:48 -07:00
Phillip Webb
758ddcd420
Polish
2017-04-11 20:17:23 -07:00
Madhura Bhave
535451f9e5
Merge branch '1.4.x' into 1.5.x
2017-04-11 15:54:01 -07:00
Madhura Bhave
b2f0ebfcb8
Prevent empty json for parameters in trace endpoint
...
Fixes gh-8883
2017-04-11 15:30:39 -07:00
Stephane Nicoll
eff35795cd
Fix checkstyle violation
2017-04-11 15:29:52 +02:00
Stephane Nicoll
a00b695748
Do not enable cglib if spring.aop.proxy-target-class is configured
...
This commit makes sure to honour the `spring.aop.proxy-target-class`
property if set by the user. Previously, the
`MethodValidationPostProcessor` was always configured to use cglib,
regardless of the value of that property.
Closes gh-8869
2017-04-11 15:28:21 +02:00
Stephane Nicoll
b148b46751
Polish
2017-04-11 14:54:16 +02:00
Stephane Nicoll
7905874f9d
Merge pull request #8650 from ColinHarrington:disable-actuator-trace-filter
...
* pr/8650:
Polish "Add the ability to disable the trace filter"
Add the ability to disable the trace filter
2017-04-11 14:47:04 +02:00
Stephane Nicoll
2ef318c00d
Polish "Add the ability to disable the trace filter"
...
Closes gh-8650
2017-04-11 14:46:57 +02:00
Colin Harrington
d3e2e22f8c
Add the ability to disable the trace filter
...
See gh-8650
2017-04-11 14:46:57 +02:00
Stephane Nicoll
fccab42711
Merge pull request #8813 from eddumelendez:gh-8798
...
* pr/8813:
Polish "Fix http status code with unknown log level"
Fix http status code with unknown log level
2017-04-11 14:46:26 +02:00
Stephane Nicoll
82ac8b5ca1
Polish "Fix http status code with unknown log level"
...
Closes gh-8813
2017-04-11 13:29:53 +02:00
Eddú Meléndez
cf08162148
Fix http status code with unknown log level
...
This commit changes the http status code to 400 when an unknown log level
is specified.
Closes gh-8798
See gh-8813
2017-04-11 13:23:41 +02:00
Stephane Nicoll
934d33685a
Polish
...
See gh-8879
2017-04-11 09:40:54 +02:00
Stephane Nicoll
3f883f1898
Merge branch '1.4.x' into 1.5.x
2017-04-11 09:38:11 +02:00
Stephane Nicoll
404bb2d171
Polish
...
See gh-8879
2017-04-11 09:37:22 +02:00
Stephane Nicoll
a132bd141f
Merge branch '1.4.x' into 1.5.x
2017-04-10 16:13:53 +02:00
