Commit Graph

5742 Commits

Author SHA1 Message Date
Phillip Webb
441beee2fa Merge branch '1.1.x' into 1.2.x 2015-03-30 10:07:26 -07:00
Marcin Zajączkowski
cbf82c4793 Fix typo in gradle plugin documentation
(cherry-picked from commit 99f1c7b)
2015-03-30 10:06:39 -07:00
Andy Wilkinson
becbc00a4d Use configured ObjectMapper, if available, in all EndpointMBeans
Prior to this commit, every EndpointMBean used its own ObjectMapper.
Each of these ObjectMappers was created using new ObjectMapper() with
no opportunity for configuration.

This commit uses the ObjectMapper from the application context and
shares it among all EndpointMBeans. This gives the user control over
the ObjectMapper’s configuration using spring.jackson.* properties,
their own Jackson2ObjectMapperBuilder bean, etc. In the absence of an
ObjectMapper in the application context a single ObjectMapper is
instantiated and is used by all EndpointMBeans instead.

To allow the ObjectMapper to be shared, a number of constructors have
been overloaded to also take the ObjectMapper as a parameter. In these
cases the old constructor has been preserved for backwards compatibility
but has been deprecated.

Closes gh-2393
2015-03-30 17:40:19 +01:00
Andy Wilkinson
8850286937 List excluded auto-config classes in the auto-config report and endpoint
Prior to this commit, the auto-configuration report (both in its logged
form and the actuator endpoint) listed the positive and negative matches
but did not list the classes, if any, that the user had excluded.

This commit updates the logged report and the actuator endpoint to
expose a list of the excluded class names configured via the exclude
attribute on @EnableAutoConfiguration.

Closes gh-2085
2015-03-30 16:23:34 +01:00
Andy Wilkinson
075b5c1b18 Update war packaging tests following removal of jetty-jsp
See gh-2680
2015-03-30 15:16:30 +01:00
Andy Wilkinson
346392d31b Introduce a validation starter
Previously, the only starter that provided validation was
spring-boot-starter-web which included Hibernate Validator and
Tomcat's EL implementation. This left users writing non-web
applications to figure out the dependencies for themselves. They would
sometimes run into difficulties as Hibernate Validator's need for an
EL implementation would trip them up.

This commit adds a new starter, spring-boot-starter-validation,
which provides both Hibernate Validator and Tomcat's EL
implementation. spring-boot-starter-web has been updated to depend on
this starter rather than depending on Hibernate Validator directly.

Closes gh-2678
2015-03-30 14:25:25 +01:00
Andy Wilkinson
7745733bc6 Remove jetty-jsp from Spring Boot Starter Jetty
The documentation claims that JSPs don't work with embedded Jetty
making the dependency on jetty-jsp pointless. Furthermore,
spring-boot-starter-tomcat doesn't include JSP support and Undertow
doesn't support JSPs at all so removing jetty-jsp makes the embedded
container starters more consistent. It also removes 3.2MB from a
Jetty-based fat jar (spring-boot-sample-jetty drops from 12MB to
8.8MB).

Closes gh-2680
2015-03-30 13:47:13 +01:00
Andy Wilkinson
cb4cdf4d9a Merge branch 'disk' 2015-03-30 13:42:13 +01:00
Andy Wilkinson
ee3521b6a2 Test that total space is included in disk health information
Closes gh-2705
2015-03-30 13:41:39 +01:00
izeye
e270a21b82 Add total space to disk health information
Previously, disk health information only included the amount of free
space and the configured threshold. This commit adds the disk’s total
space.

See gh-2705
2015-03-30 13:41:23 +01:00
Andy Wilkinson
96f390a5a5 Merge branch '1.2.x' 2015-03-30 13:32:08 +01:00
Andy Wilkinson
0b61457d40 Merge branch '1.1.x' into 1.2.x 2015-03-30 13:31:51 +01:00
Andy Wilkinson
617b859842 Reinstate chapter titles in the PDF version of the reference guide
Closes gh-2723
2015-03-30 13:31:09 +01:00
Andy Wilkinson
ed5853e60e Merge branch '1.2.x' 2015-03-30 10:57:11 +01:00
Andy Wilkinson
c3571d416a Improve YAML-based configuration of Tomcat compression
Tomcat uses the strings “on” and “off” to enable and disable
compression. YAML interprets on as true and off as false, leaving
ServerProperties.Tomcat.compression configured with “true” and “false”
respectively. One solution is to use “on” rather than on and “off”
rather than off in the YAML file but users may not realise that they
need to do so.

This commit updates the connector customiser that configures compression
to map “true” to “on” and “false” to “off”.

Closes gh-2737
2015-03-30 10:56:07 +01:00
Stephane Nicoll
fd22b57846 Add dependency management for Postgresql
Closes gh-2545
2015-03-30 11:06:12 +02:00
Stephane Nicoll
72561f8969 Fix typo 2015-03-30 09:42:08 +02:00
Stephane Nicoll
45023caa47 Merge pull request #2742 from szpak/patch-1
* patch-1:
  Fix typo in gradle plugin documentation
2015-03-28 12:37:01 +01:00
Marcin Zajączkowski
99f1c7bf55 Fix typo in gradle plugin documentation 2015-03-28 10:23:13 +01:00
Phillip Webb
85319c0793 Fix Java 8 Javadoc errors 2015-03-27 18:59:47 -07:00
Eddú Meléndez
48959f2553 Add support for EhCache
Include auto-configuration support for EhCache with auto-detection of
the default `ehcache.xml` at the root of the classpath. EhCache
configuration can also be set via `spring.cache.config`.

See gh-2633
2015-03-27 15:55:42 -07:00
Stephane Nicoll
151220f41d Add cache manager auto-configuration
Add support for cache manager auto-configuration that is triggered when
the `EnableCaching` annotation is added to a Spring Boot application.

A new "spring.cache" set of configuration keys is also provided. The
"spring.cache.mode" allows the user to specify the cache provider that
should be auto-configured. If no explicit configuration is provided,
the environment is checked for the best suited cache implementation,
that is:

- Generic if at least one `Cache` bean is defined in the context.
- Hazelcast if either a default configuration file is present or the
  `spring.cache.config` property is set.
- JCache if one JSR-107 provider is present
- Redis if a `RedisTemplate` is defined in the context
- Guava
- Simple as a fallback option, using concurrent maps
- NoOp (that is, no cache) if the mode is set to "none"

If the provider supports it, it is possible to specify the caches
to create on startup via `spring.cache.cache-names`. If the provider
relies on a configuration file and a custom one needs to be used
`spring.cache.config` can be set to such custom resource.

If more than one JSR-107 provider is present, it is possible to force
the provider to use by setting the mode to `jcache` and specifying the
fully qualified class name of the CachingProvider to use via
`spring.cache.jcache.provider`.

See gh-2633
2015-03-27 15:55:36 -07:00
Phillip Webb
10da3d390e Polish 2015-03-27 11:30:58 -07:00
Stephane Nicoll
80194bd0e3 Upgrade to maven-archiver 2.6
Closes gh-2376
2015-03-27 17:45:59 +01:00
Stephane Nicoll
e21d8042ad Upgrade event listener to GenericApplicationListener
SmartApplicationListener has been superseded by GenericEventListener as
of Spring Framework 4.2. It will be eventually deprecated and removed.

Migrate our event listeners to use the new contract.

Closes gh-2576
2015-03-27 17:13:25 +01:00
Stephane Nicoll
f5023fd415 Use testConnection() method
Update MailHealthIndicator to use the new testConnection() method
available as of Spring Framework 4.2

Closes gh-2666
2015-03-27 16:56:39 +01:00
Andy Wilkinson
370e957a54 Merge branch '1.2.x' 2015-03-26 18:59:20 +00:00
Andy Wilkinson
527850ae55 Align default context path expectation with Undertow 1.1.3's behaviour
When configured with a context path of "", Undertow 1.1.3 changes the
context path to be "/". The change [1] was made to fix UNDERTOW-350
[2].

[1] 3db7707b8b
[2] https://issues.jboss.org/browse/UNDERTOW-350

See gh-2732
2015-03-26 18:53:28 +00:00
Andy Wilkinson
d7818b441e Merge branch '1.2.x' 2015-03-26 18:03:23 +00:00
Andy Wilkinson
0da24f82e3 Polishing: move tests for mustache.web into the correct package 2015-03-26 18:02:43 +00:00
Andy Wilkinson
dd748eda19 Use the configured charset, if any, in MustacheViewResolver
Closes gh-2670
2015-03-26 18:02:37 +00:00
Andy Wilkinson
99fde7ac89 Merge branch '1.2.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2015-03-26 17:19:44 +00:00
Andy Wilkinson
2cf23e08a0 Upgrade to Undertow 1.1.3.Final
Closes gh-2732
2015-03-26 17:18:51 +00:00
Andy Wilkinson
3a22443fbb Upgrade to H2 1.4.186
Closes gh-2730
2015-03-26 17:18:30 +00:00
Andy Wilkinson
17f03641de Upgrade to Dropwizard Metrics 3.1.1
Closes gh-2731
2015-03-26 17:18:05 +00:00
Andy Wilkinson
5963760c9c Merge branch '1.2.x'
Conflicts:
	spring-boot-dependencies/pom.xml
2015-03-26 17:10:47 +00:00
Andy Wilkinson
9285c9fd77 Merge branch '1.1.x' into 1.2.x
Conflicts:
	spring-boot-dependencies/pom.xml
2015-03-26 17:10:04 +00:00
Andy Wilkinson
fe837c0cea Upgrade to Reactor 1.1.6.RELEASE
gh-2735
2015-03-26 17:07:19 +00:00
Andy Wilkinson
de28ed4aa1 Upgrade to Groovy 2.3.11
Closes gh-2733
2015-03-26 17:04:26 +00:00
Andy Wilkinson
adbd340c91 Upgrade to Logback 1.1.3
Closes gh-2729
2015-03-26 17:03:52 +00:00
Andy Wilkinson
887a7cce1e Upgrade to SLF4J 1.7.11
Closes gh-2734
2015-03-26 17:03:23 +00:00
Andy Wilkinson
0c8b2889fb Merge branch '1.2.x' 2015-03-26 16:32:10 +00:00
Andy Wilkinson
d428afb45f Merge branch '1.1.x' into 1.2.x
Conflicts:
	spring-boot-dependencies/pom.xml
2015-03-26 16:32:05 +00:00
Andy Wilkinson
936e1c2152 Update to Spring Security 3.2.7.RELEASE
Closes gh-2726
2015-03-26 16:31:13 +00:00
Andy Wilkinson
03c691443e Merge branch '1.2.x' 2015-03-26 16:30:13 +00:00
Andy Wilkinson
644237d170 Merge branch '1.1.x' into 1.2.x 2015-03-26 16:30:04 +00:00
Andy Wilkinson
1307a2401d Upgrade Spring WS in 1.1.x as well
See gh-2718
2015-03-26 16:29:04 +00:00
Andy Wilkinson
a6028280d2 Polishing 2015-03-26 16:27:52 +00:00
Andy Wilkinson
a67a37840b Merge branch '1.2.x' 2015-03-26 16:26:48 +00:00
Greg Turnquist
599792097c Upgrade Spring WS to 2.2.1.RELEASE
Closes gh-2718
2015-03-26 16:25:23 +00:00