Stephane Nicoll
404bb2d171
Polish
...
See gh-8879
8 years ago
Stephane Nicoll
2bdbe343df
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
a132bd141f
Merge branch '1.4.x' into 1.5.x
8 years ago
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
8 years ago
Stephane Nicoll
0a55e3e736
Polish "Clarify edge case docs on ConditionalOnClass"
...
Closes gh-8185
8 years ago
Andy Wilkinson
aacdeaea4e
Merge branch '1.5.x'
8 years ago
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
8 years ago
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
8 years ago
Stephane Nicoll
b099471df3
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
2d930fd653
Merge branch '1.4.x' into 1.5.x
8 years ago
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
8 years ago
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
8 years ago
Andy Wilkinson
49c9981001
Correct the id of Animal Sniffer's execution
8 years ago
Andy Wilkinson
5ac5aa3e9a
Merge branch '1.5.x'
8 years ago
Andy Wilkinson
f6a7e17688
Merge branch '1.4.x' into 1.5.x
8 years ago
Andy Wilkinson
6564fb3d96
Consider all loader paths when checking template availability
...
Closes gh-8842
8 years ago
Stephane Nicoll
6399ed7869
Fix checkstyle rule
8 years ago
Stephane Nicoll
dbe388756a
Merge branch '1.5.x'
8 years ago
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
8 years ago
Stephane Nicoll
16afb8a973
Polish "Add support for HotSwapAgent to devtools"
...
Closes gh-8683
8 years ago
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
8 years ago
Stephane Nicoll
b3bcecc988
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
d8d36255af
Merge branch '1.4.x' into 1.5.x
8 years ago
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
8 years ago
Stephane Nicoll
fd53945fe0
Polish "Document HTTP response format of health endpoint"
...
Closes gh-8703
8 years ago
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
8 years ago
Stephane Nicoll
74be6ff0f1
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
a9b5e7c12a
Merge branch '1.4.x' into 1.5.x
8 years ago
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
8 years ago
Andy Wilkinson
565b4028bc
Merge branch '1.5.x'
8 years ago
Andy Wilkinson
db60ed66ae
Upgrade to Dependency Management Plugin 1.0.2.RELEASE
...
Closes gh-8876
8 years ago
Stephane Nicoll
bc340002cf
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
7c9b2afa5b
Merge branch '1.4.x' into 1.5.x
8 years ago
Stephane Nicoll
3c28687279
Merge pull request #8829 from stefan-huettemann:gh-8508
...
* pr/8829:
Allow to disable max http post size limit
8 years ago
Dr. Stefan Hüttemann
0294ad3e95
Allow to disable max http post size limit
...
Closes gh-8508
8 years ago
Andy Wilkinson
858bd8554d
Align test logging config with latest change in Spring Framework
...
See spring-projects/spring-framework@ea5cb26d75
8 years ago
Stephane Nicoll
bf333b7e4e
Merge branch '1.5.x'
8 years ago
Stephane Nicoll
ec0cc0fe2d
Merge pull request #8866 from garyrussell:kafka
...
* pr/8866:
Upgrade to Spring Kafka 1.1.4
8 years ago
Gary Russell
80486fbe65
Upgrade to Spring Kafka 1.1.4
...
Closes gh-8866
8 years ago
Andy Wilkinson
9d642a69b3
Merge branch '1.5.x'
8 years ago
Andy Wilkinson
ac3071670f
Merge branch '1.4.x' into 1.5.x
8 years ago
Andy Wilkinson
492aee9cea
Remove unused optional dependency
...
It should have been removed in 2522a5f9ef
8 years ago
Andy Wilkinson
ceb80614e5
Polishing
8 years ago
Andy Wilkinson
8c785b214b
Merge branch '1.5.x'
8 years ago
Andy Wilkinson
bccbbc145e
Merge branch '1.4.x' into 1.5.x
8 years ago
Andy Wilkinson
60505a4fae
Don't shut down "in-memory" DB running as a server on DevTools restart
...
Closes gh-8702
8 years ago
Andy Wilkinson
7a4b87be6b
Merge branch '1.5.x'
8 years ago
Andy Wilkinson
c74f0a70ca
Merge branch '1.4.x' into 1.5.x
8 years ago
Andy Wilkinson
ef72c22563
Update HtmlUnitDriver tests to align with HtmlUnit 2.26
...
See gh-8853 and cb34189c66
8 years ago
Andy Wilkinson
5dad7182db
Address deprecation warnings
8 years ago