ecea51076d
Merge branch '1.4.x' into 1.5.x
2017-03-24 12:31:06 +00:00
a88c56dfdc
Start building against Spring Integration 4.3.9 snapshots
...
See gh-8713
2017-03-24 10:44:06 +00:00
2b6bcfd738
Start building against Spring Framework 4.3.8 snapshots
...
Closes gh-7949
See gh-8712
2017-03-24 10:42:45 +00:00
e6cfb4e5fb
Improve diagnostics when reading a nested jar throws a runtime exception
...
Previously, only IOExceptions were caught and wrapped in a new
IOException that included the name of the nested entry that was
being read.
Following this commit, any Exception is caught and wrapped so that the
problematic entry can be identified in more failure scenarios.
Closes gh-8711
2017-03-24 10:32:16 +00:00
aa25bfb0e0
Clarify the effect that management.context-path has on endpoint paths
...
Fixes gh-8586
2017-03-23 16:12:48 -07:00
cb38546d8a
Document default trace includes
...
Closes gh-8654
2017-03-23 15:36:27 -07:00
f73714bdcc
Do not filter HttpMessageConverters in WebMvcTest
...
Closes gh-8617
2017-03-23 14:21:04 -07:00
dfe26aace8
Merge pull request #8658 from SolaKun:SolaKun-patch-1
...
* pr/8658:
Fix typo in doc
2017-03-18 07:39:54 +01:00
ddd8d03a2a
Fix typo in doc
...
Closes gh-8658
2017-03-18 07:39:16 +01:00
e6f4d84618
Support setting log level ALL in logback
...
Fixes gh-8639
2017-03-17 15:51:30 -07:00
8ac22fc2fd
Add elapsed time to the Trace Actuator output
...
Closes gh-8654
2017-03-17 12:04:55 -07:00
84dea5264f
Merge branch '1.4.x' into 1.5.x
2017-03-17 09:57:52 +01:00
1624370986
Merge pull request #8594 from lexandro:master
...
* pr/8594:
Polish contribution
Fix invalid security example in doc
2017-03-17 09:57:35 +01:00
0ca07fbdc3
Polish contribution
...
Closes gh-8594
2017-03-17 09:56:45 +01:00
36b28540ee
Fix invalid security example in doc
...
Closes gh-8580
2017-03-17 09:51:08 +01:00
fa3679af71
Merge branch '1.4.x' into 1.5.x
2017-03-16 12:40:12 +01:00
cd76da9a4c
Avoid using immutable collections for configuration proprerties
...
Closes gh-8620
2017-03-16 12:39:48 +01:00
22934e097d
Merge branch '1.4.x' into 1.5.x
2017-03-15 15:10:37 +01:00
ed2164b97b
Merge pull request #8582 from vpavic:improve-redis-session-config
...
* pr/8582:
Improve `RedisSessionConfiguration` conditions
2017-03-15 15:10:02 +01:00
17aad4f00c
Improve `RedisSessionConfiguration` conditions
...
Closes gh-8582
2017-03-15 15:09:31 +01:00
cc79f6d83d
Merge branch '1.4.x' into 1.5.x
2017-03-15 14:52:19 +01:00
f72e0c08df
Add a note to ActiveMQ pooling in the doc
...
Closes gh-8598
2017-03-15 14:51:55 +01:00
cd8684499d
Polish
...
See gh-8621
2017-03-15 08:57:24 +01:00
6be2cc30d3
Merge branch '1.4.x' into 1.5.x
2017-03-15 08:54:21 +01:00
bc157d5b4f
Polish
...
See gh-8621
2017-03-15 08:50:50 +01:00
0dcebdaf7c
Merge branch '1.4.x' into 1.5.x
2017-03-14 13:34:41 -07:00
19da8d8271
Fix UnsupportedOperationException
...
Fixes gh-8602
2017-03-14 11:59:42 -07:00
8deb72be80
Fix ResourceServerProperties validation
...
Only try and validate if clientId is present.
Fixes gh-8565
2017-03-14 11:03:21 -07:00
4607f8bc2f
Determine key from configured alias for undertow
...
Closes gh-8245
2017-03-13 12:37:54 -07:00
17062f9589
Merge branch '1.4.x' into 1.5.x
2017-03-13 16:10:32 +00:00
2ddcf0e831
Avoid using File.renameTo(File) as it doesn't work on Windows
2017-03-13 15:46:19 +00:00
6a137260c1
Merge branch '1.4.x' into 1.5.x
2017-03-12 08:44:18 +01:00
4158a6d50f
Fix typo
...
Closes gh-8574
2017-03-12 08:43:51 +01:00
5d27c7e501
Handle non supported JOOQ dialect
...
This commit uses a fallback translator if the JOOQ Dialect in use is not
one we support.
Closes gh-8521
2017-03-10 16:27:44 +01:00
cbde6ed096
Merge pull request #8474 from Nowheresly:gh-8396
...
* pr/8474:
Polish contribution
Add Tomcat Access Log's fileDateFormat property
2017-03-10 10:21:39 +01:00
f8bf05b91f
Polish contribution
...
Closes gh-8474
2017-03-10 10:20:48 +01:00
0ddaca57fb
Add Tomcat Access Log's fileDateFormat property
...
Closes gh-8396
2017-03-10 09:57:00 +01:00
b5fc68dfed
Merge pull request #8490 from schlauergerd:gh-8390
...
* pr/8490:
Polish contribution
Introduce reset method to OutputCapture
2017-03-10 09:54:57 +01:00
c8ac94b75d
Polish contribution
...
Closes gh-8490
2017-03-10 09:51:35 +01:00
a6f0da8cc6
Introduce reset method to OutputCapture
...
Closes gh-8390
2017-03-10 09:48:36 +01:00
feb1ab375f
Merge branch '1.4.x' into 1.5.x
2017-03-10 09:36:55 +01:00
095eb779e2
Merge pull request #8562 from eddumelendez:missing_cassandra_metadata
...
* pr/8562:
Add missing spring-data-cassandra metadata
2017-03-10 09:35:22 +01:00
251090b1e5
Add missing spring-data-cassandra metadata
...
This commit adds the missing
`spring.data.cassandra.repositories.enabled` in the metadata and the
documentation.
Closes gh-8562
2017-03-10 09:34:19 +01:00
544c73841d
Merge branch '1.4.x' into 1.5.x
2017-03-10 09:22:32 +01:00
633e75dce2
Fix typo
...
Closes gh-8563
2017-03-10 09:22:00 +01:00
6624fe47c3
Merge branch '1.4.x' into 1.5.x
2017-03-09 18:33:28 +01:00
e7922a574a
Polish
2017-03-09 18:33:13 +01:00
207ab3ecb4
Merge branch '1.4.x' into 1.5.x
2017-03-09 18:21:40 +01:00
07c56c60ba
Make sure Hazelcast bootstraps before any JCache setup
...
This commit makes sure that if a `javax.cache.CacheManager` is required,
an auto-configured `HazelcastInstance` is fully resolved first. This
prevents the case where the JCache bootstrap actually starts an instance
early, followed by a second (potentially unwanted) instance created by the
regular auto-configuration.
Since the JCache implementation works with an `HazelcastInstance` behind
the scenes, if there is one `HazelcastInstance` configured and it has a
name, then we configure the `CacheProvider` to use that. Future Hazelcast
version will allow to pass the instance directly (i.e. not requiring an
actual name).
Closes gh-8484
2017-03-09 17:59:20 +01:00
50c0204f2d
Merge branch '1.4.x' into 1.5.x
2017-03-09 14:05:42 +00:00
Andy Wilkinson
Madhura Bhave
Stephane Nicoll
Sola
lexandro
Vedran Pavic
srichard
Roland Weisleder
Eddú Meléndez