4444 Commits (0f62f05cdcf9913bb1cee3841d90378b92b77e33)

 

All Branches   

Search

Author	SHA1	Message	Date
Andy Wilkinson	507520aab9	Merge branch '1.2.x'	10 years ago
Andy Wilkinson	5547f91bfb	Correct name of check-template-location property in error message ... Closes gh-2788	10 years ago
Andy Wilkinson	a9adb85333	Merge branch '1.2.x'	10 years ago
Andy Wilkinson	0141f50ec8	Wait for stream reading threads to finish when awaiting CLI invocation ... Closes gh-2787 (I hope)	10 years ago
Andy Wilkinson	bbaf585dd0	Merge branch '1.2.x'	10 years ago
Andy Wilkinson	83f842a226	Reinstate support for relaxed binding for endpoint enablement ... This commit improves upon the changes made in a8bf9d3 by adding support for relaxed binding of the endpoints.enabled and endpoints.<name>.enabled properties. This is achieved by replacing use of @ConditionalOnExpression (which does not support relaxed binding) with a custom condition implementation that uses RelaxedPropertyResolver. Closes gh-2767	10 years ago
Phillip Webb	c4ddce6b73	Polish	10 years ago
Andy Wilkinson	8b1022effa	Upgrade to Spring Batch 3.0.4 snapshots ... Closes gh-2712	10 years ago
Andy Wilkinson	c51277f6eb	Merge branch '1.2.x'	10 years ago
izeye	d8f45ab6ca	Document MultipartProperties ... Closes gh-2779	10 years ago
Andy Wilkinson	fa4562f408	Polishing: spaces -> tabs	10 years ago
Andy Wilkinson	5e3aab5153	Merge branch '1.2.x'	10 years ago
Andy Wilkinson	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	10 years ago
Stephane Nicoll	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	10 years ago
Andy Wilkinson	a69cd36dbc	Merge branch '1.2.x'	10 years ago
Andy Wilkinson	d4ffab2f02	Provide additional config metadata for spring.http.gzip.enabled ... See gh-2776	10 years ago
Andy Wilkinson	3df6cb1325	Merge branch '1.2.x'	10 years ago
Andy Wilkinson	e0d6ebca93	Merge branch '1.2.x' ... Conflicts: spring-boot-dependencies/pom.xml	10 years ago
Andy Wilkinson	212520fa15	Add a property to disable auto-configuration of GzipFilter ... Closes gh-2776	10 years ago
Andy Wilkinson	c8c2eea03e	Upgrade to Spring Integration 4.1.3.RELEASE ... Closes gh-2782	10 years ago
Andy Wilkinson	23da4ab95d	Update to Spring AMQP 1.4.4.RELEASE ... Closes gh-2781	10 years ago
Andy Wilkinson	ddeebf2262	Update to Tomcat 8.0.21 ... Closes gh-2775	10 years ago
Phillip Webb	e2c47ba64a	Fix failing Windows CI build ... Update SpringBootMockServletContextTests to URL escape file paths. Fixes gh-2771	10 years ago
Phillip Webb	5635211801	Add assertions to help debug Windows CI issues	10 years ago
Phillip Webb	718a090b32	Restore Java 6 source/target settings ... Update spring-boot-actuator to restore Java 6 compatibility.	10 years ago
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	10 years ago
Phillip Webb	59692cd938	Polish formatting	10 years ago
Dave Syer	5789665447	Update .travis.yml for jdk8	10 years ago
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	10 years ago
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	10 years ago
Stephane Nicoll	b586bce3b7	Merge pull request #2769 from eddumelendez/gh-2768 ... * gh-2768: Add missing type check on EhCacheCacheConfiguration	10 years ago
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	10 years ago
Stephane Nicoll	22b1ffd9af	Merge branch '1.2.x'	10 years ago
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	10 years ago
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	10 years ago
Stephane Nicoll	9f1475d708	Fix wrong import in Guava auto-config ... Remove the need for `commons-collections` See gh-2633	10 years ago
Stephane Nicoll	24d9afa67b	Fix wrong import in JCache auto-config ... Remove the need for `commons-collections` See gh-2633	10 years ago
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	10 years ago
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	10 years ago
Phillip Webb	42e69359a8	Fixup version numbers following release	10 years ago
Phillip Webb	4b7c62008f	Fixup version numbers following release	10 years ago
Stephane Nicoll	ff7c66c0d2	Fix annotation() javadoc	10 years ago
Spring Buildmaster	e03c11dda8	Next development version	10 years ago
Phillip Webb	cddf54e576	Revert "Upgrade to H2 1.4.186" ... This reverts commit 3a22443fbb.	10 years ago
Spring Buildmaster	b8d2a55b30	Next development version	10 years ago
Phillip Webb	5d9efe40d0	Merge branch '1.2.x'	10 years ago
Phillip Webb	495a79c324	Document logging properties with @PropertySource ... Add a note to the logging documentation to point out a potential gotcha. Fixes gh-2709	10 years ago
Dave Syer	18afe8bd0c	Fixup incorrect property name ... The property in XADataSourceAutoConfigurationTests should be `data-source-class-name`. Previously the `-name` was missing.	10 years ago
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	10 years ago
Phillip Webb	fbf34e261e	Polish	10 years ago