Commit Graph
1868 Commits
Author SHA1 Message Date
Stephane Nicoll 1f164906dc Merge branch '1.5.x' 2017-01-24 09:56:47 +01:00
Stephane Nicoll 4a60de78ff Merge branch '1.4.x' into 1.5.x 2017-01-24 09:56:26 +01:00
Stephane Nicoll 4efa4590f8 Review doc on advanced datasource customization
Closes gh-7652
2017-01-24 09:55:13 +01:00
Phillip Webb 8ffaa54e74 Merge branch '1.5.x' 2017-01-23 23:45:44 -08:00
Phillip Webb 2c89d9918f Relocate AutoConfigurations from root package
Move PropertyPlaceholder and MessageSource auto-configuration from the
root package to the `context` subpackage.

Fixes gh-8071
2017-01-23 17:32:45 -08:00
Andy Wilkinson a7ee2b8e0e Merge branch '1.5.x' 2017-01-23 10:23:13 +00:00
Andy Wilkinson 0067082eac Document a warning about embedded Tomcat and tmpwatch on CentOS
Closes gh-5009
2017-01-23 10:22:51 +00:00
Andy Wilkinson 1f183bd320 Merge branch '1.5.x' 2017-01-23 10:00:50 +00:00
Andy Wilkinson 68fdd49a0b Document payload types of messages sent to metricsChannel
Closes gh-7790
2017-01-23 10:00:42 +00:00
Andy Wilkinson d5a4058862 Merge branch '1.5.x' 2017-01-20 15:45:34 +00:00
Andy Wilkinson bfd319755c Merge branch '1.4.x' into 1.5.x 2017-01-20 15:45:23 +00:00
Andy Wilkinson 0ce7c9516a Document how to configure test- and profile-specific Flyway migrations
Closes gh-2753
2017-01-20 15:44:42 +00:00
Stephane Nicoll 4fe04178b7 Merge branch '1.5.x' 2017-01-20 16:43:21 +01:00
Stephane Nicoll 915c959a28 Polish contribution
Closes gh-7600
2017-01-20 16:40:48 +01:00
Michael J. Simons 8648520876 Add slide test annotation for MongoDB
This commits adds a slice test infrastructure for MongoDB, similar to
what `@DataJpaTest` does with JPA.

By default, an embedded Mongod process is used if available.

See gh-7600
2017-01-20 16:40:47 +01:00
Stephane Nicoll b19d31e067 Use a random port with embedded Mongo by default
This commit improves the logic of the embedded Mongo support to use a
random port if no custom port has been specified. This doesn't change
the default if the embedded support isn't active.

Closes gh-8044
2017-01-20 16:40:06 +01:00
Stephane Nicoll 2b71c22e0b Merge branch '1.5.x' 2017-01-20 10:54:54 +01:00
Stephane Nicoll bed545df64 Merge branch '1.4.x' into 1.5.x 2017-01-20 10:54:32 +01:00
Stephane Nicoll 2c5c539bf1 Document automatic scheduling of metrics export
Closes gh-8040
2017-01-20 10:52:55 +01:00
Stephane Nicoll 7253bb334c Merge branch '1.5.x' 2017-01-19 16:47:21 +01:00
Stephane Nicoll e5e497ec3a Document @ImportAutoConfiguration#exclude
Closes gh-7862
2017-01-19 16:47:07 +01:00
Stephane Nicoll 43a4f0d49e Merge branch '1.5.x' 2017-01-19 16:20:09 +01:00
Stephane Nicoll ecafd384b7 Merge branch '1.4.x' into 1.5.x 2017-01-19 16:19:53 +01:00
Michael J. Simons a852c49edd Fix closing parentheses
Closes gh-8030
2017-01-19 16:19:07 +01:00
Stephane Nicoll c54070d142 Merge branch '1.5.x' 2017-01-19 13:19:36 +01:00
Stephane Nicoll c41ff17dd7 Provide relevant default values for Enums
This commits adds manual metadata for enums that have a default value
since the annotation processor is not able to detect that yet.

Closes gh-7890
2017-01-19 13:19:13 +01:00
Phillip Webb 5502fa2936 Merge branch '1.5.x' 2017-01-18 21:05:22 -08:00
Phillip Webb 10dbf3c571 Use @Validated as trigger for JSR-330 validation
Update `ConfigurationPropertiesBindingPostProcessor` so that
`@Validated` is expected to be used to trigger JSR-330 validation.

Any existing configuration classes that use JSR-330 annotations but
don't have `@Validated` will currently still be validated, but will
now log a warning. This should give users a chance to add the requested
annotations before the next Spring Boot release where we will use them
as the exclusive signal that validation is required.

Closes gh-7579
2017-01-18 21:01:07 -08:00
Andy Wilkinson aba09cce73 Merge branch '1.5.x' 2017-01-18 14:25:09 +00:00
Alessandro Falappa ec537b307e Make start/stop run-levels configurable in INIT-INFO of launch.script
See gh-7008
Closes gh-7902
2017-01-18 14:24:29 +00:00
Andy Wilkinson 14e24462f2 Merge branch '1.5.x' 2017-01-17 15:00:06 +00:00
Andy Wilkinson 7fa33cddd7 Merge branch '1.4.x' into 1.5.x 2017-01-17 15:00:01 +00:00
Andy Wilkinson a02c2d4155 Improve the documentation of Health.Status constants
Closes gh-7784
2017-01-17 14:59:53 +00:00
Andy Wilkinson 4b35091b3c Merge branch '1.5.x' 2017-01-17 14:44:49 +00:00
Andy Wilkinson d76e1ef95e Merge branch '1.4.x' into 1.5.x 2017-01-17 14:44:43 +00:00
Andy Wilkinson 9695e0a9d1 Document breakpoint config for remote debug tunnel and IntelliJ IDEA
Closes gh-7732
See gh-5047
2017-01-17 14:43:38 +00:00
Andy Wilkinson 5d84c4246b Merge branch '1.5.x' 2017-01-17 14:25:43 +00:00
Andy Wilkinson c71abbf6cd Merge branch '1.4.x' into 1.5.x 2017-01-17 14:25:33 +00:00
Andy Wilkinson 0463350d2e Document that spring(Profile|Property) cannot be used with scan=true
Closes gh-5611
2017-01-17 14:23:43 +00:00
Stephane Nicoll f4f5a70cb2 Merge branch '1.5.x' 2017-01-17 09:57:53 +01:00
Johnny Lim acc36c076d Polish
See gh-8004
2017-01-17 09:53:50 +01:00
Stephane Nicoll f714b1d4be Merge branch '1.5.x' 2017-01-16 16:09:48 +01:00
Stephane Nicoll ada441bccc Allow custom override of user info OAuth2RestTemplate
Closes gh-5996
2017-01-16 16:09:32 +01:00
Stephane Nicoll a9399639a0 Merge branch '1.5.x' 2017-01-16 11:25:39 +01:00
Stephane Nicoll 8bef0a1e60 Polish contribution
Closes gh-7905
2017-01-16 11:24:36 +01:00
Stephane Nicoll 87cf236aae Merge branch '1.5.x' 2017-01-16 10:41:56 +01:00
Stephane Nicoll 3e05329fd7 Order internal RepositoryRestConfigurer
This commit provides an order of zero for the RepositoryRestConfigurer
that is used internally to configure the `RepositoryRestConfiguration`. In
practice, an unordered `RepositoryRestConfigurer` will run after ours.

Closes gh-7981
2017-01-16 10:41:44 +01:00
Andy Wilkinson d477223d77 Merge branch '1.5.x' 2017-01-16 04:01:03 -05:00
Andy Wilkinson 89e3335ca1 Merge branch '1.4.x' into 1.5.x 2017-01-16 04:00:39 -05:00
Stephane Nicoll cf30703fbe Merge branch '1.5.x' 2017-01-16 09:50:42 +01:00