Commit Graph

10971 Commits

Author SHA1 Message Date
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
Andy Wilkinson
70ead7113d Upgrade to Jetty 9.2.14.v20151106
Closes gh-4716
2015-12-09 11:24:11 +00:00
Stephane Nicoll
cbfdfb463e Fix indent
See gh-4712
2015-12-09 11:40:14 +01:00
Andy Wilkinson
349794f9cf Upgrade to mysql-connector-java 5.1.38
Closes gh-4714
2015-12-09 10:40:01 +00:00
Andy Wilkinson
8feaf1e92c Upgrade to Undertow 1.1.9.Final
Closes gh-4713
2015-12-09 10:39:22 +00:00
Stephane Nicoll
d4545b4d7f Add reference to nonheap metrics
See gh-4712
2015-12-09 11:39:10 +01:00
Dave Syer
21d6c73539 Fix checkstyle 2015-12-09 10:35:57 +00:00
Dave Syer
8b97c3b342 Add nonheap metrics to /metrics endpoint
Fixes gh-4712
2015-12-09 10:17:32 +00:00
Stephane Nicoll
2d003a698f Revert 5464c65
See gh-4709
2015-12-09 10:59:27 +01:00
Stephane Nicoll
a6409edab0 Merge pull request #4709 from izeye/polish-20151209
* pr/4709:
  Polish contribution
  Polish docs
2015-12-09 09:57:22 +01:00
Stephane Nicoll
5464c65ca8 Polish contribution
Use the same value as we do.
2015-12-09 09:57:04 +01:00
Johnny Lim
12a921c200 Polish docs
Closes gh-4709
2015-12-09 09:49:42 +01:00
Stephane Nicoll
578eaa26e7 Add reference to Apache Wicket starter 2015-12-08 11:58:31 +01:00
Stephane Nicoll
3ff194866f Merge pull request #4701 from mnhock/Remove_double_instantiation
* pr/4701:
  Remove double instantiation of Manifest
2015-12-08 11:06:04 +01:00
mnhock
7348ef5ef1 Remove double instantiation of Manifest
Closes gh-4701
2015-12-08 11:05:40 +01:00
Stephane Nicoll
203ceffe94 Merge pull request #4685 from mnhock/master
* pr/4685:
  Fix possible null pointer dereference
2015-12-08 10:29:55 +01:00
mnhock
9775d40822 Fix possible null pointer dereference
Closes gh-4685
2015-12-08 10:28:15 +01:00
Stephane Nicoll
7b2afbdf13 Polish 2015-12-08 10:26:44 +01:00
Stephane Nicoll
79a97d9bba Merge pull request #4677 from izeye/polish-20151204
* pr/4677:
  Polish
2015-12-07 20:47:28 +01:00
Johnny Lim
ec7fed1ecc Polish
Closes gh-4677
2015-12-07 20:46:36 +01:00