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

11605 Commits

Author SHA1 Message Date
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
Phillip Verheyden 08f8219248 Clarify edge case docs on ConditionalOnClass 
When used as a meta-annotation the value() attribute of
@ConditionalOnClass will fail silently resulting in the @Conditional
nature of the annotation being ignored.

See gh-8185
 2017-04-10 15:58:17 +02:00
Stephane Nicoll b099471df3 Merge branch '1.5.x' 2017-04-10 15:54:53 +02:00
Stephane Nicoll 2d930fd653 Merge branch '1.4.x' into 1.5.x 2017-04-10 15:54:34 +02:00
Stephane Nicoll a8860ba7e9 Clarify use of `@TestConfiguration` 
As `@TestComponent` is an implementation detail at this point really, this
commit removes any reference to it from the doc.

Closes gh-8421
 2017-04-10 15:54:08 +02:00
Brian Clozel b91e03b91c Fix devtools support in NettyWebServer 
This commit improves the lifecycle of the `NettyWebServer` and allows
multiple restarts when using devtools. Previously, the lifecycle was
tailored for a single start/stop cycle.

Fixes gh-8771
 2017-04-10 14:57:29 +02:00
Andy Wilkinson 49c9981001 Correct the id of Animal Sniffer's execution 2017-04-10 13:56:06 +01:00
Andy Wilkinson 5ac5aa3e9a Merge branch '1.5.x' 2017-04-10 13:45:51 +01:00
Andy Wilkinson f6a7e17688 Merge branch '1.4.x' into 1.5.x 2017-04-10 13:45:41 +01:00
Andy Wilkinson 6564fb3d96 Consider all loader paths when checking template availability 
Closes gh-8842
 2017-04-10 13:37:32 +01:00
Stephane Nicoll 6399ed7869 Fix checkstyle rule 2017-04-10 14:20:50 +02:00
Stephane Nicoll dbe388756a Merge branch '1.5.x' 2017-04-10 14:18:48 +02:00
Stephane Nicoll b4a1feae91 Merge pull request #8683 from bwajtr:1.5.x 
* pr/8683:
  Polish "Add support for HotSwapAgent to devtools"
  Add support for HotSwapAgent to devtools
 2017-04-10 14:18:35 +02:00
Stephane Nicoll 16afb8a973 Polish "Add support for HotSwapAgent to devtools" 
Closes gh-8683
 2017-04-10 14:18:23 +02:00
Bretislav Wajtr b368693d80 Add support for HotSwapAgent to devtools 
HotSwapAgent is an open source competition to JRebel. This commit adds
"org.hotswap.agent.HotswapAgent" to the list of known Java agent based
class reloaders. This causes same behavior as when JRebel is used: a full
restart is NOT triggered when any class changes, however LiveReload event
is still triggered.

See gh-8683
 2017-04-10 14:18:23 +02:00
Stephane Nicoll b3bcecc988 Merge branch '1.5.x' 2017-04-10 14:04:11 +02:00
Stephane Nicoll d8d36255af Merge branch '1.4.x' into 1.5.x 2017-04-10 14:02:51 +02:00
Stephane Nicoll caf30e3d9c Merge pull request #8703 from luispollo:patch-1 
* pr/8703:
  Polish "Document HTTP response format of health endpoint"
  Document HTTP response format of health endpoint
 2017-04-10 14:02:33 +02:00
Stephane Nicoll fd53945fe0 Polish "Document HTTP response format of health endpoint" 
Closes gh-8703
 2017-04-10 14:01:50 +02:00
Luis Fernando Pollo 1fa1ed2b28 Document HTTP response format of health endpoint 
Add HTTP response format details for health endpoint, including default
status codes and sample responses.

See gh-8703
 2017-04-10 13:51:07 +02:00
Stephane Nicoll 74be6ff0f1 Merge branch '1.5.x' 2017-04-10 13:41:04 +02:00
Stephane Nicoll a9b5e7c12a Merge branch '1.4.x' into 1.5.x 2017-04-10 13:38:27 +02:00
Stephane Nicoll 9d88e477f3 Fix Solr health indicator 
This commit changes the solr health indicator to request the status of
all available cores, rather than invoking a generic ping on the admin
handler.

Recent versions of Solr now have a ping handler per core and the general
admin handler is gone, leading to incorrect health status. For backward
compatible reason the `solrStatus` attribute is kept to `OK` if all cores
are running properly (that's actually `0` behind the scenes).

Closes gh-8463
 2017-04-10 13:38:08 +02:00
Andy Wilkinson 565b4028bc Merge branch '1.5.x' 2017-04-10 11:12:28 +01:00
Andy Wilkinson db60ed66ae Upgrade to Dependency Management Plugin 1.0.2.RELEASE 
Closes gh-8876
 2017-04-10 11:12:03 +01:00
Stephane Nicoll bc340002cf Merge branch '1.5.x' 2017-04-10 11:15:33 +02:00
Stephane Nicoll 7c9b2afa5b Merge branch '1.4.x' into 1.5.x 2017-04-10 10:57:52 +02:00
Stephane Nicoll 3c28687279 Merge pull request #8829 from stefan-huettemann:gh-8508 
* pr/8829:
  Allow to disable max http post size limit
 2017-04-10 10:55:08 +02:00