Phillip Webb
718a090b32
Restore Java 6 source/target settings
...
Update spring-boot-actuator to restore Java 6 compatibility.
2015-04-06 20:30:37 -07:00
Phillip Webb
8143d1f36d
Apply animal sniffer to entire build
...
Move animal sniffer configuration out of spring-boot-dependencies to
spring-boot-parent and apply it to all projects.
See gh-716
2015-04-06 19:47:22 -07:00
Phillip Webb
59692cd938
Polish formatting
2015-04-06 18:03:59 -07:00
Dave Syer
5789665447
Update .travis.yml for jdk8
2015-04-06 10:18:06 +01:00
Dave Syer
c9c1e8b517
Add animal sniffer for Java 6 and jdk1.8 to actuator
...
The build now requires java 8 (although no language features are yet
in use). Bamboo has been updated.
Fixes gh-716
2015-04-06 08:54:43 +01:00
Stephane Nicoll
fbe9774890
Use spring.cache.config with JCache
...
According to the spec, specifying a custom URI when retrieving a
`javax.cache.CacheManager` might be used as a way to transmit the
location of a custom configuration file to initialize the underlying
cache manager.
If `spring.cache.config` is set, we use that information to retrieve a
CacheManager with that configuration file. Unfortunately, hazelcast does
not support this feature so we are setting the property key it expects
instead.
See https://github.com/hazelcast/hazelcast/issues/4943
Closes gh-2743
2015-04-03 15:24:58 +02:00
Stephane Nicoll
b586bce3b7
Merge pull request #2769 from eddumelendez/gh-2768
...
* gh-2768:
Add missing type check on EhCacheCacheConfiguration
2015-04-03 15:11:07 +02:00
Eddú Meléndez
fcae5a7df8
Add missing type check on EhCacheCacheConfiguration
...
Previously, EhCacheCacheConfiguration could be triggered even if the
ehcache library is not present. This commit adds the missing
`ConditionalOnType` that now guards the configuration properly.
See gh-2633
2015-04-03 15:10:52 +02:00
Stephane Nicoll
22b1ffd9af
Merge branch '1.2.x'
2015-04-03 10:31:37 +02:00
Stephane Nicoll
adaf175273
Clarified the naming scheme for starters
...
Initial update to the documentation to mention how a 3rd party starter
should be named. The current doc sends a completely inconsistent message
to what we actually intend.
See gh-2537
2015-04-03 10:24:11 +02:00
Stephane Nicoll
3b99ba9d61
Add missing classpath checks
...
Certain cache manager implementations are located in the
spring-context-support module that isn't pulled automatically.
As a result, the related cache auto-configurations should make sure that
the relevant CacheManager implementation is available.
See gh-2633
2015-03-31 11:26:25 +02:00
Stephane Nicoll
9f1475d708
Fix wrong import in Guava auto-config
...
Remove the need for `commons-collections`
See gh-2633
2015-03-31 11:22:11 +02:00
Stephane Nicoll
24d9afa67b
Fix wrong import in JCache auto-config
...
Remove the need for `commons-collections`
See gh-2633
2015-03-31 11:20:45 +02:00
Phillip Webb
5a08ca0b45
Merge branch '1.2.x'
...
Conflicts:
pom.xml
spring-boot-actuator/pom.xml
spring-boot-autoconfigure/pom.xml
spring-boot-cli/pom.xml
spring-boot-dependencies/pom.xml
spring-boot-deployment-tests/pom.xml
spring-boot-deployment-tests/spring-boot-deployment-test-tomcat/pom.xml
spring-boot-deployment-tests/spring-boot-deployment-test-tomee/pom.xml
spring-boot-deployment-tests/spring-boot-deployment-test-wildfly/pom.xml
spring-boot-docs/pom.xml
spring-boot-full-build/pom.xml
spring-boot-integration-tests/pom.xml
spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml
spring-boot-integration-tests/spring-boot-security-tests/pom.xml
spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml
spring-boot-parent/pom.xml
spring-boot-samples/pom.xml
spring-boot-samples/spring-boot-sample-actuator-log4j/pom.xml
spring-boot-samples/spring-boot-sample-actuator-log4j2/pom.xml
spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml
spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml
spring-boot-samples/spring-boot-sample-actuator/build.gradle
spring-boot-samples/spring-boot-sample-actuator/build.xml
spring-boot-samples/spring-boot-sample-actuator/pom.xml
spring-boot-samples/spring-boot-sample-amqp/pom.xml
spring-boot-samples/spring-boot-sample-aop/pom.xml
spring-boot-samples/spring-boot-sample-atmosphere/pom.xml
spring-boot-samples/spring-boot-sample-batch/pom.xml
spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml
spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml
spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml
spring-boot-samples/spring-boot-sample-data-redis/pom.xml
spring-boot-samples/spring-boot-sample-data-rest/pom.xml
spring-boot-samples/spring-boot-sample-data-solr/pom.xml
spring-boot-samples/spring-boot-sample-flyway/pom.xml
spring-boot-samples/spring-boot-sample-hateoas/pom.xml
spring-boot-samples/spring-boot-sample-hornetq/pom.xml
spring-boot-samples/spring-boot-sample-integration/pom.xml
spring-boot-samples/spring-boot-sample-jersey/pom.xml
spring-boot-samples/spring-boot-sample-jersey1/pom.xml
spring-boot-samples/spring-boot-sample-jetty-ssl/pom.xml
spring-boot-samples/spring-boot-sample-jetty/pom.xml
spring-boot-samples/spring-boot-sample-jetty8-ssl/pom.xml
spring-boot-samples/spring-boot-sample-jetty8/pom.xml
spring-boot-samples/spring-boot-sample-jpa/pom.xml
spring-boot-samples/spring-boot-sample-jta-atomikos/pom.xml
spring-boot-samples/spring-boot-sample-jta-bitronix/pom.xml
spring-boot-samples/spring-boot-sample-jta-jndi/pom.xml
spring-boot-samples/spring-boot-sample-liquibase/pom.xml
spring-boot-samples/spring-boot-sample-parent-context/pom.xml
spring-boot-samples/spring-boot-sample-profile/build.gradle
spring-boot-samples/spring-boot-sample-profile/pom.xml
spring-boot-samples/spring-boot-sample-secure/pom.xml
spring-boot-samples/spring-boot-sample-servlet/pom.xml
spring-boot-samples/spring-boot-sample-simple/build.gradle
spring-boot-samples/spring-boot-sample-simple/pom.xml
spring-boot-samples/spring-boot-sample-testng/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml
spring-boot-samples/spring-boot-sample-tomcat/pom.xml
spring-boot-samples/spring-boot-sample-tomcat7-jsp/pom.xml
spring-boot-samples/spring-boot-sample-traditional/pom.xml
spring-boot-samples/spring-boot-sample-undertow-ssl/pom.xml
spring-boot-samples/spring-boot-sample-undertow/pom.xml
spring-boot-samples/spring-boot-sample-velocity/pom.xml
spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml
spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
spring-boot-samples/spring-boot-sample-web-method-security/pom.xml
spring-boot-samples/spring-boot-sample-web-mustache/pom.xml
spring-boot-samples/spring-boot-sample-web-secure-custom/pom.xml
spring-boot-samples/spring-boot-sample-web-secure-jdbc/pom.xml
spring-boot-samples/spring-boot-sample-web-secure/pom.xml
spring-boot-samples/spring-boot-sample-web-static/build.gradle
spring-boot-samples/spring-boot-sample-web-static/pom.xml
spring-boot-samples/spring-boot-sample-web-ui/build.gradle
spring-boot-samples/spring-boot-sample-web-ui/pom.xml
spring-boot-samples/spring-boot-sample-web-velocity/pom.xml
spring-boot-samples/spring-boot-sample-websocket-jetty/pom.xml
spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml
spring-boot-samples/spring-boot-sample-websocket-undertow/pom.xml
spring-boot-samples/spring-boot-sample-ws/pom.xml
spring-boot-samples/spring-boot-sample-xml/pom.xml
spring-boot-starters/pom.xml
spring-boot-starters/spring-boot-starter-actuator/pom.xml
spring-boot-starters/spring-boot-starter-amqp/pom.xml
spring-boot-starters/spring-boot-starter-aop/pom.xml
spring-boot-starters/spring-boot-starter-batch/pom.xml
spring-boot-starters/spring-boot-starter-cloud-connectors/pom.xml
spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml
spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml
spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml
spring-boot-starters/spring-boot-starter-data-rest/pom.xml
spring-boot-starters/spring-boot-starter-data-solr/pom.xml
spring-boot-starters/spring-boot-starter-freemarker/pom.xml
spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
spring-boot-starters/spring-boot-starter-hateoas/pom.xml
spring-boot-starters/spring-boot-starter-hornetq/pom.xml
spring-boot-starters/spring-boot-starter-integration/pom.xml
spring-boot-starters/spring-boot-starter-jdbc/pom.xml
spring-boot-starters/spring-boot-starter-jersey/pom.xml
spring-boot-starters/spring-boot-starter-jetty/pom.xml
spring-boot-starters/spring-boot-starter-jta-atomikos/pom.xml
spring-boot-starters/spring-boot-starter-jta-bitronix/pom.xml
spring-boot-starters/spring-boot-starter-log4j/pom.xml
spring-boot-starters/spring-boot-starter-log4j2/pom.xml
spring-boot-starters/spring-boot-starter-logging/pom.xml
spring-boot-starters/spring-boot-starter-mail/pom.xml
spring-boot-starters/spring-boot-starter-mobile/pom.xml
spring-boot-starters/spring-boot-starter-mustache/pom.xml
spring-boot-starters/spring-boot-starter-parent/pom.xml
spring-boot-starters/spring-boot-starter-redis/pom.xml
spring-boot-starters/spring-boot-starter-remote-shell/pom.xml
spring-boot-starters/spring-boot-starter-security/pom.xml
spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
spring-boot-starters/spring-boot-starter-test/pom.xml
spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml
spring-boot-starters/spring-boot-starter-tomcat/pom.xml
spring-boot-starters/spring-boot-starter-undertow/pom.xml
spring-boot-starters/spring-boot-starter-velocity/pom.xml
spring-boot-starters/spring-boot-starter-web/pom.xml
spring-boot-starters/spring-boot-starter-websocket/pom.xml
spring-boot-starters/spring-boot-starter-ws/pom.xml
spring-boot-starters/spring-boot-starter/pom.xml
spring-boot-tools/pom.xml
spring-boot-tools/spring-boot-configuration-processor/pom.xml
spring-boot-tools/spring-boot-dependency-tools/pom.xml
spring-boot-tools/spring-boot-gradle-plugin/pom.xml
spring-boot-tools/spring-boot-loader-tools/pom.xml
spring-boot-tools/spring-boot-loader/pom.xml
spring-boot-tools/spring-boot-maven-plugin/pom.xml
spring-boot-versions/pom.xml
spring-boot/pom.xml
2015-03-31 00:02:00 -07:00
Phillip Webb
fa0a2f39c5
Merge branch '1.1.x' into 1.2.x
...
Conflicts:
pom.xml
spring-boot-actuator/pom.xml
spring-boot-autoconfigure/pom.xml
spring-boot-cli/pom.xml
spring-boot-dependencies/pom.xml
spring-boot-docs/pom.xml
spring-boot-full-build/pom.xml
spring-boot-integration-tests/pom.xml
spring-boot-integration-tests/spring-boot-gradle-tests/pom.xml
spring-boot-integration-tests/spring-boot-security-tests/pom.xml
spring-boot-integration-tests/spring-boot-security-tests/spring-boot-security-tests-web-helloworld/pom.xml
spring-boot-parent/pom.xml
spring-boot-samples/pom.xml
spring-boot-samples/spring-boot-sample-actuator-log4j/pom.xml
spring-boot-samples/spring-boot-sample-actuator-noweb/pom.xml
spring-boot-samples/spring-boot-sample-actuator-ui/pom.xml
spring-boot-samples/spring-boot-sample-actuator/build.gradle
spring-boot-samples/spring-boot-sample-actuator/build.xml
spring-boot-samples/spring-boot-sample-actuator/pom.xml
spring-boot-samples/spring-boot-sample-amqp/pom.xml
spring-boot-samples/spring-boot-sample-aop/pom.xml
spring-boot-samples/spring-boot-sample-batch/pom.xml
spring-boot-samples/spring-boot-sample-data-elasticsearch/pom.xml
spring-boot-samples/spring-boot-sample-data-gemfire/pom.xml
spring-boot-samples/spring-boot-sample-data-jpa/pom.xml
spring-boot-samples/spring-boot-sample-data-mongodb/pom.xml
spring-boot-samples/spring-boot-sample-data-redis/pom.xml
spring-boot-samples/spring-boot-sample-data-rest/pom.xml
spring-boot-samples/spring-boot-sample-data-solr/pom.xml
spring-boot-samples/spring-boot-sample-flyway/pom.xml
spring-boot-samples/spring-boot-sample-hateoas/pom.xml
spring-boot-samples/spring-boot-sample-hornetq/pom.xml
spring-boot-samples/spring-boot-sample-integration/pom.xml
spring-boot-samples/spring-boot-sample-jetty/pom.xml
spring-boot-samples/spring-boot-sample-liquibase/pom.xml
spring-boot-samples/spring-boot-sample-parent-context/pom.xml
spring-boot-samples/spring-boot-sample-profile/build.gradle
spring-boot-samples/spring-boot-sample-profile/pom.xml
spring-boot-samples/spring-boot-sample-secure/pom.xml
spring-boot-samples/spring-boot-sample-servlet/pom.xml
spring-boot-samples/spring-boot-sample-simple/build.gradle
spring-boot-samples/spring-boot-sample-simple/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-jsp/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-multi-connectors/pom.xml
spring-boot-samples/spring-boot-sample-tomcat-ssl/pom.xml
spring-boot-samples/spring-boot-sample-tomcat/pom.xml
spring-boot-samples/spring-boot-sample-traditional/pom.xml
spring-boot-samples/spring-boot-sample-velocity/pom.xml
spring-boot-samples/spring-boot-sample-web-freemarker/pom.xml
spring-boot-samples/spring-boot-sample-web-groovy-templates/pom.xml
spring-boot-samples/spring-boot-sample-web-jsp/pom.xml
spring-boot-samples/spring-boot-sample-web-method-security/pom.xml
spring-boot-samples/spring-boot-sample-web-secure-custom/pom.xml
spring-boot-samples/spring-boot-sample-web-secure-jdbc/pom.xml
spring-boot-samples/spring-boot-sample-web-secure/pom.xml
spring-boot-samples/spring-boot-sample-web-static/build.gradle
spring-boot-samples/spring-boot-sample-web-static/pom.xml
spring-boot-samples/spring-boot-sample-web-ui/build.gradle
spring-boot-samples/spring-boot-sample-web-ui/pom.xml
spring-boot-samples/spring-boot-sample-web-velocity/pom.xml
spring-boot-samples/spring-boot-sample-websocket-tomcat/pom.xml
spring-boot-samples/spring-boot-sample-ws/pom.xml
spring-boot-samples/spring-boot-sample-xml/pom.xml
spring-boot-starters/pom.xml
spring-boot-starters/spring-boot-starter-actuator/pom.xml
spring-boot-starters/spring-boot-starter-amqp/pom.xml
spring-boot-starters/spring-boot-starter-aop/pom.xml
spring-boot-starters/spring-boot-starter-batch/pom.xml
spring-boot-starters/spring-boot-starter-data-elasticsearch/pom.xml
spring-boot-starters/spring-boot-starter-data-gemfire/pom.xml
spring-boot-starters/spring-boot-starter-data-jpa/pom.xml
spring-boot-starters/spring-boot-starter-data-mongodb/pom.xml
spring-boot-starters/spring-boot-starter-data-rest/pom.xml
spring-boot-starters/spring-boot-starter-data-solr/pom.xml
spring-boot-starters/spring-boot-starter-freemarker/pom.xml
spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
spring-boot-starters/spring-boot-starter-hornetq/pom.xml
spring-boot-starters/spring-boot-starter-integration/pom.xml
spring-boot-starters/spring-boot-starter-jdbc/pom.xml
spring-boot-starters/spring-boot-starter-jetty/pom.xml
spring-boot-starters/spring-boot-starter-log4j/pom.xml
spring-boot-starters/spring-boot-starter-logging/pom.xml
spring-boot-starters/spring-boot-starter-mobile/pom.xml
spring-boot-starters/spring-boot-starter-parent/pom.xml
spring-boot-starters/spring-boot-starter-redis/pom.xml
spring-boot-starters/spring-boot-starter-remote-shell/pom.xml
spring-boot-starters/spring-boot-starter-security/pom.xml
spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
spring-boot-starters/spring-boot-starter-test/pom.xml
spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml
spring-boot-starters/spring-boot-starter-tomcat/pom.xml
spring-boot-starters/spring-boot-starter-velocity/pom.xml
spring-boot-starters/spring-boot-starter-web/pom.xml
spring-boot-starters/spring-boot-starter-websocket/pom.xml
spring-boot-starters/spring-boot-starter-ws/pom.xml
spring-boot-starters/spring-boot-starter/pom.xml
spring-boot-tools/pom.xml
spring-boot-tools/spring-boot-dependency-tools/pom.xml
spring-boot-tools/spring-boot-gradle-plugin/pom.xml
spring-boot-tools/spring-boot-loader-tools/pom.xml
spring-boot-tools/spring-boot-loader/pom.xml
spring-boot-tools/spring-boot-maven-plugin/pom.xml
spring-boot-versions/pom.xml
spring-boot/pom.xml
2015-03-30 23:25:53 -07:00
Phillip Webb
42e69359a8
Fixup version numbers following release
2015-03-30 23:25:03 -07:00
Phillip Webb
4b7c62008f
Fixup version numbers following release
2015-03-30 23:24:19 -07:00
Stephane Nicoll
ff7c66c0d2
Fix annotation() javadoc
2015-03-31 08:18:54 +02:00
Spring Buildmaster
e03c11dda8
Next development version
2015-03-30 22:56:20 -07:00
Phillip Webb
cddf54e576
Revert "Upgrade to H2 1.4.186"
...
This reverts commit 3a22443fbb
.
2015-03-30 22:01:01 -07:00
Spring Buildmaster
b8d2a55b30
Next development version
2015-03-30 18:23:16 -07:00
Phillip Webb
5d9efe40d0
Merge branch '1.2.x'
2015-03-30 17:01:08 -07:00
Phillip Webb
495a79c324
Document logging properties with @PropertySource
...
Add a note to the logging documentation to point out a potential gotcha.
Fixes gh-2709
2015-03-30 16:59:33 -07:00
Dave Syer
18afe8bd0c
Fixup incorrect property name
...
The property in XADataSourceAutoConfigurationTests should be
`data-source-class-name`. Previously the `-name` was missing.
2015-03-30 16:45:02 -07:00
Dave Syer
b3d8e32ccf
Fix overlapping property name binding to Maps
...
Update RelaxedDataBinder so that multiple overlapping nested property
names can be bound to a Map.
Prior to this commit, properties of the following form could not be
bound to Maps:
foo: baz
foo.bar: spam
This was due to BeanWrapperImpl throwing an InvalidPropertyException
when binding `map[foo][bar]` because `foo` is already bound to `baz`.
The updated code now detects such cases and instead uses the binding
property `map[foo.bar]`.
Fixes gh-2610
2015-03-30 16:44:00 -07:00
Phillip Webb
fbf34e261e
Polish
2015-03-30 10:37:02 -07:00
Phillip Webb
d07e18143d
Merge branch '1.2.x'
2015-03-30 10:23:13 -07:00
Phillip Webb
e3f203a8a5
Polish
2015-03-30 10:22:54 -07:00
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