Update reference documentation for Spring Boot 1.2

Various updates and polish to prepare the reference documentation for
Spring Boot 1.2.

Fixes gh-1903

Author: philwebb

spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc

@@ -17,7 +17,7 @@ unsupported build system. If you are just getting started, you might want to rea
 == Spring Boot Maven plugin
 The {spring-boot-maven-plugin-site}/[Spring Boot Maven Plugin] provides Spring Boot
 support in Maven, allowing you to package executable jar or war archives and run an
-application "`in-place`". To use it you must be using Maven 3 (or better).
+application "`in-place`". To use it you must be using Maven 3.2 (or better).
 
 NOTE: Refer to the {spring-boot-maven-plugin-site}/[Spring Boot Maven Plugin Site]
 for complete plugin documentation.

spring-boot-docs/src/main/asciidoc/cloud-deployment.adoc

@@ -135,9 +135,9 @@ access application information (such as the public URL of the application) and s
 information (such as database credentials). See `VcapApplicationListener` Javdoc for
 complete details.
 
-TIP: The https://github.com/spring-projects/spring-cloud[Spring Cloud] project is a better
-fit for tasks such as configuring a DataSource; it also lets you use Spring Cloud with
-Heroku.
+TIP: The http://cloud.spring.io/spring-cloud-connectors/[Spring Cloud Connectors] project
+is a better fit for tasks such as configuring a DataSource. Spring Boot includes
+auto-configuration support and a `spring-boot-starter-cloud-connectors` starter POM.
 
 
 
@@ -187,7 +187,7 @@ This should be everything you need. The most common workflow for Heroku deployme
 
 	-----> Java app detected
 	-----> Installing OpenJDK 1.7... *done*
-	-----> Installing Maven 3.0.3... *done*
+	-----> Installing Maven 3.2.3... *done*
 	-----> Installing settings.xml... *done*
 	-----> executing /app/tmp/cache/.maven/bin/mvn -B
 	       -Duser.home=/tmp/build_0c35a5d2-a067-4abc-a232-14b1fb7a8229

spring-boot-docs/src/main/asciidoc/getting-started.adoc

@@ -109,7 +109,7 @@ build tool that supports dependency management (such as Maven or Gradle).
 
 [[getting-started-maven-installation]]
 ==== Maven installation
-Spring Boot is compatible with Apache Maven 3.0 or above. If you don't already have Maven
+Spring Boot is compatible with Apache Maven 3.2 or above. If you don't already have Maven
 installed you can follow the instructions at http://maven.apache.org.
 
 TIP: On many operating systems Maven can be installed via a package manager. If you're an
@@ -199,7 +199,7 @@ scope.
 
 [[getting-started-gradle-installation]]
 ==== Gradle installation
-Spring Boot is compatible with Gradle 1.6 or above. If you don't already have Gradle
+Spring Boot is compatible with Gradle 1.12 or above. If you don't already have Gradle
 installed you can follow the instructions at http://www.gradle.org/.
 
 Spring Boot dependencies can be declared using the `org.springframework.boot` `group`.
@@ -449,7 +449,7 @@ installed.
 [indent=0]
 ----
 	$ mvn -v
-	Apache Maven 3.1.1 (0728685237757ffbf44136acec0402957f723d9a; 2013-09-17 08:22:22-0700)
+	Apache Maven 3.2.3 (33f8c3e1027c3ddde99d3cdebad2656a31e8fdf4; 2014-08-11T13:58:10-07:00)
 	Maven home: /Users/user/tools/apache-maven-3.1.1
 	Java version: 1.7.0_51, vendor: Oracle Corporation
 ----
@@ -511,7 +511,7 @@ endif::[]
 ----
 
 This should give you a working build, you can test it out by running `mvn package` (you
-can ignore the '"`jar will be empty - no content was marked for inclusion!'`"' warning for
+can ignore the "`jar will be empty - no content was marked for inclusion!'`" warning for
 now).
 
 NOTE: At this point you could import the project into an IDE (most modern Java IDE's
@@ -768,7 +768,7 @@ To run that application, use the `java -jar` command:
 	....... . . .
 	....... . . . (log output here)
 	....... . . .
-	........ Started Example in 3.236 seconds (JVM running for 3.764)
+	........ Started Example in 2.536 seconds (JVM running for 2.864)
 ----
 
 As before, to gracefully exit the application hit `ctrl-c`.

spring-boot-docs/src/main/asciidoc/howto.adoc

@@ -2135,16 +2135,16 @@ Once the war is working we make it executable by adding a `main` method to our
 
 Applications can fall into more than one category:
 
-* Servlet 3.0 applications with no `web.xml`.
+* Servlet 3.0+ applications with no `web.xml`.
 * Applications with a `web.xml`.
 * Applications with a context hierarchy.
 * Applications without a context hierarchy.
 
 All of these should be amenable to translation, but each might require slightly different
 tricks.
 
-Servlet 3.0 applications might translate pretty easily if they already use the Spring
-Servlet 3.0 initializer support classes. Normally all the code from an existing
+Servlet 3.0+ applications might translate pretty easily if they already use the Spring
+Servlet 3.0+ initializer support classes. Normally all the code from an existing
 `WebApplicationInitializer` can be moved into a `SpringBootServletInitializer`. If your
 existing application has more than one `ApplicationContext` (e.g. if it uses
 `AbstractDispatcherServletInitializer`) then you might be able to squash all your context

spring-boot-docs/src/main/asciidoc/production-ready-features.adoc

@@ -155,10 +155,10 @@ in your `ApplicationContext`. Spring Boot includes a number of auto-configured
 
 === Security with HealthIndicators
 Information returned by `HealthIndicators` is often somewhat sensitive in nature. For
-example and you probably don't want to publish details of your database server to the
-world. For this reason, by default, only the health status is exposed on an insecure HTTP
-connection. If you are happy for complete heath information to always be exposed you can
-set `endpoints.health.sensitive` to `false`.
+example, you probably don't want to publish details of your database server to the
+world. For this reason, by default, only the health status is exposed over an
+unauthenticated HTTP connection. If you are happy for complete heath information to always
+be exposed you can set `endpoints.health.sensitive` to `false`.
 
 Heath responses are also cached to prevent "`denial of service`" attacks. Use the
 `endpoints.health.time-to-live` property if you want to change the default cache period
@@ -169,6 +169,7 @@ of 1000 milliseconds.
 ==== Auto-configured HealthIndicators
 The following `HealthIndicators` are auto-configured by Spring Boot when appropriate:
 
+[cols="1,4"]
 |===
 |Name |Description
 
@@ -220,9 +221,9 @@ additional details to be displayed.
 	}
 ----
 
-In addition to Spring Boot's default {sc-spring-boot-actuator}/health/Status.{sc-ext}[`Status`]
-types, it is also possible to introduce custom `Status` types to represent more
-complex system states. In such cases a custom implementation of the
+In addition to Spring Boot's predefined {sc-spring-boot-actuator}/health/Status.{sc-ext}[`Status`]
+types, it is also possible for `Health` to return a custom `Status` that represents a
+new system state. In such cases a custom implementation of the
 {sc-spring-boot-actuator}/health/HealthAggregator.{sc-ext}[`HealthAggregator`]
 interface also needs to be provided, or the default implementation has to be configured
 using the `management.health.status.order` configuration property.
@@ -277,7 +278,7 @@ Maven '`project properties`' via `@..@` placeholders, e.g.
 	project.name=Demo
 	project.version=X.X.X.X
 	project.description=Demo project for info endpoint
-	info.build.artifact=${project.artifactId}
+	info.build.artifact=@project.artifactId@
 	[email protected]@
 	[email protected]@
 	[email protected]@
@@ -367,16 +368,17 @@ for Gradle users, although a little more work is required to generate the proper
 [[production-ready-monitoring]]
 == Monitoring and management over HTTP
 If you are developing a Spring MVC application, Spring Boot Actuator will auto-configure
-all non-sensitive endpoints to be exposed over HTTP. The default convention is to use the
+all enabled endpoints to be exposed over HTTP. The default convention is to use the
 `id` of the endpoint as the URL path. For example, `health` is exposed as `/health`.
 
 
 
 [[production-ready-sensitive-endpoints]]
-=== Exposing sensitive endpoints
-If you use '`Spring Security`' sensitive endpoints will be exposed over HTTP, but also
-protected. By default '`basic`' authentication will be used with the username `user`
-and a generated password (which is printed on the console when the application starts).
+=== Securing sensitive endpoints
+If you add '`Spring Security`' to you project, all sensitive endpoints exposed over HTTP
+will be protected. By default '`basic`' authentication will be used with the username
+`user` and a generated password (which is printed on the console when the application
+starts).
 
 TIP: Generated passwords are logged as the application starts. Search for '`Using default
 security password`'.
@@ -760,6 +762,23 @@ NOTE: In this example we are actually accessing the endpoint over HTTP using the
 
 
 
+[[production-ready-system-metrics]]
+=== System metrics
+The following system metrics are exposed by Spring Boot:
+
+* The total system memory in Kb (`mem`)
+* The amount of free memory in Kb (`mem.free`)
+* The number of processors (`processors`)
+* The system uptime in milliseconds (`uptime`)
+* The application context uptime in milliseconds (`instance.uptime`)
+* The average system load (`systemload.average`)
+* Heap information in Kb (`heap`, `heap.committed`, `heap.init`, `heap.used`)
+* Thread information (`threads`, `thread.peak`, `thead.daemon`)
+* Class load information (`classes`, `classes.loaded`, `classes.unloaded`)
+* Garbage collection information (`gc.xxx.count`, `gc.xxx.time`)
+
+
+
 [[production-ready-datasource-metrics]]
 === DataSource metrics
 The following metrics are exposed for each supported `DataSource` defined in your
@@ -788,6 +807,14 @@ beans if your favorite data source isn't supported out of the box. See
 
 
 
+[[production-ready-session-metrics]]
+=== Tomcat session metrics
+If you are using Tomcat as your embedded servlet container, session metrics will
+automatically be exposed. The `httpsessions.active` and `httpsessions.max` keys provide
+the number of active and maximum sessions.
+
+
+
 [[production-ready-recording-metrics]]
 === Recording your own metrics
 To record your own metrics inject a
@@ -857,14 +884,16 @@ an `Exporter` interface and a few basic implementations for you to get started w
 
 
 [[production-ready-code-hale-metrics]]
-=== Coda Hale Metrics
-User of the http://metrics.codahale.com/[Coda Hale '`Metrics`' library] will automatically
-find that Spring Boot metrics are published to `com.codahale.metrics.MetricRegistry`. A
-default `com.codahale.metrics.MetricRegistry` Spring bean will be created when you declare
-a dependency to the `com.codahale.metrics:metrics-core` library; you can also register you
-own `@Bean` instance if you need customizations.
-
-Users can create Coda Hale metrics by prefixing their metric names with the appropriate
+=== Dropwizard Metrics
+User of the https://dropwizard.github.io/metrics/[Dropwizard '`Metrics`' library] will
+automatically find that Spring Boot metrics are published to
+`com.codahale.metrics.MetricRegistry`. A default `com.codahale.metrics.MetricRegistry`
+Spring bean will be created when you declare a dependency to the
+`io.dropwizard.metrics:metrics-core` library; you can also register you own `@Bean`
+instance if you need customizations. Metrics from the `MetricRegistry` are also
+automatically exposed via the `/metrics` endpoint
+
+Users can create Dropwizard metrics by prefixing their metric names with the appropriate
 type (e.g. `+histogram.*+`, `+meter.*+`).