root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity
16,981 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

2316 Commits

Author SHA1 Message Date
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 to
2.0.x. Since `Session` details are now configured on the
`WebServerFactory` we can directly configure the context.

See gh-12580
 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
Stephane Nicoll ec65cb1753 Merge branch '2.0.x' 2018-05-28 10:52:42 +02:00
Stephane Nicoll 15ba50ab3e Merge branch '1.5.x' into 2.0.x 2018-05-28 10:52:21 +02:00
Johnny Lim de01e7aad4 Polish 
See gh-13243
 2018-05-28 09:46:40 +02:00
Stephane Nicoll f91b53747a Merge branch '2.0.x' 2018-05-28 09:41:41 +02:00
Johnny Lim f385a1cb11 Polish 
Closes gh-13243
 2018-05-28 09:36:15 +02:00
Stephane Nicoll 7462401291 Merge branch '2.0.x' 2018-05-28 09:28:30 +02:00
Eddú Meléndez 065eebfb4b Fix javadoc 
Closes gh-13274
 2018-05-28 09:26:16 +02:00
Stephane Nicoll be9a0ef65d Merge branch '2.0.x' 2018-05-27 18:04:38 +02:00
hengyunabc b75e58b70f Add enforce-rule to ensure maven version >= 3.5.0 
Closes gh-13271
 2018-05-27 18:03:52 +02:00
Phillip Webb 3739699d79 Merge branch '2.0.x' 2018-05-26 08:44:13 -07:00
Phillip Webb dba73d76b8 Merge branch '1.5.x' into 2.0.x 2018-05-26 08:43:27 -07:00
Stephane Nicoll 1bb53ff44c Merge branch '2.0.x' 2018-05-26 12:44:50 +02:00
Arnaud Heritier b60eadb10b Add missing semicolon in example 
Closes gh-13266
 2018-05-26 12:44:11 +02:00
Phillip Webb 68ffbafbae Fix checkstyle violations 2018-05-26 00:01:45 -07:00
Phillip Webb 3702da4573 Formatting 2018-05-25 23:52:38 -07:00
Phillip Webb 2215709165 Merge branch '2.0.x' 2018-05-25 23:50:39 -07:00
Phillip Webb 6f0ccc64a5 Fix checkstyle violations 2018-05-25 23:03:17 -07:00
Phillip Webb 9fd3b9103a Format code 2018-05-25 23:02:45 -07:00
Phillip Webb e544922dd7 Merge branch '1.5.x' into 2.0.x 2018-05-25 23:02:08 -07:00
Phillip Webb 5626b7a50d Merge branch '2.0.x' 2018-05-25 20:58:31 -07:00
Phillip Webb 9c5f207e22 Fix merge error 2018-05-25 20:57:46 -07:00
Phillip Webb d8157c94f3 Merge branch '2.0.x' 2018-05-25 19:48:37 -07:00
Phillip Webb 21d80d87a3 Merge branch '1.5.x' into 2.0.x 2018-05-25 18:45:37 -07:00
Stephane Nicoll 75c10e615e Merge branch '2.0.x' 2018-05-25 16:45:57 +02:00
Andrea Vacondio aed118c410 Fix documentation error 
Closes gh-13260
 2018-05-25 16:43:35 +02:00
Madhura Bhave 940c3d1b75 Merge branch '2.0.x' 2018-05-25 10:39:22 +02:00
Madhura Bhave 552878c431 Fix javadoc 2018-05-25 10:37:39 +02:00
Stephane Nicoll 79967a482a Merge branch '2.0.x' 2018-05-24 11:44:10 +02:00
Stephane Nicoll a5b53b263e Merge branch '1.5.x' into 2.0.x 2018-05-24 11:43:48 +02:00
Stephane Nicoll 4464a5f5bd Remove code deprecated in 2.0 
Closes gh-12962
 2018-05-22 14:48:25 +02:00
Stephane Nicoll 1ea3e95ff6 Merge branch '2.0.x' 2018-05-22 13:40:51 +02:00
Stephane Nicoll 585135a280 Polish 2018-05-22 13:40:40 +02:00
Stephane Nicoll d5abd57a91 Remove deprecated use of spring.main.web-environment 
Closes gh-13231
 2018-05-22 13:39:02 +02:00
Stephane Nicoll 12bbb18844 Merge branch '2.0.x' 2018-05-22 12:51:31 +02:00
Stephane Nicoll a124379dd9 Remove use of deprecated `web` methods 
Closes gh-13231
 2018-05-22 12:51:06 +02:00
Stephane Nicoll 699b6ce6dc Remove reference to Jersey 1 
Closes gh-12582
 2018-05-22 10:50:27 +02:00
Phillip Webb c5f63c19a4 Merge branch '2.0.x' 2018-05-21 21:38:32 -07:00
Phillip Webb 2dc4f1df00 Polish 2018-05-21 21:32:42 -07:00
Phillip Webb 40e68a6427 Merge branch '2.0.x' 2018-05-21 17:20:04 -07:00
Phillip Webb 6d8b4710d7 Merge branch '1.5.x' into 2.0.x 2018-05-21 17:18:49 -07:00
Johnny Lim d72ba70cba Use type parameter for Supplier in AggregateBinder.merge() 
Closes gh-13139
 2018-05-18 14:35:16 +02:00
Stephane Nicoll 243023f2ad Merge branch '2.0.x' 2018-05-18 14:26:31 +02:00
Stephane Nicoll 300f6bf4d7 Polish contribution 
Closes gh-13208
 2018-05-18 14:20:31 +02:00
Mihhail Lapushkin d31dbac69e Support custom UriTemplateHandler in LocalHostUriTemplateHandler 
See gh-13208
 2018-05-18 14:19:01 +02:00
Stephane Nicoll 27c60e3deb Merge branch '2.0.x' 2018-05-18 13:42:57 +02:00
Stephane Nicoll 48cf025093 Polish 2018-05-18 13:42:45 +02:00