Commit Graph

10547 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
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
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
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
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
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
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
db60ed66ae Upgrade to Dependency Management Plugin 1.0.2.RELEASE
Closes gh-8876
2017-04-10 11:12:03 +01: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
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
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
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
c74f0a70ca Merge branch '1.4.x' into 1.5.x 2017-04-07 12:14:47 +01:00
Andy Wilkinson
5dad7182db Address deprecation warnings 2017-04-07 12:01:01 +01:00
Andy Wilkinson
ddd3f8ee6e Upgrade to Narayana 5.5.6.Final
Closes gh-8847
2017-04-07 10:42:45 +01:00
Andy Wilkinson
18f0e95442 Upgrade to Ehcache3 3.2.2
Closes gh-8846
2017-04-07 10:42:44 +01:00
Andy Wilkinson
82b809229e Upgrade to Undertow 1.4.12.Final
Closes gh-8845
2017-04-07 10:42:44 +01:00
Andy Wilkinson
cf169e79b9 Upgrade to Hazelcast 3.7.7
Closes gh-8844
2017-04-07 10:42:44 +01:00
Stephane Nicoll
fffb53ccf5 Fix neo4j embedded documentation
The neo4j embedded driver no longer embeds the neo4j kernel and users are
expected to add that dependency manually. We don't provide dependency
management for any of them so this commit updates the documentation to
refers to the official documentation.

Closes gh-8567
2017-04-07 10:04:41 +02:00
Andy Wilkinson
13a3f7c0c1 Merge branch '1.4.x' into 1.5.x 2017-04-06 21:47:24 +01:00
Andy Wilkinson
18e112821f Merge branch '1.4.x' into 1.5.x 2017-04-06 21:45:29 +01:00
Andy Wilkinson
d45d94520e Upgrade to Jolokia 1.3.6
Closes gh-8841
2017-04-06 20:27:47 +01:00
Andy Wilkinson
f8767cc96e Upgrade to Freemarker 2.3.26-incubating
Closes gh-8840
2017-04-06 20:27:47 +01:00
Andy Wilkinson
2300dae88c Upgrade to Jetty 9.3.18.v20170406
Closes gh-8839
2017-04-06 20:27:47 +01:00
Andy Wilkinson
1375dfe102 Upgrade to Aspectj 1.8.10
Closes gh-8838
2017-04-06 20:27:47 +01:00
Andy Wilkinson
408b3c81df Upgrade to Tomcat 8.5.13
Closes gh-8837
2017-04-06 20:27:47 +01:00
Andy Wilkinson
fe5e04c963 Upgrade to Hazelcast 3.6.8
Closes gh-8836
2017-04-06 20:27:47 +01:00
Andy Wilkinson
d49a41e8cf Upgrade to Appengine 1.9.51
Closes gh-8835
2017-04-06 20:27:47 +01:00
Andy Wilkinson
5f77ef25e4 Upgrade to Jackson 2.8.8
Closes gh-8834
2017-04-06 20:27:47 +01:00
Phillip Webb
3b93bb46e0 Revert accidental call to .close()
Remove call to `.close()` which was accidentally left in after some
performance testing.
2017-04-04 09:56:03 -07:00
Phillip Webb
ad38776de3 Polish 2017-04-04 09:48:10 -07:00
Phillip Webb
ddcb5ee328 Polish 2017-04-04 09:36:27 -07:00
Andy Wilkinson
df6167dd71 Merge branch '1.4.x' into 1.5.x 2017-04-04 17:02:58 +01:00
Andy Wilkinson
9374020b0e Stop -> from being replaced with → as the latter renders as # in PDF
Closes gh-8575
2017-04-04 17:00:16 +01:00