Commit Graph

629 Commits (734f5c39f7d55d6b55c92e1dc35ff1bd50b3cae5)

Author SHA1 Message Date
Andy Wilkinson 735b96dd0f Document how to configure multiple listeners when using Undertow
Closes gh-2191
10 years ago
Phillip Webb 4ad5c52dd7 Add support for `server.ssl.enabled` property
Fixes gh-2241
10 years ago
Phillip Webb be30385e15 Add @WebIntegrationTest annotation
Add `@WebIntegrationTest` which is similar to `@IntegrationTest` and
`@WebAppConfiguration`. The annotation using Spring's `@BootstrapWith`
annotation rather than `@TestExecutionListeners` which allows it to
work when `@TestExecutionListeners` (even ServletTestExecutionListener)
are declared on the test class.

This annotation is particularly useful for TestNG users that extend
Spring's `AbstractTestNGSpringContextTests` class.

Fixes gh-2299
See gh-1956
See gh-2135
10 years ago
Phillip Webb 6ddabb871a Merge branch '1.1.x' 10 years ago
Phillip Webb 0622b3e987 Fix documentation code example error
The "Customizing ConfigurableEmbeddedServletContainer directly"
section should use `HttpStatus.NOT_FOUND` and not `HttpStatus.404` in
the sample code.

Fixes gh-2258
10 years ago
Eric Dahl aa43f5e037 Update custom HealthIndicator documentation
Update the custom HealthIndicator documentation to use the build()
method rather than the old mechanism.

Fixes gh-2270
10 years ago
Phillip Webb c08f912abd Merge branch '1.1.x' 10 years ago
Russell Allen fe83aed6b2 Grammar correction
Closes gh-2262
10 years ago
Nils Breunese 6248d8c86e Add docs for Spring Boot CLI via MacPorts
Add MacPorts section to reference docs since the Spring Boot CLI
is now also maintained in MacPorts.

Closes gh-2250
10 years ago
Phillip Webb c7cfdbe250 Polish appendix 10 years ago
Phillip Webb 6ece075aec Merge branch '1.1.x' 10 years ago
Phillip Webb a0667ba4bb Polish docs 10 years ago
Stephane Nicoll 2bf01ebeca Merge branch '1.1.x' 10 years ago
Stephane Nicoll 05e402295d Mention environment variables mapping in the guide
Closes gh-2234
10 years ago
Stephane Nicoll 05d47c65db Fix wrong link
Closes gh-2223
10 years ago
Phillip Webb fd97c7553c Apply HATEOAS module to primary ObjectMapper
Update HypermediaAutoConfiguration to apply the Jackson2HalModule to
the primary ObjectMapper. This restores the behavior of Spring Boot
1.1 where HATEOAS types could be serialized for both `application/json`
and `application/json+hal` content types.

A `spring.hateoas.apply-to-primary-object-mapper` property has also been
provided to opt-out if necessary.

Fixes gh-2147
10 years ago
Stephane Nicoll 20c8e54c5f Revert dea1ca9855
Actually collection types are not harmonized to their interface
counterpart; this was implemented in the first proposal but wasn't
applied in the final review.

See gh-2206
10 years ago
pauldub b865539adc Fix typo in howto.adoc 10 years ago
Hendy Irawan ba97090375 Clarify SSL "How-to" documentation
Update the SSL "How-to" documentation to make it clearer that SSL
configuration replaces the usual connector.

Closes gh-2172
See gh-2167
10 years ago
Phillip Webb f35135e43d Polish documentation 10 years ago
Stephane Nicoll 1b039e78e6 Documentation improvement of DataSource configuration
Closes gh-2126
10 years ago
Stephane Nicoll fe5800f8be Fix typo 10 years ago
Stephane Nicoll 77427f53cc Support of Lombok annotated ConfigurationProperties
Previously, no configuration properties were discovered on a class using
lombok instead of regular getters/setters.

This commit adds a support for some of the lombok annotations,
specifically that is @Data, @Getter and @Setter. Provides the same
semantic as what lombok is generating.

Closes gh-2114
10 years ago
Phillip Webb 6b4bb4d654 Unify console and file logback patterns
Update the file log pattern to write the thread name after the `---`
separator. The allows both file and console logs to be parsed in the
same way.

Fixes gh-2136
10 years ago
Phillip Webb fc2e616cc2 Restore Spring Boot 1.1 logging behavior
Refactor LoggingApplicationListener and LoggingSystem to restore
Spring Boot 1.1 logging behavior. The LOG_FILE and LOG_PATH system
properties are now set before configuring the logger.

The `logging.path` property is now once again optional and will not be
used when `logging.file` is specified. The documentation has also been
updated to reflect the changes.

Fixes gh-2121
Fixes gh-2117
10 years ago
Stephane Nicoll f1c893e523 Polish indent 10 years ago
Stephane Nicoll b8612d99c6 Add explicit reference to health.*
Health indicator configuration keys have moved from the health.* to the
management.health.* namespace. This commit adds an explicit reference
to the previous location.

See gh-2128
10 years ago
Stephane Nicoll 2416a935e6 Properly document health indicator config
Health indicator configuration keys have moved from the health.* to the
management.health.* namespace. This commit makes sure that these are
documented properly in 1.1.x as well.

See gh-2118
10 years ago
Spring Buildmaster 63e6a25097 Next development version 10 years ago
Spring Buildmaster 1a788c1741 Next development version 10 years ago
John 62d3f73e24 Fix "heath" misspellings 10 years ago
Phillip Webb a27217ae43 Provide a way to opt-in to endpoint enablement
Update AbstractEndpoint so that the `enable` property is optional and
when it not specified the `endpoints.enabled` property will be used.

This allows users to switch the way that endpoints are enabled. Rather
than opting-out specific endpoint enablement the `endpoints.enabled`
property can be set to `false` and specific endpoints can be opted-in.

Fixes gh-2102
10 years ago
Phillip Webb 3e2433c842 Update health endpoint sensitive flag in docs 10 years ago
John 3343cd4c90 Fix typo in documentation 10 years ago
Phillip Webb e772174019 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
10 years ago
Phillip Webb a0ce04ac4b Drop Cloudbees PaaS documentation
Remove the Cloudbees section since they are shutting down their PaaS.

Fixes gh-2105
10 years ago
Phillip Webb e5295c0142 Update HealthInformation reference documentation
Clean and align with changes in Spring Boot 1.2

Fixes gh-2104
10 years ago
Phillip Webb 71fd3b36b4 Update "logging" reference documentation
Update the logging section to reflect changes in Spring Boot 1.2

Fixes gh-1790
10 years ago
Phillip Webb 119a5656e2 Update SpringBootServletInitializer ref docs
Add a hint to show that the `configure` method is now optional.

Fixes gh-2074
10 years ago
Phillip Webb 400b664098 Update "banner" reference documentation
Fixes gh-2103
10 years ago
Stephane Nicoll 1da0deeef6 Add missing keys in appendix 10 years ago
Phillip Webb 083f9757cd Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/context/embedded/jetty/JettyEmbeddedServletContainerFactory.java
10 years ago
Phillip Webb 22e8478aa3 Cross-reference "Create a deployable war" how-to
Add a tip for both the Maven and Gradle "Packaging executable jar and
war files" section referring to the how-to.

Fixes gh-2086
10 years ago
Phillip Webb b651090fcd Document how-to for Weblogic deployment
Fixes gh-2078
10 years ago
Phillip Webb af643e2f54 Merge branch '1.1.x'
Conflicts:
	spring-boot/src/main/java/org/springframework/boot/logging/LoggingApplicationListener.java
10 years ago
kakawait f65c7dbeb3 Update 'flyway.locations' appendix documentation
Replace `classpath:db/migrations` with `classpath:db/migrations`.

Fixes gh-2063
10 years ago
Phillip Webb 211f20b9c6 Add setIgnoreDefaultModelOnRedirect support
Add a `spring.mvc.set-ignore-default-model-on-redirect` property to
allow RequestMappingHandlerAdapter.setIgnoreDefaultModelOnRedirect to
be easily customized and change the default value to 'true'.

Fixes gh-2018
10 years ago
Stephane Nicoll 509201907c Polish default value for arrays
See gh-1996
10 years ago
Stephane Nicoll f821fdfffa Fix typo 10 years ago
Stephane Nicoll d9ca0869b5 Fix required Spring Framework version 10 years ago
Stephane Nicoll 4e1c259645 Add requirements documentation section
Fixes gh-1439
10 years ago
Phillip Webb 48db5457f1 Polish 10 years ago
Stephane Nicoll 8ee237a9c6 Fix documentation syntax typo 10 years ago
Andy Wilkinson a83f9c6311 Correct markup in documentation of how to configure Undertow 10 years ago
Dave Syer 3bb598a421 Only hide /health details if the app is actually secure
Also gives the user the option to override (by setting
endpoints.health.sensitive=false).

Fixes gh-1977 in a slightly different way
10 years ago
Andy Wilkinson 55fadf1231 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 2b4eee5e53 Add a note explaining that double backslashes are unnecessary in YAML
Closes gh-1989
10 years ago
Sjoerd Mulder cc557833a4 Escape backslashes in .properties examples of setting internal-proxies
In a properties file, a backslash is used as an escape character for
the line terminator sequence to allow values to be split across
multiple lines. When a backslash is used elsewhere they're stripped
out of the property's value.

This commit updates .properties-based examples for configuring
server.tomcat.internal-proxies to escape the backslahes so that they
are retained in the property's value at runtime.

See gh-1989
10 years ago
Andy Wilkinson 092b861ee3 Merge branch '1.1.x' 10 years ago
Andrea Vacondio 9ef8335881 Fix broken link to the MVC section of the Spring reference docs
Closes gh-1998
10 years ago
Andy Wilkinson a708b28d9d Document restrictions when /health is accessed anonymously
Closes gh-1978
10 years ago
Andy Wilkinson 26a511495e Allow the user to opt-out of anonymous access restrictions for /health
By default, when /health is accessed anonymously, the details are
stripped, i.e. the response will only indicate UP or DOWN. Furthermore
the response is cached for a configurable period to prevent a denial
of service attack.

This commit adds a configuration property,
endpoints.health.restrict-anonymous-access, that can be set to false
to allow full anonymous access to /health. When full access is
allowed, the details will be included in the response and the response
will not be cached.

Closes gh-1977
10 years ago
Andy Wilkinson 023d5bea3b Merge branch '1.1.x' 10 years ago
Andy Wilkinson feddb2e8a1 Note that @IntegrationTest and @WebAppConfiguration can be used with Spock
Closes gh-1908
10 years ago
Stephane Nicoll 4402c6b4a0 Haromonize configuration keys to lowercase hyphen 10 years ago
Andy Wilkinson efe50ebcad Document WebSocket exclusions that are required when using Jetty 8
Closes gh-1969
10 years ago
Stephane Nicoll dea1ca9855 Update description of property type 10 years ago
Phillip Webb 08988fd182 Update docs about Jetty 9 and Tomcat 8
Fixes gh-1951
10 years ago
Phillip Webb 2b57c5a4dd Rename spring.data.mongo.repositories.enabled
Rename mongo to mongodb.

Fixes gh-1966
10 years ago
Phillip Webb 670ba33bec Improve MongoDataAutoConfiguration
Update MongoDataAutoConfiguration to provide easier configuration of
CustomConversions, the MappingMongoConverter, MongoMappingContext
and an authentication database.

Fixes gh-1619
Fixes gh-1730
10 years ago
Phillip Webb 182ce21542 Clarify configuration meta-data details
Update the configuration meta-data appendix to clarify a few things.
10 years ago
Stephane Nicoll ab6878ab66 Add documentation for the deprecated field 10 years ago
Dave Syer 689d49021b Merge branch '1.1.x' 10 years ago
Brian Clozel 404153a758 Minor fixes in howto documentation re:SSL config
Fixes a couple of typos in the documentation:
* `x-forwarded-protocol` is not the standard name for this header
* `require_https` is not an existing property, but rather `require_ssl`
10 years ago
Phillip Webb c34cfb27a3 Polish 10 years ago
Dave Syer 7fa0ea7c3b Add support for spring.jersey.type=filter
Fixes gh-1756
10 years ago
Andy Wilkinson 90af8bf54a Add auto-configuration for Jetty 9's WebSocket support
Closes gh-1269
10 years ago
Andy Wilkinson 1864d79077 Polish Undertow contribution
Closes gh-1779
10 years ago
Andy Wilkinson 35b7ba5cda Deprecate http.mappers.* properties
The http.mappers.* configuration properties assumed that the mapping
was JSON (on of the property names was jsonPrettyPrint) and also only
exposed a small subset of the configuration options supported by
Jackson (and GSON). The property names implied that it would configure
all HTTP mapping, however it was ignored by GsonAutoConfiguration.

This commit deprecates the support for http.mappers.* in favour of
configuring Jackson or Gson instead. Jackson can be configured
declaratively using the spring.jackson.* properties or programtically.
Gson can be configured programatically by using a GsonBuilder to
create a Gson instance with the desired configuration.
gh-1946 has been opened to add support for declarative configuration
of Gson.

Closes gh-1945
10 years ago
Phillip Webb ba2446a340 Merge branch '1.1.x' 10 years ago
Phillip Webb 285563a509 Use embedded docbook XSLT files
Switch from external docbook XSLT to those shipped as part of the
Maven plugin.

Fixes gh-1942
10 years ago
Andy Wilkinson 05cf686713 Allow servlet context parmeters to be configured via declaratively
Previously, configuration of a ServletContext init parameter required
the use of a ServletContextInitializer bean. This commmit adds
support for declarative configuration via the environment using
server.context_parameters.<name>=<value>.

Closes gh-1791
10 years ago
Phillip Webb 3c6c1d08e0 Polish 10 years ago
Stephane Nicoll eb4c1426d3 Document init CLI command
Closes gh-1799
10 years ago
Stephane Nicoll 8112aca9e8 Add documentation for email integration
Closes gh-1904
10 years ago
Spring Buildmaster 46b7738334 Next development version 10 years ago
Stephane Nicoll 109c3a3439 Auto configure CharacterEncodingFilter
Provide a default UTF-8 encoding for HTTP requests and responses unless
specified otherwise.

Fixes gh-1182
10 years ago
Andy Wilkinson 9259564307 Merge branch '1.1.x' 10 years ago
Andy Wilkinson a9681ea032 Add note to explain that bootRun ignores output from processResources
Closes gh-1739
10 years ago
Andy Wilkinson 634542d594 Merge branch '1.1.x' 10 years ago
Andy Wilkinson c3d2fb5e5c 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
10 years ago
Andy Wilkinson 150b85e10d Merge branch '1.1.x'
Conflicts:
	spring-boot-dependencies/pom.xml
10 years ago
Andy Wilkinson a9b88d6955 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
10 years ago
Andy Wilkinson d2c50813fd Merge branch '1.1.x' 10 years ago
Andy Wilkinson 595f387fb2 Correct the references to WebSecurityConfigurerAdapter in the docs
Closes gh-1861
10 years ago
Stephane Nicoll 00961611b2 Move health.* properties to management.health.*
Fixes gh-1841
10 years ago
Phillip Webb 68571ee535 Document @SpringBootApplication
Add a section to the reference guide about @SpringBootApplication.

See gh-1842
10 years ago
Phillip Webb 0c3911162b Polish 10 years ago
Phillip Webb 96a031cf20 Default spring.datasource.jmx-enabled to false
Change the default value of spring.datasource.jmx-enabled to false
to prevent InstanceAlreadyExistsException problems when using the
Spring Test Framework.

Fixes gh-1590
10 years ago
Phillip Webb 58d660d10d Allow DAO ExceptionTranslator to proxy classes
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
10 years ago
Phillip Webb ba0dd60de9 Rename charSet to charset
Rename AbstractTemplateViewResolverProperties.setCharSet/getCharSet to
setCharset/getCharset, deprecating the old method.

Fixes gh-1835
10 years ago
Phillip Webb ab7f73f365 Use dashed case for properties appendix
Additional items added since 1.1.x

Fixes gh-1834
10 years ago
Phillip Webb df1d035162 Merge branch '1.1.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/appendix-application-properties.adoc
10 years ago
Phillip Webb 2f17c38822 Use dashed case for properties appendix
Fixes gh-1834
10 years ago
Phillip Webb ea6162254d Update pidfile property and add documentation
Change the pidfile property from `spring.application.pidfile` to
`spring.pidfile` (to save confusion with SpringApplication properties).

Also added documentation and meta-data information.

See gh-1579
10 years ago
Phillip Webb 10d1d5dfb4 Merge branch '1.1.x' 10 years ago
Phillip Webb e1894c1c4b Add check-template-location properties to appendix
Some were missing, some were named incorrectly.

See gh-1827
10 years ago
Stephane Nicoll dba4ad0768 Fix typo 10 years ago
Phillip Webb edaed415fb Polish 10 years ago
Stephane Nicoll 9dec27e7bf Permit to disable JTA using a single property
Disable JTA auto-configuration altogether with a simple property. This
can be useful if the environment is JTA capable but the application does
not require it.

Fixes gh-1457
10 years ago
Stephane Nicoll cbd3c39640 Override StringHttpMessageConverter with UTF-8
Override the default StringHttpMessageConverter provided by the standard
Spring MVC configuration so that is uses UTF-8 instead of the aging
default of the servlet spec (that is ISO-8859-1)

Fixes gh-1800
10 years ago
Dave Syer 8be97fa47d Tweak docs on Maven resource filtering some more 10 years ago
Dave Syer d210810535 Tweak docs on Maven resource filtering
Fixes gh-1816
10 years ago
Phillip Webb a973fd41f4 Polish 10 years ago
Dave Syer 9b6cb83be5 Add documentation for Servlet 2.5 and GAE
Fixes gh-1104
10 years ago
Stephane Nicoll fb0d9d2a2e Fix build failure
This commit reworks a7e1ec8 to fix the build failure and update the
documentation regarding default maven filtering option with
spring-boot-starter-parent

Fixes gh-1199
10 years ago
Phillip Webb 9d01d4fa84 Document configuration meta-data
Add an appendix to the reference documentation describing the format
of configuration meta-data and how the annotation processor can be used.

Closes gh-1001
10 years ago
Andy Wilkinson 0cdb1d3f22 Make Spring Security's filter's order configurable and default to zero
Previously, Spring Security's filter had no configured order. Due to
the use of AnnotationAwareOrderComparater this meant that its order
defaulted to LOWEST_PRECEDENCE. This meant that a user had to declare
a FilterRegistrationBean for the filter and explicitly set its order
if they want another filter to run after Spring Security's.

This commit updates the security auto-configuration to assign a
default order of zero to Spring Security's filter, allowing filters
to be easily configured to run before it or after it. This default
value can overridden using the server.filter-order property. The
default order is also exposed as a constant on SecurityProperties,
allowing it to be referenced from other filter declarations.

Closes gh-1640
10 years ago
Phillip Webb d17b7c8195 Polish 10 years ago
Andy Wilkinson 8a1e010d0a Allow multiple templateLoaderPaths to be configured for FreeMarker
Closes gh-1767
10 years ago
Andy Wilkinson bd562c06b6 Merge branch '1.1.x' 10 years ago
Andy Wilkinson f58b8366e1 Correct the syntax that's used for smart single and double quotes
Fixes gh-1753
10 years ago
Dave Syer 6c3d490c74 Add note about springloaded configuration 10 years ago
Dave Syer e8b59b9e55 Add CLI command line arguments examples 10 years ago
Stephane Nicoll e858cfcced Add missing starters in documentation 10 years ago
Phillip Webb 2e7aa4685b Polish 10 years ago
Andy Wilkinson 01fd8cb8f3 Reinstate Bitronix's default server ID, provide property to override it
Previously, Bitronix's server ID was hard-coded to be
spring-boot-jta-bitronix. This created the possibility of multiple
transaction managers performing recovery on each other's behalf as
they would be unable to identify their own XIDs due to the common
server ID.

This commit reinstates the default (which is the IP address of the
machine on which Bitronix is running), and introduces a new
property, spring.jta.transaction-manager-id, that can be used to
configure the id for both Atomikos and Bitronix. A cautionary note
has also been added to the documentation for Atomikos and Bitronix
explaining the need to configure this property.

Closes gh-1548
10 years ago
Andy Wilkinson 4e636f069f Document the CLI’s install and uninstall commands
Closes gh-1506
10 years ago
Andy Wilkinson 2da4dc00f0 Merge branch '1.1.x' 10 years ago
Andy Wilkinson 7060cc1967 Correct the position of JNDI in the ordered list of property sources
Fixes gh-1693
10 years ago
Andy Wilkinson 7211571969 Fix some grammar issues in docs
Closes gh-1695
10 years ago
Eric Dahl 16937746a0 Fix some grammar issues in docs 10 years ago
Phillip Webb c90633aab6 Polish 10 years ago
Spring Buildmaster 3e71a21b30 Next development version 10 years ago
Phillip Webb b87a591d27 Revert "Add ActiveMQ MQTT connection URL auto-detection"
This reverts commit 0d8bde58c9.

Fixes gh-1679
10 years ago
Phillip Webb 187b4e706c Escape `...*...` outputs using `+...*...+` 10 years ago
Phillip Webb 6281070d0a Merge branch '1.1.x'
Conflicts:
	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
10 years ago
Phillip Webb 7e842aee77 Escape `...*...` outputs using `+...*...+` 10 years ago
Phillip Webb 4ecf50a1a9 Add `hide-uri-scheme` attribute to docs 10 years ago
Phillip Webb 2303c3aea9 Fix asciidoctor 'spaces' conversion issues 10 years ago
Dave Syer 8ffe7ec4b8 Fix asciidoctor syntax problems and updgrade to asciidoctor 1.5
Points to note for authors:

* Nesting "*" in `literals` does not behave like Markdown - you have to
escape the asterisk (e.g. `foo/\*`)

* Quote ligatures (why we had to use those I don't really know) are
different in asciidoctor 1.5 ('`foo`' instead of ``foo'')

Merge branch '1.1.x'

Conflicts:
	spring-boot-docs/src/main/asciidoc/production-ready-features.adoc
	spring-boot-docs/src/main/asciidoc/spring-boot-features.adoc
10 years ago
Dave Syer 6a503d5ca9 Fix loads of asciidoc errors 10 years ago
Phillip Webb 6a423d7ad1 Add EmbeddedServerPortFileWriter
Add a EmbeddedServerPortFileWriter which can be used to write server
port information to a file.

Fixes gh-1275
Closes gh-1491
10 years ago
Phillip Webb 77ccd9a80b Rename ApplicationPidListener
Rename ApplicationPidListener to ApplicationPidFileWriter (keeping the
old class in a deprecated form)

Fixes gh-1673
10 years ago
Henryk Konsek 0d8bde58c9 Add ActiveMQ MQTT connection URL auto-detection
Fixes gh-1638
10 years ago
Andy Wilkinson 97178915a4 Polish disk space health indicator
- Supply auto-configuration for the new indicator
 - As suggested in the pull request, include the free disk space and
   configured threshold in the health details
 - Update the documentation to describe the indicator and its
   two configuration settings
 - Use @ConfigurationProperties to bind the indicator's configuration.
   This should make the changes sympathetic to the work being done
   to automate the configuration properties documentation

Closes gh-1297
10 years ago
Daniel Fullarton 1dbc94d0f7 Add a logging system, starter and sample for Log4j 2
Closes gh-1565
10 years ago
Phillip Webb 62eb01f0b8 Polish 10 years ago
Phillip Webb 872f30e5d0 Merge branch '1.1.x'
Conflicts:
	spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/repository/redis/RedisMetricRepository.java
10 years ago
Phillip Webb 9dfbc25eaa Polish 10 years ago