Commit Graph

6569 Commits (59cb5cf8d98a5b73e04c525e6e0b9709884ef1e7)
 

Author SHA1 Message Date
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
9 years ago
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
9 years ago
Andy Wilkinson 4f7752d467 Merge branch '1.2.x' 9 years ago
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
9 years ago
Andy Wilkinson 03e19d4709 Upgrade to Spring REST Docs 1.0.1.RELEASE
Closes gh-4742
9 years ago
Andy Wilkinson 53cc5f060b Merge branch '1.2.x' 9 years ago
Andy Wilkinson b36fe2cbd8 Cache outcome of checking to see if host supports ANSI output
Closes gh-4510
9 years ago
Andy Wilkinson 267fd5dff2 Merge branch '1.2.x' 9 years ago
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
9 years ago
Gary Russell bbe6d7ac37 Upgrade to Spring Integration 4.2.3.RELEASE
Closes gh-4737
9 years ago
Andy Wilkinson cbb4b4302a Merge branch '1.2.x' 9 years ago
Andy Wilkinson 3b34f635a6 Upgrade to Spring Social Facebook 2.0.3.RELEASE
Closes gh-4738
9 years ago
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
9 years ago
Andy Wilkinson c179cafb0c Upgrade to Spring Cloud Connectors 1.2.1.RELEASE
Closes gh-4729
9 years ago
Andy Wilkinson d8ad364ddc Upgrade to Postgresql 9.4-1206-jdbc41
Closes gh-4728
9 years ago
Andy Wilkinson e0267d5ac3 Upgrade to Infinispan 8.0.2.Final
Closes gh-4727
9 years ago
Andy Wilkinson 48be384e7f Upgrade to Undertow 1.3.9.Final
Closes gh-4726
9 years ago
Andy Wilkinson b3a5bff31a Upgrade to Reactor Spring 2.0.7.RELEASE
Closes gh-4725
9 years ago
Andy Wilkinson 03de4704af Upgrade to HikariCP 2.4.3
Closes gh-4724
9 years ago
Andy Wilkinson 47c0bf90f1 Upgrade to Hazelcast 3.5.4
Closes gh-4723
9 years ago
Andy Wilkinson 6bd0558ee2 Upgrade to Jackson 2.6.4
Closes gh-4722
9 years ago
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
9 years ago
Andy Wilkinson bdc395f16e Merge branch '1.2.x' 9 years ago
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
9 years ago
Andy Wilkinson b10b7a883d Upgrade to Spring Security 3.2.9.RELEASE
Closes gh-4721
9 years ago
Andy Wilkinson 85bb1780d8 Upgrade to Spring Web Services 2.2.3.RELEASE
Closes gh-4720
9 years ago
Andy Wilkinson bb9e1be72c Upgrade to Spring Integration 4.1.7.RELEASE
Closes gh-4719
9 years ago
Andy Wilkinson e50357d907 Upgrade to Spring Loaded 1.2.5.RELEASE
Closes gh-4718
9 years ago
Andy Wilkinson e54f9063a8 Upgrade to SLF4J 1.7.13
Closes gh-4717
9 years ago
Andy Wilkinson 70ead7113d Upgrade to Jetty 9.2.14.v20151106
Closes gh-4716
9 years ago
Stephane Nicoll cbfdfb463e Fix indent
See gh-4712
9 years ago
Andy Wilkinson 349794f9cf Upgrade to mysql-connector-java 5.1.38
Closes gh-4714
9 years ago
Andy Wilkinson 8feaf1e92c Upgrade to Undertow 1.1.9.Final
Closes gh-4713
9 years ago
Stephane Nicoll d4545b4d7f Add reference to nonheap metrics
See gh-4712
9 years ago
Dave Syer 21d6c73539 Fix checkstyle 9 years ago
Dave Syer 8b97c3b342 Add nonheap metrics to /metrics endpoint
Fixes gh-4712
9 years ago
Stephane Nicoll 2d003a698f Revert 5464c65
See gh-4709
9 years ago
Stephane Nicoll a6409edab0 Merge pull request #4709 from izeye/polish-20151209
* pr/4709:
  Polish contribution
  Polish docs
9 years ago
Stephane Nicoll 5464c65ca8 Polish contribution
Use the same value as we do.
9 years ago
Johnny Lim 12a921c200 Polish docs
Closes gh-4709
9 years ago
Stephane Nicoll 578eaa26e7 Add reference to Apache Wicket starter 9 years ago
Stephane Nicoll 3ff194866f Merge pull request #4701 from mnhock/Remove_double_instantiation
* pr/4701:
  Remove double instantiation of Manifest
9 years ago
mnhock 7348ef5ef1 Remove double instantiation of Manifest
Closes gh-4701
9 years ago
Stephane Nicoll 203ceffe94 Merge pull request #4685 from mnhock/master
* pr/4685:
  Fix possible null pointer dereference
9 years ago
mnhock 9775d40822 Fix possible null pointer dereference
Closes gh-4685
9 years ago
Stephane Nicoll 7b2afbdf13 Polish 9 years ago
Stephane Nicoll 79a97d9bba Merge pull request #4677 from izeye/polish-20151204
* pr/4677:
  Polish
9 years ago
Johnny Lim ec7fed1ecc Polish
Closes gh-4677
9 years ago
Andy Wilkinson f7d3165ebb Merge branch 'gh-4687' 9 years ago
Andy Wilkinson 2efc4b8332 Add tests to verify improved exception message formatting 9 years ago