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
Stephane Nicoll
c8f57acca6
Merge branch '2.0.x'
7 years ago
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
7 years ago
Andy Wilkinson
32a9addb57
Merge branch '2.0.x'
7 years ago
Andy Wilkinson
1ce22aa50a
Polish
7 years ago
Stephane Nicoll
39861bf819
Merge branch '2.0.x'
7 years ago
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
7 years ago
Stephane Nicoll
52b80c77d8
Merge branch '2.0.x'
7 years ago
Stephane Nicoll
9de2d1f839
Merge pull request #13288 from nkjackzhang:patch-1
...
* pr/13288:
Fix wrong reference in cast operation
7 years ago
nkjackzhang
17bcd1c359
Fix wrong reference in cast operation
...
Closes gh-13288
7 years ago
Stephane Nicoll
3bbdeee70b
Merge branch '2.0.x'
7 years ago
Stephane Nicoll
c2315f2e8c
Merge pull request #13286 from izeye:tag-constants
...
* pr/13286:
Use more Tag constants
7 years ago
Johnny Lim
bd2053aa17
Use more Tag constants
...
Closes gh-13286
7 years ago
Stephane Nicoll
188ba14c17
Merge branch '2.0.x'
7 years ago
Stephane Nicoll
cdcb37bed5
Merge pull request #13284 from izeye:patch-49
...
* pr/13284:
Fix a wrong issue reference
7 years ago
Johnny Lim
9de2a8786d
Fix a wrong issue reference
...
Closes gh-13284
7 years ago
Stephane Nicoll
e2c14c590a
Merge branch '2.0.x'
7 years ago
Stephane Nicoll
41bcfad647
Merge pull request #13280 from dreis2211:assert-integration-autoconfiguration
...
* pr/13280:
Add assertion in IntegrationAutoConfigurationTests
7 years ago
dreis2211
3ed31d60dc
Add assertion in IntegrationAutoConfigurationTests
...
Closes gh-13280
7 years ago
Stephane Nicoll
6814b7f240
Merge branch '2.0.x'
7 years ago
Stephane Nicoll
8a9d0bd22a
Merge branch '1.5.x' into 2.0.x
7 years ago
Stephane Nicoll
3118f14dbb
Fix NPE when OnExpressionCondition is invoked with a null BeanFactory
...
Closes gh-13249
7 years ago
Stephane Nicoll
ec65cb1753
Merge branch '2.0.x'
7 years ago
Stephane Nicoll
15ba50ab3e
Merge branch '1.5.x' into 2.0.x
7 years ago