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

16946 Commits

Author SHA1 Message Date
Madhura Bhave 1758d8c106 Remove email resource from pipeline 
Closes gh-13307
 2018-05-30 19:05:34 -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 5243adce22 Restore Java 1.6 compatibility 2018-05-30 18:23:17 -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 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
 2018-05-30 14:00:55 -07:00
Phillip Webb 43071b9375 Polish formatting 2018-05-30 13:34: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 2bfcefa48e Reinstate support for disabling build checking 
Closes gh-13291
 2018-05-30 13:24:06 -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
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
 2018-05-30 12:02:46 -07:00
Phillip Webb b03f890567 Upgrade to spring-javaformat 0.0.2 2018-05-30 11:14:26 -07:00
Stephane Nicoll 463e11ab2b Merge branch '2.0.x' 2018-05-30 17:49:53 +02:00
Stephane Nicoll 10589b90e4 Merge pull request #13302 from izeye:remove-unnecessary-quartz-data-source 
* pr/13302:
  Remove an unnecessary @QuartzDataSource
 2018-05-30 17:49:41 +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 5692b83a6f Add note on sanitizing values 
Closes gh-13138
 2018-05-30 15:21: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 69a928876f Merge branch '2.0.x' 2018-05-30 10:31:33 +01: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 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
 2018-05-29 15:12:53 -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
Stephane Nicoll 9de2d1f839 Merge pull request #13288 from nkjackzhang:patch-1 
* pr/13288:
  Fix wrong reference in cast operation
 2018-05-29 10:39:27 +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
Stephane Nicoll c2315f2e8c Merge pull request #13286 from izeye:tag-constants 
* pr/13286:
  Use more Tag constants
 2018-05-29 09:32:49 +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
Stephane Nicoll cdcb37bed5 Merge pull request #13284 from izeye:patch-49 
* pr/13284:
  Fix a wrong issue reference
 2018-05-29 09:22:01 +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