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

11786 Commits

Author SHA1 Message Date
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
Dr. Stefan Hüttemann 0294ad3e95 Allow to disable max http post size limit 
Closes gh-8508
 2017-04-10 10:54:20 +02:00
Andy Wilkinson 858bd8554d Align test logging config with latest change in Spring Framework 
See spring-projects/spring-framework@ea5cb26d75
 2017-04-10 09:39:05 +01:00
Stephane Nicoll bf333b7e4e Merge branch '1.5.x' 2017-04-08 16:34:20 +02:00
Stephane Nicoll ec0cc0fe2d Merge pull request #8866 from garyrussell:kafka 
* pr/8866:
  Upgrade to Spring Kafka 1.1.4
 2017-04-08 16:32:12 +02:00
Gary Russell 80486fbe65 Upgrade to Spring Kafka 1.1.4 
Closes gh-8866
 2017-04-08 16:32:00 +02:00
Andy Wilkinson 9d642a69b3 Merge branch '1.5.x' 2017-04-07 14:17:23 +01:00
Andy Wilkinson ac3071670f Merge branch '1.4.x' into 1.5.x 2017-04-07 14:17:08 +01:00
Andy Wilkinson 492aee9cea Remove unused optional dependency 
It should have been removed in 2522a5f9ef
 2017-04-07 14:16:44 +01:00
Andy Wilkinson ceb80614e5 Polishing 2017-04-07 14:13:55 +01:00
Andy Wilkinson 8c785b214b Merge branch '1.5.x' 2017-04-07 13:55:17 +01:00
Andy Wilkinson bccbbc145e Merge branch '1.4.x' into 1.5.x 2017-04-07 13:49:19 +01:00
Andy Wilkinson 60505a4fae Don't shut down "in-memory" DB running as a server on DevTools restart 
Closes gh-8702
 2017-04-07 13:47:40 +01:00
Andy Wilkinson 7a4b87be6b Merge branch '1.5.x' 2017-04-07 12:21:09 +01:00
Andy Wilkinson c74f0a70ca Merge branch '1.4.x' into 1.5.x 2017-04-07 12:14:47 +01:00
Andy Wilkinson ef72c22563 Update HtmlUnitDriver tests to align with HtmlUnit 2.26 
See gh-8853 and cb34189c66
 2017-04-07 12:10:39 +01:00
Andy Wilkinson 5dad7182db Address deprecation warnings 2017-04-07 12:01:01 +01:00
Andy Wilkinson fd8814bbfb Upgrade to Thymeleaf Extras Springsecurity4 3.0.2.RELEASE 
Closes gh-8860
 2017-04-07 11:47:41 +01:00
Andy Wilkinson ac83ff0506 Upgrade to Thymeleaf Spring5 3.0.5.M3 
Closes gh-8859
 2017-04-07 11:47:40 +01:00
Andy Wilkinson 01e0ab6662 Upgrade to Thymeleaf 3.0.5.RELEASE 
Closes gh-8858
 2017-04-07 11:47:40 +01:00