root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity
16,933 Commits 24 Branches 372 Tags 284 MiB
Commit Graph

16933 Commits

Author SHA1 Message Date
Andy Wilkinson e306aad28c Merge branch '2.0.x' 2018-06-01 17:27:10 +01:00
Andy Wilkinson 27267a7090 Ensure that condition evaluator uses runner’s class loader 
Closes gh-13319
 2018-06-01 17:26:32 +01:00
Stephane Nicoll 68c10ea0cd Merge pull request #13322 from vpavic:upgrade-hazelcast 
* pr/13322:
  Upgrade to Hazelcast 3.10.1
 2018-06-01 09:31:50 +02:00
Vedran Pavic 205b1c1327 Upgrade to Hazelcast 3.10.1 
Closes gh-13322
 2018-06-01 09:30:42 +02:00
Stephane Nicoll d350345721 Merge pull request #13324 from izeye:metrics-properties-final 
* pr/13324:
  Make MetricsProperties fields final if possible
 2018-06-01 09:29:58 +02:00
Johnny Lim 5d5a14e4f7 Make MetricsProperties fields final if possible 
Closes gh-13324
 2018-06-01 09:29:34 +02:00
Stephane Nicoll 77dcbdb1e5 Polish 
See gh-13320
 2018-06-01 09:28:55 +02:00
Stephane Nicoll bc47bf44a9 Merge branch '2.0.x' 2018-06-01 09:26:29 +02:00
Stephane Nicoll 152ce145fd Merge pull request #13320 from izeye:polish-20180601 
* pr/13320:
  Polish
 2018-06-01 09:25:48 +02:00
Johnny Lim 6b0ce46491 Polish 
Closes gh-13320
 2018-06-01 09:22:20 +02:00
Stephane Nicoll 81ef6fec7b Add reference to Gitter 2018-06-01 07:59:18 +02:00
Madhura Bhave 817c228906 Merge branch '2.0.x' 2018-05-31 16:53:51 -07:00
Madhura Bhave 0afd947350 BindFailureAnalyzer should show original failure message 
Fixes gh-13122
 2018-05-31 16:51:42 -07:00
Stephane Nicoll 58d634f498 Merge branch '2.0.x' 2018-05-31 21:05:16 +02:00
Stephane Nicoll fa21333e4d Upgrade to Spring Cloud Connectors 2.0.2.RELEASE 
Closes gh-13318
 2018-05-31 21:04:02 +02:00
Stephane Nicoll 5790a26bcb Merge branch '2.0.x' 2018-05-31 17:36:10 +02:00
Stephane Nicoll 20e349c332 Polish 2018-05-31 17:35:56 +02:00
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
Stephane Nicoll f745f20c8c Clarify scope of JNDI-based MailSenderAutoConfiguration 
This commit separates the auto-configuration of JavaMailSender in two
distinct configuration: one based on existing Session available on JNDI
and the other one based on properties configuration.

This clarifies the auto-configuration report and the fact that the JNDI
variant overrides any Session-related properties that would have been
set in the environment

Closes gh-13026
 2018-05-31 16:20:40 +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
Stephane Nicoll f56cd789ac Merge pull request #13308 from jmcshane:patch-1 
* pr/13308:
  Remove outdated reference to @EnableReactor
 2018-05-31 10:40:46 +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 bb0550ab95 Polish 2018-05-30 20:28:50 -07:00
Phillip Webb 5ae061f491 Merge branch '1.5.x' into 2.0.x 2018-05-30 20:27:19 -07:00
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
 2018-05-30 19:59:56 -07:00
Madhura Bhave 9ec9a74a58 Merge branch '2.0.x' 2018-05-30 19:06:50 -07:00
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