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
Vedran Pavic
caa9cdcc02
Fix Neo4j session documentation
...
Closes gh-7994
2017-01-16 09:50:12 +01:00
Vedran Pavic
a7fce6b048
Document use of OpenEntityManagerInViewInterceptor
...
Closes gh-7993
2017-01-16 09:45:32 +01:00
Andy Wilkinson
ae3434ba4c
Merge branch '1.4.x' into 1.5.x
2017-01-13 18:45:50 -05:00
Andy Wilkinson
3c35066ed5
Merge branch '1.5.x'
2017-01-13 15:40:53 -05:00
Andy Wilkinson
426435f4af
Merge branch '1.4.x' into 1.5.x
2017-01-13 15:40:11 -05:00
Stephane Nicoll
5898a17807
Merge branch '1.5.x'
2017-01-10 09:30:21 -05:00
Stephane Nicoll
766816f600
Merge branch '1.4.x' into 1.5.x
2017-01-10 09:30:09 -05:00
drumonii
bb5819b879
Fix configure a datasource reference doc link
...
Closes gh-7911
2017-01-10 09:29:35 -05:00
Andy Wilkinson
ce2256d7dc
Merge branch '1.5.x'
2017-01-10 09:13:37 -05:00
Andy Wilkinson
db56e1cd00
Merge branch '1.4.x' into 1.5.x
2017-01-10 09:13:27 -05:00
Michael J. Simons
3c291150d6
Update springloaded version to 1.2.6.RELEASE in Maven-related docs
...
Closes gh-7937
2017-01-10 09:13:00 -05:00
Andy Wilkinson
891045880d
Merge branch '1.5.x'
2017-01-10 09:10:36 -05:00
Andy Wilkinson
8934dfaecf
Merge branch '1.4.x' into 1.5.x
2017-01-10 09:10:26 -05:00
Michael J. Simons
ddca9a1687
Update springloaded version to 1.2.6.RELEASE in Gradle-related docs
...
Closes gh-7937
2017-01-10 09:08:35 -05:00
Stephane Nicoll
a2bd186a78
Merge branch '1.5.x'
2017-01-09 14:09:55 -05:00
Kazuki Shimizu
0401ba8429
Fix heading level for kafka docs
...
Closes gh-7915
2017-01-09 14:08:54 -05:00
Stephane Nicoll
d039e4a94f
Merge branch '1.5.x'
2017-01-08 09:05:54 +01:00
Stephane Nicoll
49828d9377
Merge branch '1.4.x' into 1.5.x
2017-01-08 09:05:27 +01:00
Stephane Nicoll
b9eda3f26b
Document favicon support
...
Closes gh-7903
2017-01-08 09:04:53 +01:00
