Commit Graph

2311 Commits (0f321abe669f5f9783bd960b682ccb572e26142d)

Author SHA1 Message Date
Stephane Nicoll 55d70d5691 Merge branch '2.0.x' 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 5ae061f491 Merge branch '1.5.x' into 2.0.x 7 years ago
Madhura Bhave 9f4a5c13a5 Add auto-config for WebFlux OAuth2 Login
Closes gh-13142
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 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 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
Stephane Nicoll 463e11ab2b Merge branch '2.0.x' 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 bd9299dbf9 Add missing metadata for renamed SSL properties
Closes gh-13239
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 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
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
Johnny Lim bd2053aa17 Use more Tag constants
Closes gh-13286
7 years ago
Stephane Nicoll 188ba14c17 Merge branch '2.0.x' 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
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 ec65cb1753 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 15ba50ab3e Merge branch '1.5.x' into 2.0.x 7 years ago
Johnny Lim de01e7aad4 Polish
See gh-13243
7 years ago
Stephane Nicoll f91b53747a Merge branch '2.0.x' 7 years ago
Johnny Lim f385a1cb11 Polish
Closes gh-13243
7 years ago
Stephane Nicoll 7462401291 Merge branch '2.0.x' 7 years ago
Eddú Meléndez 065eebfb4b Fix javadoc
Closes gh-13274
7 years ago
Stephane Nicoll be9a0ef65d Merge branch '2.0.x' 7 years ago
hengyunabc b75e58b70f Add enforce-rule to ensure maven version >= 3.5.0
Closes gh-13271
7 years ago
Phillip Webb 3739699d79 Merge branch '2.0.x' 7 years ago
Phillip Webb dba73d76b8 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 1bb53ff44c Merge branch '2.0.x' 7 years ago
Arnaud Heritier b60eadb10b Add missing semicolon in example
Closes gh-13266
7 years ago
Phillip Webb 68ffbafbae Fix checkstyle violations 7 years ago
Phillip Webb 3702da4573 Formatting 7 years ago
Phillip Webb 2215709165 Merge branch '2.0.x' 7 years ago
Phillip Webb 6f0ccc64a5 Fix checkstyle violations 7 years ago
Phillip Webb 9fd3b9103a Format code 7 years ago
Phillip Webb e544922dd7 Merge branch '1.5.x' into 2.0.x 7 years ago
Phillip Webb 5626b7a50d Merge branch '2.0.x' 7 years ago
Phillip Webb 9c5f207e22 Fix merge error 7 years ago
Phillip Webb d8157c94f3 Merge branch '2.0.x' 7 years ago
Phillip Webb 21d80d87a3 Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 75c10e615e Merge branch '2.0.x' 7 years ago
Andrea Vacondio aed118c410 Fix documentation error
Closes gh-13260
7 years ago
Madhura Bhave 940c3d1b75 Merge branch '2.0.x' 7 years ago
Madhura Bhave 552878c431 Fix javadoc 7 years ago
Stephane Nicoll 79967a482a Merge branch '2.0.x' 7 years ago
Stephane Nicoll a5b53b263e Merge branch '1.5.x' into 2.0.x 7 years ago
Stephane Nicoll 4464a5f5bd Remove code deprecated in 2.0
Closes gh-12962
7 years ago
Stephane Nicoll 1ea3e95ff6 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 585135a280 Polish 7 years ago
Stephane Nicoll d5abd57a91 Remove deprecated use of spring.main.web-environment
Closes gh-13231
7 years ago
Stephane Nicoll 12bbb18844 Merge branch '2.0.x' 7 years ago
Stephane Nicoll a124379dd9 Remove use of deprecated `web` methods
Closes gh-13231
7 years ago
Stephane Nicoll 699b6ce6dc Remove reference to Jersey 1
Closes gh-12582
7 years ago
Phillip Webb c5f63c19a4 Merge branch '2.0.x' 7 years ago
Phillip Webb 2dc4f1df00 Polish 7 years ago
Phillip Webb 40e68a6427 Merge branch '2.0.x' 7 years ago
Phillip Webb 6d8b4710d7 Merge branch '1.5.x' into 2.0.x 7 years ago
Johnny Lim d72ba70cba Use type parameter for Supplier in AggregateBinder.merge()
Closes gh-13139
7 years ago
Stephane Nicoll 243023f2ad Merge branch '2.0.x' 7 years ago
Stephane Nicoll 300f6bf4d7 Polish contribution
Closes gh-13208
7 years ago
Mihhail Lapushkin d31dbac69e Support custom UriTemplateHandler in LocalHostUriTemplateHandler
See gh-13208
7 years ago
Stephane Nicoll 27c60e3deb Merge branch '2.0.x' 7 years ago
Stephane Nicoll 48cf025093 Polish 7 years ago
Stephane Nicoll d35d221b5c Merge branch '2.0.x' 7 years ago
Stephane Nicoll 6893be5479 Make sure that RabbitMQ metrics are configured early
The ConnectionFactory can be used early in user configuration to
configure an `Exchange`. Such connection may not hold the proper
MetricCollector and can be cached, leading to missed metrics
information.

This commit moves the configuration of RabbitMQ metrics to a
BeanPostProcessor so that the proper MetricCollector is configured
before any connection is created.

Closes gh-12855
7 years ago
Stephane Nicoll 8364d121b1 Merge branch '2.0.x' 7 years ago
Stephane Nicoll 125b5974c0 Merge branch '1.5.x' into 2.0.x 7 years ago
Johnny Lim b7fe3a5332 Make ErrorProperties.whitelabel final
Closes gh-13197
7 years ago