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
11,732 Commits 24 Branches 369 Tags 282 MiB
Commit Graph

11732 Commits

Author SHA1 Message Date
Stephane Nicoll aa4051727b Merge branch '1.5.x' 2017-04-12 14:37:08 +02:00
Stephane Nicoll 6567018b70 Merge branch '1.4.x' into 1.5.x 2017-04-12 14:36:48 +02:00
Stephane Nicoll 2579023035 Fix javadoc 
Closes gh-8892
 2017-04-12 14:36:02 +02:00
Stephane Nicoll d4251125fc Make sure Admin MBean works also with webflux 
This commit improves `SpringApplicationAdminMXBeanRegistrar` so that it
work with traditional Servlet-based app but also with Spring WebFlux.

Closes gh-8533
 2017-04-12 14:30:42 +02:00
Stephane Nicoll abe3dba4b9 Merge branch '1.5.x' 2017-04-12 11:46:59 +02:00
Stephane Nicoll f4ab574ea1 Merge branch '1.4.x' into 1.5.x 2017-04-12 11:46:43 +02:00
Stephane Nicoll 072160863a Add a note about transactional tests and `webEnvironment` 
Closes gh-8232
 2017-04-12 11:46:06 +02:00
Stephane Nicoll 12170f53e2 Restore DataMongoTestReactiveIntegrationTests 
Closes gh-8885
 2017-04-12 11:23:30 +02:00
Stephane Nicoll 01089c5f7a Merge branch '1.5.x' 2017-04-12 11:16:10 +02:00
Stephane Nicoll 68c90b24c2 Merge branch '1.4.x' into 1.5.x 2017-04-12 11:15:51 +02:00
Stephane Nicoll 40f4c89602 Document list merge restrictions with YAML 
Closes gh-6911
 2017-04-12 11:15:24 +02:00
Stephane Nicoll d3f180b664 Merge branch '1.5.x' 2017-04-12 10:55:58 +02:00
Stephane Nicoll 715cf7da75 Do not enable cglib if spring.aop.proxy-target-class is configured 
This commit makes sure to honour the `spring.aop.proxy-target-class`
property if set by the user. Previously, the
`PersistenceExceptionTranslationPostProcessor` was always configured to
use cglib, regardless of the value of that property.

Closes gh-8887
 2017-04-12 10:55:43 +02:00
Stephane Nicoll 7f270356ed Merge branch '1.5.x' 2017-04-12 10:28:48 +02:00
Stephane Nicoll 0affa3af3a Merge branch '1.4.x' into 1.5.x 2017-04-12 10:28:32 +02:00
Stephane Nicoll be3b5a9dc2 Only apply editorconfig for certain files 
Closes gh-8497
 2017-04-12 10:28:00 +02:00
Stephane Nicoll 2f2b1a0e8f Polish 2017-04-12 10:15:39 +02:00
Stephane Nicoll bcb13bea63 Split JPA-specific bits of Batch auto-config 
This commit separates the JPA-specific bits of the batch
auto-configuration so that it is possible to reuse most of the logic if
JPA isn't available at all.

Closes gh-8877
 2017-04-12 10:04:42 +02:00
Phillip Webb c4cba6b0ea Merge branch '1.5.x' 2017-04-11 21:07:51 -07:00
Phillip Webb c97268981a Polish 2017-04-11 20:59:03 -07:00
Phillip Webb d301d0f4c3 Merge branch '1.4.x' into 1.5.x 2017-04-11 20:42:48 -07:00
Phillip Webb 758ddcd420 Polish 2017-04-11 20:17:23 -07:00
Madhura Bhave 971057705d Merge branch '1.5.x' 2017-04-11 15:57:10 -07:00
Madhura Bhave 535451f9e5 Merge branch '1.4.x' into 1.5.x 2017-04-11 15:54:01 -07:00
Madhura Bhave b2f0ebfcb8 Prevent empty json for parameters in trace endpoint 
Fixes gh-8883
 2017-04-11 15:30:39 -07:00
Phillip Webb d21a5076fe Upgrade to Reactor BOM Bismuth SNAPSHOT 
See gh-8884
 2017-04-11 14:53:46 -07:00
Stephane Nicoll bd28de09b0 Merge branch '1.5.x' 2017-04-11 15:30:18 +02:00
Stephane Nicoll eff35795cd Fix checkstyle violation 2017-04-11 15:29:52 +02:00
Stephane Nicoll a00b695748 Do not enable cglib if spring.aop.proxy-target-class is configured 
This commit makes sure to honour the `spring.aop.proxy-target-class`
property if set by the user. Previously, the
`MethodValidationPostProcessor` was always configured to use cglib,
regardless of the value of that property.

Closes gh-8869
 2017-04-11 15:28:21 +02:00
Stephane Nicoll 158b3dae16 Merge branch '1.5.x' 2017-04-11 14:57:19 +02:00
Stephane Nicoll b148b46751 Polish 2017-04-11 14:54:16 +02:00
Stephane Nicoll 7905874f9d Merge pull request #8650 from ColinHarrington:disable-actuator-trace-filter 
* pr/8650:
  Polish "Add the ability to disable the trace filter"
  Add the ability to disable the trace filter
 2017-04-11 14:47:04 +02:00
Stephane Nicoll 2ef318c00d Polish "Add the ability to disable the trace filter" 
Closes gh-8650
 2017-04-11 14:46:57 +02:00
Colin Harrington d3e2e22f8c Add the ability to disable the trace filter 
See gh-8650
 2017-04-11 14:46:57 +02:00
Stephane Nicoll fccab42711 Merge pull request #8813 from eddumelendez:gh-8798 
* pr/8813:
  Polish "Fix http status code with unknown log level"
  Fix http status code with unknown log level
 2017-04-11 14:46:26 +02:00
Stephane Nicoll 134e93f3fd Fix API change in latest snapshot 2017-04-11 13:57:29 +02:00
Stephane Nicoll 82ac8b5ca1 Polish "Fix http status code with unknown log level" 
Closes gh-8813
 2017-04-11 13:29:53 +02:00
Eddú Meléndez cf08162148 Fix http status code with unknown log level 
This commit changes the http status code to 400 when an unknown log level
is specified.

Closes gh-8798
See gh-8813
 2017-04-11 13:23:41 +02:00
Stephane Nicoll ad8b671b3c Merge pull request #8879 from izeye:polish-20170411 
* pr/8879:
  Polish
 2017-04-11 09:41:57 +02:00
Johnny Lim 0cd1285aa4 Polish 
Closes gh-8879
 2017-04-11 09:41:33 +02:00
Stephane Nicoll 5b92a0278b Merge branch '1.5.x' 2017-04-11 09:41:08 +02:00
Stephane Nicoll 934d33685a Polish 
See gh-8879
 2017-04-11 09:40:54 +02:00
Stephane Nicoll 3f883f1898 Merge branch '1.4.x' into 1.5.x 2017-04-11 09:38:11 +02:00
Stephane Nicoll 404bb2d171 Polish 
See gh-8879
 2017-04-11 09:37:22 +02:00
Stephane Nicoll 2bdbe343df Merge branch '1.5.x' 2017-04-10 16:14:13 +02:00
Stephane Nicoll a132bd141f Merge branch '1.4.x' into 1.5.x 2017-04-10 16:13:53 +02:00
Stephane Nicoll ac98d2ac27 Merge pull request #8185 from phillipuniverse:master 
* pr/8185:
  Polish "Clarify edge case docs on ConditionalOnClass"
  Clarify edge case docs on ConditionalOnClass
 2017-04-10 16:12:53 +02:00
Stephane Nicoll 0a55e3e736 Polish "Clarify edge case docs on ConditionalOnClass" 
Closes gh-8185
 2017-04-10 16:12:11 +02:00
Andy Wilkinson aacdeaea4e Merge branch '1.5.x' 2017-04-10 15:09:24 +01:00
Andy Wilkinson 035cbd91f4 Use main thread in OnClassCondition if thread create/start fails 
Previously, as a result of the changes made in de50cfa21e, an
application would fail to start on Google AppEngine as it prevents
the creation of new threads.

This commit updates OnClassCondition so that it falls back to
performing the work on the main thread when its unable to shift it
to a separate thread.

Closes gh-8584
 2017-04-10 15:09:21 +01:00