Andy Wilkinson
cff5c1ec72
Merge branch '2.0.x'
7 years ago
Andy Wilkinson
0d7d95d8a9
Align RestTemplateBuilder with Framework's removal of OkHttp 2 support
...
Closes gh-13314
7 years ago
Stephane Nicoll
55d70d5691
Merge branch '2.0.x'
7 years ago
Stephane Nicoll
f56cd789ac
Merge pull request #13308 from jmcshane:patch-1
...
* pr/13308:
Remove outdated reference to @EnableReactor
7 years ago
James McShane
d74c768cdd
Remove outdated reference to @EnableReactor
...
Closes gh-13308
7 years ago
Phillip Webb
92b9b234f1
Merge branch '2.0.x'
7 years ago
Phillip Webb
3751968ecd
Add missing ExpectedException rule
...
Add ExpectedException rule which was missed from the 1.5.x merge.
7 years ago
Phillip Webb
840948c6c9
Polish
7 years ago
Phillip Webb
3fb79194a0
Merge branch '2.0.x'
7 years ago
Phillip Webb
f8ec2e6176
Polish
7 years ago
Phillip Webb
cf27917e86
Merge branch '2.0.x'
7 years ago
Phillip Webb
bdd541b2cc
Merge branch '1.5.x' into 2.0.x
7 years ago
Phillip Webb
bb0550ab95
Polish
7 years ago
Phillip Webb
5ae061f491
Merge branch '1.5.x' into 2.0.x
7 years ago
Phillip Webb
55d0611bc3
Guard against JarURLConnection with wrong JAR
...
Update `JarURLConnection.get()` to guard against the wrong nested JAR
being used as context.
Closes gh-11367
7 years ago
Madhura Bhave
9ec9a74a58
Merge branch '2.0.x'
7 years ago
Madhura Bhave
1758d8c106
Remove email resource from pipeline
...
Closes gh-13307
7 years ago
Madhura Bhave
9f4a5c13a5
Add auto-config for WebFlux OAuth2 Login
...
Closes gh-13142
7 years ago
Phillip Webb
5243adce22
Restore Java 1.6 compatibility
7 years ago
Phillip Webb
792f0b190d
Merge branch '2.0.x'
7 years ago
Phillip Webb
2c6465abdc
Merge branch '1.5.x' into 2.0.x
7 years ago
Phillip Webb
00b76490dc
Remove error logging on ClientAbortException
...
Update `ErrorPageFilter` so that a Tomcat `ClientAbortException` no
longer causes "Cannot forward to error page for request" logging for
committed responses. Since a `ClientAbortException` indicates that the
client is no longer available it's of no consequence that the request
has been committed and the forward will fail.
Closes gh-13221
7 years ago
Phillip Webb
43071b9375
Polish formatting
7 years ago
Phillip Webb
353560278b
Merge branch '2.0.x'
7 years ago
Phillip Webb
401fcbeaa4
Merge branch '1.5.x' into 2.0.x
7 years ago
Phillip Webb
2bfcefa48e
Reinstate support for disabling build checking
...
Closes gh-13291
7 years ago
Phillip Webb
40800355c7
Merge branch '2.0.x'
7 years ago
Phillip Webb
587df6a07a
Port call setHttpOnly property on Tomcat context
...
Port "setHttpOnly on the TomcatContext" fix from commit 4d84933ee4
to
2.0.x. Since `Session` details are now configured on the
`WebServerFactory` we can directly configure the context.
See gh-12580
7 years ago
Phillip Webb
e38d5f910b
Merge branch '1.5.x' into 2.0.x
7 years ago
Phillip Webb
09fa1e7e11
Polish
7 years ago
Phillip Webb
4d84933ee4
Also call setHttpOnly property on Tomcat context
...
Update `ServerProperties` to also call `setHttpOnly` on the
`TomcatContext`. It appears that this is required in addition to
using the `ServletContextInitializer` to setup `SessionCookieConfig`.
Closes gh-12580
7 years ago
Phillip Webb
b03f890567
Upgrade to spring-javaformat 0.0.2
7 years ago
Stephane Nicoll
463e11ab2b
Merge branch '2.0.x'
7 years ago
Stephane Nicoll
10589b90e4
Merge pull request #13302 from izeye:remove-unnecessary-quartz-data-source
...
* pr/13302:
Remove an unnecessary @QuartzDataSource
7 years ago
Johnny Lim
4eb070767c
Remove an unnecessary @QuartzDataSource
...
Closes gh-13302
7 years ago
Stephane Nicoll
f06627c408
Allow CompositeHealthIndicator to be created with a Map as before
...
See gh-4965
7 years ago
Stephane Nicoll
bb69339a82
Merge branch '2.0.x'
7 years ago
Stephane Nicoll
b47a72731f
Merge branch '1.5.x' into 2.0.x
7 years ago
Stephane Nicoll
5692b83a6f
Add note on sanitizing values
...
Closes gh-13138
7 years ago
Stephane Nicoll
bd9299dbf9
Add missing metadata for renamed SSL properties
...
Closes gh-13239
7 years ago
Andy Wilkinson
69a928876f
Merge branch '2.0.x'
7 years ago
Andy Wilkinson
35c48bb9bd
Polish
7 years ago
Andy Wilkinson
48a6abe217
Polish
7 years ago
Madhura Bhave
ed08e4592f
Merge branch '2.0.x'
7 years ago
Madhura Bhave
9229b6f248
Merge pull request #13088 from icha024
...
* gh-13088:
Fix test in "Truststore password if SSLstoreprovider present"
Use empty trust-store password if SSL store provider present
7 years ago
Madhura Bhave
ad1283195a
Fix test in "Truststore password if SSLstoreprovider present"
...
See gh-13088
7 years ago
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
7 years ago
Stephane Nicoll
3f001899b4
Harmonize ssl properties for Kafka
...
Closes gh-13239
7 years ago
Stephane Nicoll
56dd53bfba
Merge branch '2.0.x'
7 years ago
Stephane Nicoll
7849d73828
Polish
...
See gh-13031
7 years ago