3da70e2a0e
Merge branch '1.4.x' into 1.5.x
8 years ago
746978ac52
Merge pull request #8929 from garyrussell:amqp14
...
* pr/8929:
Upgrade to Spring AMQP 1.6.9.RELEASE
8 years ago
4344489328
Upgrade to Spring AMQP 1.6.9.RELEASE
...
Closes gh-8929
8 years ago
850517a8db
Fix merge issue
8 years ago
94209e2883
Merge branch '1.5.x'
8 years ago
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
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
f3c45077ac
Merge pull request #8924 from walterjs/master
...
* pull8924:
Fail fast on getKeyFromServer() failure
8 years ago
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
8eb79b3c0f
Polish
8 years ago
56c68ca6cf
Merge branch '1.5.x'
8 years ago
6c14420221
Merge branch '1.4.x' into 1.5.x
8 years ago
63cfad855c
Fix continuation indent
...
Closes gh-8497
8 years ago
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
9a5346f29c
Polish "Fix statsd metrics collection for names with ":""
...
Closes gh-8906
8 years ago
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
65986503c1
Fix glitch in doc
...
Closes gh-8921
8 years ago
383640d5ec
Merge branch '1.5.x'
8 years ago
b2ae6b5f50
Merge branch '1.4.x' into 1.5.x
8 years ago
cdf3eadc95
Rename AbstractTemplateAvailabilityProvider
...
Rename `AbstractTemplateAvailabilityProvider` to
`PathBasedTemplateAvailabilityProvider`.
Closes gh-8913
8 years ago
f46d799f31
Polish
8 years ago
757be57d48
Merge branch '1.5.x'
8 years ago
3fe0b844a6
Make HealthMvcEndpoint conditional on missing bean
8 years ago
7afec5c16f
Fail hard if snakeyaml not present when loading yaml
...
Closes gh-8900
8 years ago
ed072abaef
Merge branch '1.5.x'
8 years ago
9e2d54feae
Support json view with JacksonTester
...
Closes gh-8672
8 years ago
2663e7aa41
Merge pull request #8907 from htynkn:bugfix/make-build-works-on-windows
...
* pr/8907:
Fix windows build of the Gradle plugin
8 years ago
f303ce5ff4
Fix windows build of the Gradle plugin
...
Use family instead of name to check os system
Closes gh-8907
8 years ago
700f0ea93c
Fix WebClientTest calls
...
Update calls to WebClientTest following upstream changes.
8 years ago
bcd79dd992
Move all actuators under `/application`
...
Context path can be configured via `management.context-path`.
Closes gh-6886
8 years ago
92468d4ffc
Merge branch '1.5.x'
8 years ago
e1f727719a
Merge branch '1.4.x' into 1.5.x
8 years ago
b7efec5401
Support case insensitive value for Cassandra's SchemaAction
...
Closes gh-8903
8 years ago
42c1eb894e
Merge branch '1.5.x'
8 years ago
8c21e16cf1
Add reference to Infinispan starter
...
Closes gh-8592
8 years ago
c2b2be9940
Merge pull request #8536 from eddumelendez:dataldaptest
...
* pr/8536:
Polish "Add slice test annotation for LDAP"
Add slice test annotation for LDAP
8 years ago
04ee374e7f
Polish "Add slice test annotation for LDAP"
...
Closes gh-8536
8 years ago
2830bef95c
Add slice test annotation for LDAP
...
This commit adds new annotation `@DataLdapTest` which provides test
infrastructure for LDAP. By default, embedded ldap server is initialized
if available.
See gh-8536
8 years ago
209ecf95f0
Merge branch '1.5.x'
8 years ago
9d0340a5ae
Merge pull request #8889 from rajadilipkolli:patch-3
...
* pr/8889:
Upgrade to Apache Maven 3.5.0
8 years ago
01da13cfe3
Upgrade to Apache Maven 3.5.0
...
Closes gh-8889
8 years ago
b9d1f5e097
Harmonize Solr status health details
...
This commit renames the `solrStatus` property of the Solr health indicator
to `status` and its type. This is now an integer corresponding to the
status Solr sent rather than a String that can be "OK" when all is well.
Closes gh-8878
8 years ago
23360d11a2
Change codec auto-configuration in HandlerStrategies
...
Since SPR-15415 and SPR-15435, the HandlerStrategies and its companion
builder are now using the new CodecConfigurer infrastructure to
configure codecs in a cross-cutting way.
This commit looks for a custom instance of `HandlerStrategies.Builder`
provided by the user, or create a default one if none was found.
Fixes gh-8897
8 years ago
50331102b7
Review configuration properties appendix
8 years ago
8cd4f13464
Merge branch '1.5.x'
8 years ago
b3c8511fb6
Merge branch '1.4.x' into 1.5.x
8 years ago
4fd9a8c468
Add missing spring.datasource.xa properties in the appendix
...
Closes gh-8895
8 years ago
e9b7c7afd2
Merge branch '1.5.x'
8 years ago
584b61ecc1
Remove deprecated property
8 years ago
eeed3a841c
Review configuration properties appendix
8 years ago
Stephane Nicoll
Gary Russell
Phillip Webb
Andy Wilkinson
Walter Seymore
Odín del Río
Madhura Bhave
Huang YunKun
Eddú Meléndez
Raja Kolli
Brian Clozel