Commit Graph

6840 Commits

Author SHA1 Message Date
Phillip Webb
58fd403bd0 Merge pull request #4674 from vpavic/improve-health-aggregating
* pr/4674:
  Add AbstractHealthAggregator.aggregateDetails
2015-12-11 14:42:16 +00:00
Vedran Pavic
f8090d94b2 Add AbstractHealthAggregator.aggregateDetails
Extract aggregate details logic to a protected method that can be
overridden if required.

Closes gh-4674
2015-12-11 14:42:02 +00:00
Phillip Webb
0650610fff Merge pull request #4688 from mnhock/Replace_with_valueOf()
* pr/4688:
  Prefer valueOf() to create Number values
2015-12-11 14:06:53 +00:00
mnhock
fcf6e5d6eb Prefer valueOf() to create Number values
Update Long/Integer constructor calls with `valueOf` which can make use
of global caches.

Closes gh-4688
2015-12-11 14:04:25 +00:00
Phillip Webb
dc3ead4c39 Merge pull request #4703 from thorntonrp/patch-1
* pr/4703:
  Cleanup description new-lines for launch script
2015-12-11 14:01:07 +00:00
Robert Thornton
8e0b8750c0 Cleanup description new-lines for launch script
Replace all new-line characters in multi-line pom descriptions before
inserting into the launcher script. Prior to this commit the shell would
attempt to execut the extra lines, for example:

	<description>
		A multi-line pom description that could do something terrible:
		rm -r foo
	</description>

Closes gh-4703
2015-12-11 13:57:14 +00:00
Phillip Webb
a3a320d97b Merge pull request #4706 from mnhock/Calling_toString_is_redundant
* pr/4706:
  Remove redundant toString() call
2015-12-11 13:44:38 +00:00
mnhock
ea016f5442 Remove redundant toString() call
Closes gh-4706
2015-12-11 13:43:30 +00:00
Phillip Webb
7f8aff0231 Format HTML in web-ui sample 2015-12-11 13:41:38 +00:00
Phillip Webb
2f84cdc79f Merge pull request #4735 from dubu/dubu0.1
* pr/4735:
  Add update/delete to the web-ui sample
2015-12-11 13:40:30 +00:00
kozazz
0de4b6ce63 Add update/delete to the web-ui sample
Closes gh-4735
See gh-4733
2015-12-11 13:37:08 +00:00
Andy Wilkinson
ffbdfc586b Merge branch '1.2.x' 2015-12-11 11:26:45 +00:00
Andy Wilkinson
474ffa717e Upgrade to Spring Batch 3.0.6.RELEASE
Closes gh-4754
2015-12-11 11:25:54 +00:00
Andy Wilkinson
0bb4de490d Allow any ExitCodeGenerator bean to switch of auto-configured bean
In bedf2edf, the return type of the auto-configuration method that
creates batch's ExitCodeGenerator was changed from ExitCodeGenerator
to JobExecutionExitCodeGenerator but the on missing bean condition
was left unchanged. This means that the auto-configured bean can
only be switched off by a JobExecutionExitCodeGenerator bean, rather
than any bean that implements ExitCodeGenerator.

This commit corrects the use of @ConditionalOnMissingBean to allow any
ExitCodeGenerator bean to switch off the auto-configured one.

Closes gh-4752
2015-12-11 11:07:33 +00:00
Phillip Webb
0489a3b4de Polish 2015-12-10 19:43:29 +00:00
Phillip Webb
f3bcf94fb0 Refine validator cleanup logic
Refine the validator memory optimization so that only directly created
validators are nulled out. Also update the logic to ensure that
`destroy` is also called.

See gh-4734
2015-12-10 19:43:29 +00:00
Andy Wilkinson
bbbe4fdcd0 Start building against Spring Framework 4.2.4 snapshots
See gh-4644
2015-12-10 16:59:50 +00:00
Dave Syer
fae14b409f Check that we own the validator before nulling it out
See gh-4734
2015-12-10 16:04:31 +00:00
Phillip Webb
2d2e4eea82 Merge branch '1.2.x' 2015-12-10 15:01:29 +00:00
Stephane Nicoll
66fe95369c Polish doc
See gh-4743
2015-12-10 15:49:34 +01:00
Phillip Webb
2694605a4d Polish 2015-12-10 14:43:00 +00:00
Stephane Nicoll
59cb5cf8d9 Merge branch '1.2.x'
# Conflicts:
#	spring-boot-actuator/src/main/resources/META-INF/additional-spring-configuration-metadata.json
#	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
2015-12-10 15:40:44 +01:00
Stephane Nicoll
ce2346b087 Reintroduce endpoints.metrics.filter.enabled
Commit 8c14009 removed the endpoints.metrics.filter.enabled property so
that endpoints.metrics.enabled is used for both disabling the endpoint
and the servlet filter that records interactions.

This was an unfortunate decision as it was no longer possible to only
disable the servlet filter. The endpoints.metrics.filter.enabled property
has therefore been restored.

Closes gh-4365
2015-12-10 15:37:10 +01:00
Andy Wilkinson
4f7752d467 Merge branch '1.2.x' 2015-12-10 13:45:15 +00:00
Andy Wilkinson
ce541bebcf Align BasicErrorController’s HTML response status with non-HTML status
Previously, BasicErrorController would return the response status
set in the javax.servlet.error.status_code request attribute when
serving JSON but would also return a 200 OK response when serving
HTML. This didn’t cause much trouble when a person was browsing, but
proved problematic for machine clients that request text/html and care
about the response status. For example, the success handler would be
driven for an XHR request even though the response was really an error.

This commit updates BasicErrorController to set the response status for
text/html responses to match the status that it would use in an
application/json response.

Closes gh-4694
2015-12-10 13:40:16 +00:00
Andy Wilkinson
03e19d4709 Upgrade to Spring REST Docs 1.0.1.RELEASE
Closes gh-4742
2015-12-10 11:26:07 +00:00
Andy Wilkinson
53cc5f060b Merge branch '1.2.x' 2015-12-10 11:25:00 +00:00
Andy Wilkinson
b36fe2cbd8 Cache outcome of checking to see if host supports ANSI output
Closes gh-4510
2015-12-10 11:15:50 +00:00
Andy Wilkinson
267fd5dff2 Merge branch '1.2.x' 2015-12-10 10:17:57 +00:00
Andy Wilkinson
8dc3b71ced Revert "Upgrade to Spring Integration 4.1.7.RELEASE"
This reverts commit bb9e1be72c.

4.1.7.RELEASE is incompatible with Spring IO Platform 1.1.x due to a
new dependency on kryo-shaded. kryo-shaded was introduced in Kryo
3.0.x but IO Platform 1.1.x uses Kryo 2.

See gh-4719
2015-12-10 10:15:05 +00:00
Gary Russell
bbe6d7ac37 Upgrade to Spring Integration 4.2.3.RELEASE
Closes gh-4737
2015-12-09 21:00:48 +00:00
Andy Wilkinson
cbb4b4302a Merge branch '1.2.x' 2015-12-09 20:59:39 +00:00
Andy Wilkinson
3b34f635a6 Upgrade to Spring Social Facebook 2.0.3.RELEASE
Closes gh-4738
2015-12-09 20:59:19 +00:00
Andy Wilkinson
cd4c628d12 Reinstate commons-logging exclusion on infinispan-spring4
Infinispan 8.0.2 has moved to Log4J2 for all logging, but still has a
transitive dependency on commons-logging. This resulted in
commons-logging 1.1 being on the classpath of spring-boot-docs which
breaks its javadoc generation.

Closes gh-4727
2015-12-09 20:52:54 +00:00
Andy Wilkinson
c179cafb0c Upgrade to Spring Cloud Connectors 1.2.1.RELEASE
Closes gh-4729
2015-12-09 17:46:57 +00:00
Andy Wilkinson
d8ad364ddc Upgrade to Postgresql 9.4-1206-jdbc41
Closes gh-4728
2015-12-09 17:46:57 +00:00
Andy Wilkinson
e0267d5ac3 Upgrade to Infinispan 8.0.2.Final
Closes gh-4727
2015-12-09 17:46:57 +00:00
Andy Wilkinson
48be384e7f Upgrade to Undertow 1.3.9.Final
Closes gh-4726
2015-12-09 17:46:57 +00:00
Andy Wilkinson
b3a5bff31a Upgrade to Reactor Spring 2.0.7.RELEASE
Closes gh-4725
2015-12-09 17:46:57 +00:00
Andy Wilkinson
03de4704af Upgrade to HikariCP 2.4.3
Closes gh-4724
2015-12-09 17:46:57 +00:00
Andy Wilkinson
47c0bf90f1 Upgrade to Hazelcast 3.5.4
Closes gh-4723
2015-12-09 17:46:57 +00:00
Andy Wilkinson
6bd0558ee2 Upgrade to Jackson 2.6.4
Closes gh-4722
2015-12-09 17:46:57 +00:00
Dave Syer
e8632d9feb Null out validator in ContextRefreshedEvent
This is an optimization that recognizes the need for Hibernate
validator to cache reflection data, but also that we don't need it
after the bulk of the work has been done on context refresh.

Fixes gh-4734
2015-12-09 17:33:07 +00:00
Andy Wilkinson
bdc395f16e Merge branch '1.2.x' 2015-12-09 11:58:00 +00:00
Andy Wilkinson
ae6971a61a Upgrade to Tomcat 8.0.30 and continue to use absolute redirects
Tomcat 8.0.30 has changed to using relative URIs in its redirects
by default. To avoid any problems that this behaviour change may
causes we override the default and configure Tomcat to continue to
use absolute URIs.

Closes gh-4715
2015-12-09 11:55:07 +00:00
Andy Wilkinson
b10b7a883d Upgrade to Spring Security 3.2.9.RELEASE
Closes gh-4721
2015-12-09 11:24:12 +00:00
Andy Wilkinson
85bb1780d8 Upgrade to Spring Web Services 2.2.3.RELEASE
Closes gh-4720
2015-12-09 11:24:12 +00:00
Andy Wilkinson
bb9e1be72c Upgrade to Spring Integration 4.1.7.RELEASE
Closes gh-4719
2015-12-09 11:24:12 +00:00
Andy Wilkinson
e50357d907 Upgrade to Spring Loaded 1.2.5.RELEASE
Closes gh-4718
2015-12-09 11:24:12 +00:00
Andy Wilkinson
e54f9063a8 Upgrade to SLF4J 1.7.13
Closes gh-4717
2015-12-09 11:24:11 +00:00