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

Relocate tomcat-embed-websocket from spring-boot-starter-websocket
to spring-boot-starter-tomcat.

Fixes gh-1847

Rename AbstractBasicTemplateViewResolverProperties to
AbstractViewResolverProperties.

See gh-1835

Move shared properties to avoid duplication in GroovyProperties

Fixes gh-1835

Previously, SpringPackageScanResolver was handling as subset of the
failures that Liquibase’s DefaultPackageScanResolver handles. This could
lead to a failure due to a LinkageError in certain environments.

This commit updates SpringPackageScanClassResolver to align its error
handling with what Liquibase does.

Fixes gh-1853

Fixes gh-1841

Update the relevant samples to use the new @SpringBootApplication
annotation.

Closes gh-1842

Add a section to the reference guide about @SpringBootApplication.

See gh-1842

Add a new @SpringBootApplication which is equivalent to @Configuration,
@EnableAutoConfiguration and @ComponentScan.

See gh-1842

Change the default value of spring.datasource.jmx-enabled to false
to prevent InstanceAlreadyExistsException problems when using the
Spring Test Framework.

Fixes gh-1590

Update the base.xml logback configuration file so that it behaves in
the same way as Spring Boot 1.1.

Fixes gh-1845

Update the auto-configured PersistenceExceptionTranslationPostProcessor
to proxy target classes as well as interfaces. Also provide a config
property to disable registration all together.

Fixes gh-1844

* pull1840:
  Provide Liquibase -> Commons Logging adapter

Add `CommonsLoggingLiquibaseLogger` implementation to adapt Liquibase's
`Logger` to Apache Commons Logging.

The `LiquibaseAutoConfiguration` class has also been updated to
automatically use the adapter

Fixes gh-1840

This commit updates Spring Boot to Liquibase 3.3.0 and makes the
necessary changes to Boot's PackageScanClassResolver.

Previously, when a class found by the scan could not be loaded a
warning message was logged. This commit lowers these to debug level,
bringing them into line with logging that the standard Liquibase
implementation does. It also avoids a warning always being logged at
startup due to Liquibase's WatchCommand$DynamicContentHandler which
depends on Jetty (an optional dependency of Liquibase).

Closes gh-1382

Fixes gh-1837

This reverts commit 6e041464.

Fixes gh-1830

Update ConfigurationMetadataAnnotationProcessor to ensure that only
local `additional-spring-configuration-metadata.json` files are merged
with the final output.

See gh-1830

Update ConfigurationMetadataAnnotationProcessor so that it gets called
even if the source code doesn't include any @ConfigurationProperties
items.

See gh-1830

Rename AbstractTemplateViewResolverProperties.setCharSet/getCharSet to
setCharset/getCharset, deprecating the old method.

Fixes gh-1835

Additional items added since 1.1.x

Fixes gh-1834

Conflicts:
	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc

Fixes gh-1834

Switch the Tomcat 8 and Jetty 9 samples to Tomcat 7 and Jetty 8. Since
Tomcat 8 and Jetty 9 are now the default versions the previous samples
are no longer relevant, however, we do need integration tests to check
that we remain compatible with Tomcat 7 and Jetty 8.

See gh-1832