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
Stephane Nicoll
faa9910e46
Enable cache when a SecurityContext parameter is used
...
This commit restores caching for the main read operation when the
SecurityContext does not expose a principal (i.e. guest access).
Closes gh-13238
2018-05-29 15:56:22 +02:00
Andy Wilkinson
32a9addb57
Merge branch '2.0.x'
2018-05-29 13:59:37 +01:00
Andy Wilkinson
1ce22aa50a
Polish
2018-05-29 13:58:40 +01:00
Stephane Nicoll
39861bf819
Merge branch '2.0.x'
2018-05-29 14:18:26 +02:00
Stephane Nicoll
4259817572
Fix extension discovery when endpoint instance is sub-classed
...
This commit fixes endpoint extension discovery when the related endpoint
is sub-classed. Previously, a strict by type check was applied against
the `endpoint` attribute of `EndpointExtension`.
Rather than using a `Class` check, this commit extracts the id of an
endpoint and uses it to match its extension, if any.
Closes gh-13082
2018-05-29 14:12:23 +02:00
Stephane Nicoll
52b80c77d8
Merge branch '2.0.x'
2018-05-29 10:39:39 +02:00
nkjackzhang
17bcd1c359
Fix wrong reference in cast operation
...
Closes gh-13288
2018-05-29 10:37:32 +02:00
Stephane Nicoll
3bbdeee70b
Merge branch '2.0.x'
2018-05-29 09:33:03 +02:00
Johnny Lim
bd2053aa17
Use more Tag constants
...
Closes gh-13286
2018-05-29 09:32:26 +02:00
Stephane Nicoll
188ba14c17
Merge branch '2.0.x'
2018-05-29 09:22:15 +02:00
Johnny Lim
9de2a8786d
Fix a wrong issue reference
...
Closes gh-13284
2018-05-29 09:21:41 +02:00
Stephane Nicoll
e2c14c590a
Merge branch '2.0.x'
2018-05-29 09:04:31 +02:00
dreis2211
3ed31d60dc
Add assertion in IntegrationAutoConfigurationTests
...
Closes gh-13280
2018-05-29 09:04:00 +02:00
Stephane Nicoll
6814b7f240
Merge branch '2.0.x'
2018-05-28 14:29:00 +02:00
Stephane Nicoll
8a9d0bd22a
Merge branch '1.5.x' into 2.0.x
2018-05-28 14:28:45 +02:00
