Formatting
Rename AbstractBasicTemplateViewResolverProperties

Rename AbstractBasicTemplateViewResolverProperties to
AbstractViewResolverProperties.

See gh-1835
Move tomcat websocket dependency

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

Fixes gh-1847
Merge branch '1.1.x'
Add some .gitignore entries
Add "include filter" support for the Maven plugin

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

Fixes gh-1824
Merge pull request #1824 from dturanski/gh-1824

* gh-1824:
  Add "include filter" support for the Maven plugin
Add systemload.average to SystemPublicMetrics

Fixes gh-1865
Merge pull request #1856 from joshiste/systemLoad

* systemLoad:
  Add systemload.average to SystemPublicMetrics
Fix typo
Detect builder-style setter

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
Correct the references to WebSecurityConfigurerAdapter in the docs

Closes gh-1861
Merge branch '1.1.x'
Document need for ServerEndpointExporter and show its use in a sample

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
Merge branch '1.1.x'

Conflicts:
	spring-boot-dependencies/pom.xml
Document details of configuring Gradle to produce valid poms

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
Merge branch '1.1.x'
Add note to explain that bootRun ignores output from processResources

Closes gh-1739
Merge branch '1.1.x'
Flush OutputStream-based appenders in Log4J 2 Tests

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