Vedran Pavic
205b1c1327
Upgrade to Hazelcast 3.10.1
...
Closes gh-13322
2018-06-01 09:30:42 +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
Johnny Lim
6b0ce46491
Polish
...
Closes gh-13320
2018-06-01 09:22:20 +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
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
James McShane
d74c768cdd
Remove outdated reference to @EnableReactor
...
Closes gh-13308
2018-05-31 10:39:44 +02:00
Phillip Webb
92b9b234f1
Merge branch '2.0.x'
2018-05-30 22:53:33 -07:00
Phillip Webb
3751968ecd
Add missing ExpectedException rule
...
Add ExpectedException rule which was missed from the 1.5.x merge.
2018-05-30 22:52:25 -07:00
Phillip Webb
840948c6c9
Polish
2018-05-30 21:02:57 -07:00
Phillip Webb
3fb79194a0
Merge branch '2.0.x'
2018-05-30 21:02:07 -07:00
Phillip Webb
f8ec2e6176
Polish
2018-05-30 21:01:31 -07:00
Phillip Webb
cf27917e86
Merge branch '2.0.x'
2018-05-30 20:30:38 -07:00
Phillip Webb
bdd541b2cc
Merge branch '1.5.x' into 2.0.x
2018-05-30 20:29:03 -07:00
Phillip Webb
5ae061f491
Merge branch '1.5.x' into 2.0.x
2018-05-30 20:27:19 -07:00
Madhura Bhave
9f4a5c13a5
Add auto-config for WebFlux OAuth2 Login
...
Closes gh-13142
2018-05-30 18:53:11 -07:00
Phillip Webb
792f0b190d
Merge branch '2.0.x'
2018-05-30 14:08:42 -07:00
Phillip Webb
2c6465abdc
Merge branch '1.5.x' into 2.0.x
2018-05-30 14:08:15 -07:00
Phillip Webb
353560278b
Merge branch '2.0.x'
2018-05-30 13:29:41 -07:00
Phillip Webb
401fcbeaa4
Merge branch '1.5.x' into 2.0.x
2018-05-30 13:29:10 -07:00
Phillip Webb
40800355c7
Merge branch '2.0.x'
2018-05-30 12:41:48 -07:00
Phillip Webb
587df6a07a
Port call setHttpOnly property on Tomcat context
...
Port "setHttpOnly on the TomcatContext" fix from commit 4d84933ee4
2018-05-30 12:23:40 -07:00
Phillip Webb
e38d5f910b
Merge branch '1.5.x' into 2.0.x
2018-05-30 12:18:38 -07:00
Phillip Webb
09fa1e7e11
Polish
2018-05-30 12:12:01 -07:00
Stephane Nicoll
463e11ab2b
Merge branch '2.0.x'
2018-05-30 17:49:53 +02:00
Johnny Lim
4eb070767c
Remove an unnecessary @QuartzDataSource
...
Closes gh-13302
2018-05-30 17:49:21 +02:00
Stephane Nicoll
f06627c408
Allow CompositeHealthIndicator to be created with a Map as before
...
See gh-4965
2018-05-30 16:09:07 +02:00
Stephane Nicoll
bb69339a82
Merge branch '2.0.x'
2018-05-30 15:28:15 +02:00
Stephane Nicoll
b47a72731f
Merge branch '1.5.x' into 2.0.x
2018-05-30 15:27:58 +02:00
Stephane Nicoll
bd9299dbf9
Add missing metadata for renamed SSL properties
...
Closes gh-13239
2018-05-30 14:24:07 +02:00
Andy Wilkinson
35c48bb9bd
Polish
2018-05-30 10:28:52 +01:00
Andy Wilkinson
48a6abe217
Polish
2018-05-30 10:19:06 +01:00
Madhura Bhave
ed08e4592f
Merge branch '2.0.x'
2018-05-29 15:15:02 -07:00
Madhura Bhave
ad1283195a
Fix test in "Truststore password if SSLstoreprovider present"
...
See gh-13088
2018-05-29 15:06:39 -07:00
Ian Chan
e75d45ca45
Use empty trust-store password if SSL store provider present
...
For Tomcat, if an SslStoreProvider is configured,
`SslStoreProviderUrlStreamHandlerFactory` stores the trust-store with an
empty password. Previously, if a password was supplied using the
ssl.trust-store-password property, that would be the password used to
load the trust-store and the connector would warn with "Password
verification failed" message.
Fixes gh-12688
2018-05-29 15:02:30 -07:00
Stephane Nicoll
3f001899b4
Harmonize ssl properties for Kafka
...
Closes gh-13239
2018-05-29 17:51:01 +02:00
Stephane Nicoll
56dd53bfba
Merge branch '2.0.x'
2018-05-29 17:28:34 +02:00
Stephane Nicoll
7849d73828
Polish
...
See gh-13031
2018-05-29 17:28:16 +02:00
Stephane Nicoll
c8f57acca6
Merge branch '2.0.x'
2018-05-29 16:03:00 +02:00
