Stephane Nicoll
4a6102091e
Merge branch '2.0.x'
2018-06-04 15:24:18 +02:00
Stephane Nicoll
bc59434bcc
Start building against Spring Framework 5.0.7 snapshots
...
See gh-13353
2018-06-04 15:21:46 +02:00
Stephane Nicoll
0da425794e
Merge branch '1.5.x' into 2.0.x
2018-06-04 15:20:49 +02:00
Stephane Nicoll
628cce567f
Start building against Spring Framework 4.3.18 snapshots
...
See gh-13352
2018-06-04 15:04:49 +02:00
Stephane Nicoll
99f0270fce
Merge branch '2.0.x'
2018-06-04 14:15:08 +02:00
Stephane Nicoll
a9b2826c26
Merge branch '1.5.x' into 2.0.x
2018-06-04 14:14:52 +02:00
Stephane Nicoll
a562cb5d6c
Merge pull request #13338 from mtheiss:master
...
* pr/13338:
Polish "Retrieve javax.cache.CacheManager using Bean ClassLoader"
Retrieve javax.cache.CacheManager using Bean ClassLoader
2018-06-04 14:11:08 +02:00
Stephane Nicoll
c67aedd8bc
Polish "Retrieve javax.cache.CacheManager using Bean ClassLoader"
...
Closes gh-13338
2018-06-04 14:08:58 +02:00
Martin Theiss
76b9d0d243
Retrieve javax.cache.CacheManager using Bean ClassLoader
...
This commit uses the bean's classloader to retrieve the CacheManager to
prevent issues with off-heap serialization.
See gh-13338
2018-06-04 14:08:57 +02:00
Stephane Nicoll
c973488c70
Merge pull request #12707 from nosan:feature/web-service-template
...
* pr/12707:
Polish "Add auto-configuration for WebServiceTemplate"
Extract ClientHttpRequestFactory detection to its own class
Add auto-configuration for WebServiceTemplate
2018-06-04 12:28:41 +02:00
Stephane Nicoll
8bcea0d8cc
Polish "Add auto-configuration for WebServiceTemplate"
...
Closes gh-1270
2018-06-04 12:27:29 +02:00
Stephane Nicoll
ef9c1a8e35
Extract ClientHttpRequestFactory detection to its own class
...
See gh-12707
2018-06-04 11:12:02 +02:00
dnosan
c9df1c551a
Add auto-configuration for WebServiceTemplate
...
See gh-12707
2018-06-04 11:12:02 +02:00
Stephane Nicoll
283ceaa071
Merge branch '2.0.x'
2018-06-04 10:32:21 +02:00
Stephane Nicoll
6be208ed04
Merge pull request #13345 from dreis2211:remove-deprecated-matcher
...
* pr/13345:
Remove usage of deprecated Matchers class
2018-06-04 10:32:07 +02:00
dreis2211
8bb7b8af51
Remove usage of deprecated Matchers class
...
Closes gh-13345
2018-06-04 10:31:25 +02:00
Stephane Nicoll
d924c89525
Merge branch '2.0.x'
2018-06-03 16:57:34 +02:00
Stephane Nicoll
d5ccd43feb
Merge pull request #13343 from dreis2211:property-source-stream-polish
...
* pr/13343:
Polish stream creation in some PropertySources
2018-06-03 16:57:24 +02:00
dreis2211
29605bacd2
Polish stream creation in some PropertySources
...
Closes gh-13343
2018-06-03 16:56:51 +02:00
Madhura Bhave
37a7457f36
Polish
2018-06-01 15:02:46 -07:00
Madhura Bhave
458d574d1f
Merge branch '2.0.x'
2018-06-01 14:59:27 -07:00
Madhura Bhave
95174a0773
Don't fail if aggregate merge can't get existing value
...
Fixes gh-13303
2018-06-01 14:52:55 -07:00
Madhura Bhave
8ce13c765b
Support binding to immutable maps
...
Closes gh-13323
2018-06-01 14:52:55 -07:00
Andy Wilkinson
78b1a37d7d
Merge branch '2.0.x'
2018-06-01 17:58:03 +01:00
Andy Wilkinson
68cd27c47b
Do not require DataSourcePoolMetrics to auto-configure Hikari meters
...
Closes gh-13330
2018-06-01 17:55:43 +01:00
Andy Wilkinson
e306aad28c
Merge branch '2.0.x'
2018-06-01 17:27:10 +01:00
Andy Wilkinson
27267a7090
Ensure that condition evaluator uses runner’s class loader
...
Closes gh-13319
2018-06-01 17:26:32 +01:00
Stephane Nicoll
68c10ea0cd
Merge pull request #13322 from vpavic:upgrade-hazelcast
...
* pr/13322:
Upgrade to Hazelcast 3.10.1
2018-06-01 09:31:50 +02:00
Vedran Pavic
205b1c1327
Upgrade to Hazelcast 3.10.1
...
Closes gh-13322
2018-06-01 09:30:42 +02:00
Stephane Nicoll
d350345721
Merge pull request #13324 from izeye:metrics-properties-final
...
* pr/13324:
Make MetricsProperties fields final if possible
2018-06-01 09:29:58 +02:00
Johnny Lim
5d5a14e4f7
Make MetricsProperties fields final if possible
...
Closes gh-13324
2018-06-01 09:29:34 +02:00
Stephane Nicoll
77dcbdb1e5
Polish
...
See gh-13320
2018-06-01 09:28:55 +02:00
Stephane Nicoll
bc47bf44a9
Merge branch '2.0.x'
2018-06-01 09:26:29 +02:00
Stephane Nicoll
152ce145fd
Merge pull request #13320 from izeye:polish-20180601
...
* pr/13320:
Polish
2018-06-01 09:25:48 +02:00
Johnny Lim
6b0ce46491
Polish
...
Closes gh-13320
2018-06-01 09:22:20 +02:00
Stephane Nicoll
81ef6fec7b
Add reference to Gitter
2018-06-01 07:59:18 +02:00
Madhura Bhave
817c228906
Merge branch '2.0.x'
2018-05-31 16:53:51 -07:00
Madhura Bhave
0afd947350
BindFailureAnalyzer should show original failure message
...
Fixes gh-13122
2018-05-31 16:51:42 -07:00
Stephane Nicoll
58d634f498
Merge branch '2.0.x'
2018-05-31 21:05:16 +02:00
Stephane Nicoll
fa21333e4d
Upgrade to Spring Cloud Connectors 2.0.2.RELEASE
...
Closes gh-13318
2018-05-31 21:04:02 +02:00
Stephane Nicoll
5790a26bcb
Merge branch '2.0.x'
2018-05-31 17:36:10 +02:00
Stephane Nicoll
20e349c332
Polish
2018-05-31 17:35:56 +02:00
Stephane Nicoll
fec75c42fa
Move unused property in code to metadata
2018-05-31 17:07:42 +02:00
Stephane Nicoll
74379da726
Merge branch '2.0.x'
2018-05-31 16:39:11 +02:00
Stephane Nicoll
32aa5b9bae
Merge branch '1.5.x' into 2.0.x
2018-05-31 16:38:23 +02:00
Stephane Nicoll
f745f20c8c
Clarify scope of JNDI-based MailSenderAutoConfiguration
...
This commit separates the auto-configuration of JavaMailSender in two
distinct configuration: one based on existing Session available on JNDI
and the other one based on properties configuration.
This clarifies the auto-configuration report and the fact that the JNDI
variant overrides any Session-related properties that would have been
set in the environment
Closes gh-13026
2018-05-31 16:20:40 +02:00
Andy Wilkinson
cff5c1ec72
Merge branch '2.0.x'
2018-05-31 13:42:23 +01:00
Andy Wilkinson
0d7d95d8a9
Align RestTemplateBuilder with Framework's removal of OkHttp 2 support
...
Closes gh-13314
2018-05-31 13:41:43 +01:00
Stephane Nicoll
55d70d5691
Merge branch '2.0.x'
2018-05-31 10:41:01 +02:00
Stephane Nicoll
f56cd789ac
Merge pull request #13308 from jmcshane:patch-1
...
* pr/13308:
Remove outdated reference to @EnableReactor
2018-05-31 10:40:46 +02:00
