Commit Graph

11662 Commits (75f8e8a59378afc66bd80cd60f79077eb5cb8e0a)
 

Author SHA1 Message Date
Phillip Webb 75f8e8a593 Fix actuator path used in tests
Fixup path changes that were missed during 1.5.x merge.
8 years ago
Phillip Webb 724be85b95 Polish 8 years ago
Stephane Nicoll 1eab67c30a Merge branch '1.5.x' 8 years ago
Stephane Nicoll 294f880fa3 Start build against Spring Data Ingalls snapshots
See gh-8939
8 years ago
Stephane Nicoll 382044c5aa Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 3f3bb92690 Start building against Spring Data Hopper snapshots
See gh-8938
8 years ago
Stephane Nicoll 3cce3c9c2c Merge branch '1.5.x' 8 years ago
Stephane Nicoll ad616ea4a7 Revert "Upgrade to Spring Data Ingalls-SR2"
This commit reverts 65a8257 as the Couchbase driver must be upgraded from
2.3.x to 2.4.x

See gh-8939
8 years ago
Stephane Nicoll d09e4cf157 Merge branch '1.5.x' 8 years ago
Stephane Nicoll bc0016ade0 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 47d2756692 Revert "Upgrade to Spring Data Hopper-SR9"
This commit reverts 2deab52 as the Couchbase driver must be upgraded from
2.2.x to 2.4.x

See gh-8938
8 years ago
Stephane Nicoll ce02373f8f Merge branch '1.5.x' 8 years ago
Stephane Nicoll 65a8257697 Upgrade to Spring Data Ingalls-SR2
Closes gh-8939
8 years ago
Stephane Nicoll e273fbbb6f Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 2deab52ad0 Upgrade to Spring Data Hopper-SR9
Closes gh-8938
8 years ago
Stephane Nicoll b100caa041 Fix import 8 years ago
Stephane Nicoll 6da0f6a341 Merge branch '1.5.x' 8 years ago
Stephane Nicoll 598beeea9d Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 041c5957ae Merge pull request #8935 from garyrussell:si14
* pr/8935:
  Upgrade to Spring Integration 4.3.9.RELEASE
8 years ago
Gary Russell 58279f356d Upgrade to Spring Integration 4.3.9.RELEASE
Closes gh-8935
8 years ago
Stephane Nicoll 485c0ad1b7 Upgrade to Spring Framework 4.3.8.RELEASE
Closes gh-8712
8 years ago
Stephane Nicoll 3be1ddddcc Merge branch '1.5.x' 8 years ago
Stephane Nicoll 43292a5e30 Merge pull request #8930 from garyrussell:amqp15
* pr/8930:
  Upgrade to Spring AMQP 1.7.2.RELEASE
8 years ago
Gary Russell 8a6bc65d86 Upgrade to Spring AMQP 1.7.2.RELEASE
Closes gh-8930
8 years ago
Stephane Nicoll 3da70e2a0e Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 746978ac52 Merge pull request #8929 from garyrussell:amqp14
* pr/8929:
  Upgrade to Spring AMQP 1.6.9.RELEASE
8 years ago
Gary Russell 4344489328 Upgrade to Spring AMQP 1.6.9.RELEASE
Closes gh-8929
8 years ago
Phillip Webb 850517a8db Fix merge issue 8 years ago
Phillip Webb 94209e2883 Merge branch '1.5.x' 8 years ago
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
8 years ago
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
8 years ago
Phillip Webb f3c45077ac Merge pull request #8924 from walterjs/master
* pull8924:
  Fail fast on getKeyFromServer() failure
8 years ago
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
8 years ago
Phillip Webb 8eb79b3c0f Polish 8 years ago
Stephane Nicoll 56c68ca6cf Merge branch '1.5.x' 8 years ago
Stephane Nicoll 6c14420221 Merge branch '1.4.x' into 1.5.x 8 years ago
Stephane Nicoll 63cfad855c Fix continuation indent
Closes gh-8497
8 years ago
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 ":"
8 years ago
Stephane Nicoll 9a5346f29c Polish "Fix statsd metrics collection for names with ":""
Closes gh-8906
8 years ago
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
8 years ago
Stephane Nicoll 65986503c1 Fix glitch in doc
Closes gh-8921
8 years ago
Phillip Webb 383640d5ec Merge branch '1.5.x' 8 years ago
Phillip Webb b2ae6b5f50 Merge branch '1.4.x' into 1.5.x 8 years ago
Phillip Webb cdf3eadc95 Rename AbstractTemplateAvailabilityProvider
Rename `AbstractTemplateAvailabilityProvider` to
`PathBasedTemplateAvailabilityProvider`.

Closes gh-8913
8 years ago
Phillip Webb f46d799f31 Polish 8 years ago
Madhura Bhave 757be57d48 Merge branch '1.5.x' 8 years ago
Madhura Bhave 3fe0b844a6 Make HealthMvcEndpoint conditional on missing bean 8 years ago
Madhura Bhave 7afec5c16f Fail hard if snakeyaml not present when loading yaml
Closes gh-8900
8 years ago
Madhura Bhave ed072abaef Merge branch '1.5.x' 8 years ago
Madhura Bhave 9e2d54feae Support json view with JacksonTester
Closes gh-8672
8 years ago