bbaf585dd0
Merge branch '1.2.x'
2015-04-08 11:33:05 +01:00
83f842a226
Reinstate support for relaxed binding for endpoint enablement
...
This commit improves upon the changes made in a8bf9d3
2015-04-08 11:29:41 +01:00
c4ddce6b73
Polish
2015-04-07 13:14:21 -07:00
8b1022effa
Upgrade to Spring Batch 3.0.4 snapshots
...
Closes gh-2712
2015-04-07 18:47:28 +01:00
c51277f6eb
Merge branch '1.2.x'
2015-04-07 17:49:42 +01:00
d8f45ab6ca
Document MultipartProperties
...
Closes gh-2779
2015-04-07 17:49:15 +01:00
fa4562f408
Polishing: spaces -> tabs
2015-04-07 17:48:40 +01:00
5e3aab5153
Merge branch '1.2.x'
2015-04-07 17:43:12 +01:00
a8bf9d34d5
Honour endpoint.enabled:false for nested paths
...
Previously, only invocations of /metricName/ would honour the enabled
property and return a not found (404) response. For endpoints which
support nested paths, access to /metricName/foo would ignore the enabled
flag and return an OK (200) response. Furthermore, there was a comment
in EndpointMvcAdapter that suggested that an endpoint shouldn’t be
called when it is disabled, however this was not the case.
This commit updates EndpointWebMvcAutoConfiguration and
JolokiaAutoConfiguration to only register their MvcEndpoint beans if
the underlying endpoint is enabled. This means that an
EndpointMvcAdapter should not be called if its delegate is disabled,
making the comment described above accurate.
The check for the delegate being enabled has been retained so as not to
rely upon the auto-configurations’ behaviour. The methods which handle
nested paths (MetricsMvcEndpoint.value() and
EnvironmentMvcEndpoint.value()) have been updated to add the same check
for the enablement of their delegate.
Fixes gh-2767
2015-04-07 17:43:02 +01:00
0fc54b7c5b
Add ConditionalOnSingleCandidate
...
Add a new ConditionalOnSingleCandidate condition that determines if the
condition should match only if autowiring by type is guaranteed to
succeed. Used by auto-configuration that relies on a single candidate of
a given type (for instance, the JdbcTemplate auto-configuration relies on
the presence of a DataSource).
Such wiring by type will succeed if only one bean of that type is present
or if one matching instance is flagged "primary" amongst the candidates.
ConditionalOnSingleCandidate is a basic version of ConditionalOnBean that
only accepts a single type and does not determine a defaut based on its
presence on a bean definition.
Closes gh-1702
2015-04-07 16:20:55 +02:00
a69cd36dbc
Merge branch '1.2.x'
2015-04-07 11:40:41 +01:00
d4ffab2f02
Provide additional config metadata for spring.http.gzip.enabled
...
See gh-2776
2015-04-07 11:40:05 +01:00
3df6cb1325
Merge branch '1.2.x'
2015-04-07 11:37:43 +01:00
e0d6ebca93
Merge branch '1.2.x'
...
Conflicts:
spring-boot-dependencies/pom.xml
2015-04-07 11:36:40 +01:00
212520fa15
Add a property to disable auto-configuration of GzipFilter
...
Closes gh-2776
2015-04-07 11:24:24 +01:00
c8c2eea03e
Upgrade to Spring Integration 4.1.3.RELEASE
...
Closes gh-2782
2015-04-07 11:04:22 +01:00
23da4ab95d
Update to Spring AMQP 1.4.4.RELEASE
...
Closes gh-2781
2015-04-07 11:03:46 +01:00
ddeebf2262
Update to Tomcat 8.0.21
...
Closes gh-2775
2015-04-07 11:01:19 +01:00
e2c47ba64a
Fix failing Windows CI build
...
Update SpringBootMockServletContextTests to URL escape file paths.
Fixes gh-2771
2015-04-06 22:15:56 -07:00
5635211801
Add assertions to help debug Windows CI issues
2015-04-06 21:19:07 -07:00
718a090b32
Restore Java 6 source/target settings
...
Update spring-boot-actuator to restore Java 6 compatibility.
2015-04-06 20:30:37 -07:00
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
59692cd938
Polish formatting
2015-04-06 18:03:59 -07:00
5789665447
Update .travis.yml for jdk8
2015-04-06 10:18:06 +01:00
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
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
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
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
22b1ffd9af
Merge branch '1.2.x'
2015-04-03 10:31:37 +02:00
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
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
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
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
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
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
42e69359a8
Fixup version numbers following release
2015-03-30 23:25:03 -07:00
4b7c62008f
Fixup version numbers following release
2015-03-30 23:24:19 -07:00
ff7c66c0d2
Fix annotation() javadoc
2015-03-31 08:18:54 +02:00
e03c11dda8
Next development version
2015-03-30 22:56:20 -07:00
cddf54e576
Revert "Upgrade to H2 1.4.186"
...
This reverts commit 3a22443fbb
2015-03-30 22:01:01 -07:00
b8d2a55b30
Next development version
2015-03-30 18:23:16 -07:00
5d9efe40d0
Merge branch '1.2.x'
2015-03-30 17:01:08 -07:00
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
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
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
fbf34e261e
Polish
2015-03-30 10:37:02 -07:00
d07e18143d
Merge branch '1.2.x'
2015-03-30 10:23:13 -07:00
e3f203a8a5
Polish
2015-03-30 10:22:54 -07:00
441beee2fa
Merge branch '1.1.x' into 1.2.x
2015-03-30 10:07:26 -07:00
cbf82c4793
Fix typo in gradle plugin documentation
...
(cherry-picked from commit 99f1c7b
2015-03-30 10:06:39 -07:00
Andy Wilkinson
Phillip Webb
izeye
Stephane Nicoll
Dave Syer
Eddú Meléndez
Spring Buildmaster
Marcin Zajączkowski