Conflicts:
	spring-boot-dependencies/pom.xml

The exception message for a connection timeout has been updated to
include the timeout period. The tests for the sample have been updated
accordingly.

Closes gh-1884

Closes gh-1883

Closes gh-1882

Closes gh-1881

Closes gh-1880

Closes gh-1879

Closes gh-1878

Closes gh-1877

Closes gh-1876

Closes gh-1875

Update TypeElementMembers to correctly detect builder style setters.
The previous logic could fail because of the crazy way that TypeMirror
implements its equals() method.

Fixes gh-1859
See gh-1854

Update ConfigurationMetadataAnnotationProcessor to only write non-empty
meta-data files.

Fixes gh-1858

Remove the JpaBaseConfiguration.configure() method since it is no
longer called.

Fixes gh-1865

Update the InitializrService so that a 'SpringBootCli' User-Agent header
is sent with each request. This should allow the server-side code to
gracefully evolve the JSON format if needed.

Fixes gh-1869

Fixes gh-1712

Update MultipartAutoConfiguration to detect any MultipartResolver beans
rather than just StandardServletMultipartResolvers.

Fixes gh-1857

Closes gh-1863

Closes gh-1862

CI has been failing intermittently with failures in
Log4J2LoggingSystemTests. A possible cause of the failures is that
log entries are being buffered in an output stream. This may cause
an expected log entry to be absent (the entry is buffered) or an
unexpected entry to be present (the previously buffered entry has
now been flushed).

This commit attempts to address the test failures by ensuring that
all OutputStream-based appenders are flushed at the end of every test.

Closes gh-1864

Closes gh-1739

If a Gradle build is using the Spring Boot Gradle plugin's support for
declaring dependencies without versions then they will be unable to
publish Maven artifacts from the build as the Gradle-generated pom
will fail to validate. This is because Gradle doesn't apply the
Boot-provided dependency versions to the dependencies in the generated
pom.

This can be addressed by configuring Gradle to generate a pom that
either imports spring-boot-dependencies into its dependency management
or that uses spring-boot-starter-parent as its parent. This commit
updates the documentation to document the need for this configuration
and to provide examples of how to do so.

Closes gh-1806

Conflicts:
	spring-boot-dependencies/pom.xml

Traditionally, a @ServerEndpoint-annotated bean is found by a servlet
container initialiser, however Boot does not run servlet container
initialisers when an embedded container is being used. To be able to use
@ServerEndpoint in a Boot app that uses embedded Tomcat a
ServerEndpointExporter bean must be declared.

This commit updates the documentation to describe this requirement and
also updates the WebSockets sample to illustrate the use of
ServerEndpointExporter. The version of Spring Framework has been updated
to 4.0.8.BUILD-SNAPSHOT. This picks up the fix for SPR-12340.

Closes gh-1722

Closes gh-1861

Previously, a setter method that was returning the current instance was
not identified as a "setter" by the configuration processor. As a result,
builder-style APIs were not covered by the configuration metadata.

If a setter returns either void or the current class, it is now
recognized as a valid setter.

Fixes gh-1854

* systemLoad:
  Add systemload.average to SystemPublicMetrics

Fixes gh-1865

* gh-1824:
  Add "include filter" support for the Maven plugin

Update AbstractDependencyFilterMojo to support include filters as
well as exclude filters.

Fixes gh-1824