e0de28a1f7
Polish
...
Closes gh-8076
2017-01-24 13:22:22 +01:00
1f164906dc
Merge branch '1.5.x'
2017-01-24 09:56:47 +01:00
4a60de78ff
Merge branch '1.4.x' into 1.5.x
2017-01-24 09:56:26 +01:00
4efa4590f8
Review doc on advanced datasource customization
...
Closes gh-7652
2017-01-24 09:55:13 +01:00
8ffaa54e74
Merge branch '1.5.x'
2017-01-23 23:45:44 -08:00
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
a7ee2b8e0e
Merge branch '1.5.x'
2017-01-23 10:23:13 +00:00
0067082eac
Document a warning about embedded Tomcat and tmpwatch on CentOS
...
Closes gh-5009
2017-01-23 10:22:51 +00:00
1f183bd320
Merge branch '1.5.x'
2017-01-23 10:00:50 +00:00
68fdd49a0b
Document payload types of messages sent to metricsChannel
...
Closes gh-7790
2017-01-23 10:00:42 +00:00
d5a4058862
Merge branch '1.5.x'
2017-01-20 15:45:34 +00:00
bfd319755c
Merge branch '1.4.x' into 1.5.x
2017-01-20 15:45:23 +00:00
0ce7c9516a
Document how to configure test- and profile-specific Flyway migrations
...
Closes gh-2753
2017-01-20 15:44:42 +00:00
4fe04178b7
Merge branch '1.5.x'
2017-01-20 16:43:21 +01:00
915c959a28
Polish contribution
...
Closes gh-7600
2017-01-20 16:40:48 +01:00
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
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
2b71c22e0b
Merge branch '1.5.x'
2017-01-20 10:54:54 +01:00
bed545df64
Merge branch '1.4.x' into 1.5.x
2017-01-20 10:54:32 +01:00
2c5c539bf1
Document automatic scheduling of metrics export
...
Closes gh-8040
2017-01-20 10:52:55 +01:00
7253bb334c
Merge branch '1.5.x'
2017-01-19 16:47:21 +01:00
e5e497ec3a
Document `@ImportAutoConfiguration#exclude`
...
Closes gh-7862
2017-01-19 16:47:07 +01:00
43a4f0d49e
Merge branch '1.5.x'
2017-01-19 16:20:09 +01:00
ecafd384b7
Merge branch '1.4.x' into 1.5.x
2017-01-19 16:19:53 +01:00
a852c49edd
Fix closing parentheses
...
Closes gh-8030
2017-01-19 16:19:07 +01:00
c54070d142
Merge branch '1.5.x'
2017-01-19 13:19:36 +01:00
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
5502fa2936
Merge branch '1.5.x'
2017-01-18 21:05:22 -08:00
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
aba09cce73
Merge branch '1.5.x'
2017-01-18 14:25:09 +00:00
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
14e24462f2
Merge branch '1.5.x'
2017-01-17 15:00:06 +00:00
7fa33cddd7
Merge branch '1.4.x' into 1.5.x
2017-01-17 15:00:01 +00:00
a02c2d4155
Improve the documentation of Health.Status constants
...
Closes gh-7784
2017-01-17 14:59:53 +00:00
4b35091b3c
Merge branch '1.5.x'
2017-01-17 14:44:49 +00:00
d76e1ef95e
Merge branch '1.4.x' into 1.5.x
2017-01-17 14:44:43 +00:00
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
5d84c4246b
Merge branch '1.5.x'
2017-01-17 14:25:43 +00:00
c71abbf6cd
Merge branch '1.4.x' into 1.5.x
2017-01-17 14:25:33 +00:00
0463350d2e
Document that spring(Profile|Property) cannot be used with scan=true
...
Closes gh-5611
2017-01-17 14:23:43 +00:00
f4f5a70cb2
Merge branch '1.5.x'
2017-01-17 09:57:53 +01:00
acc36c076d
Polish
...
See gh-8004
2017-01-17 09:53:50 +01:00
f714b1d4be
Merge branch '1.5.x'
2017-01-16 16:09:48 +01:00
ada441bccc
Allow custom override of user info OAuth2RestTemplate
...
Closes gh-5996
2017-01-16 16:09:32 +01:00
a9399639a0
Merge branch '1.5.x'
2017-01-16 11:25:39 +01:00
8bef0a1e60
Polish contribution
...
Closes gh-7905
2017-01-16 11:24:36 +01:00
87cf236aae
Merge branch '1.5.x'
2017-01-16 10:41:56 +01:00
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
d477223d77
Merge branch '1.5.x'
2017-01-16 04:01:03 -05:00
89e3335ca1
Merge branch '1.4.x' into 1.5.x
2017-01-16 04:00:39 -05:00
cf30703fbe
Merge branch '1.5.x'
2017-01-16 09:50:42 +01:00
caa9cdcc02
Fix Neo4j session documentation
...
Closes gh-7994
2017-01-16 09:50:12 +01:00
a7fce6b048
Document use of `OpenEntityManagerInViewInterceptor`
...
Closes gh-7993
2017-01-16 09:45:32 +01:00
ae3434ba4c
Merge branch '1.4.x' into 1.5.x
2017-01-13 18:45:50 -05:00
3c35066ed5
Merge branch '1.5.x'
2017-01-13 15:40:53 -05:00
426435f4af
Merge branch '1.4.x' into 1.5.x
2017-01-13 15:40:11 -05:00
5898a17807
Merge branch '1.5.x'
2017-01-10 09:30:21 -05:00
766816f600
Merge branch '1.4.x' into 1.5.x
2017-01-10 09:30:09 -05:00
bb5819b879
Fix configure a datasource reference doc link
...
Closes gh-7911
2017-01-10 09:29:35 -05:00
ce2256d7dc
Merge branch '1.5.x'
2017-01-10 09:13:37 -05:00
db56e1cd00
Merge branch '1.4.x' into 1.5.x
2017-01-10 09:13:27 -05:00
3c291150d6
Update springloaded version to 1.2.6.RELEASE in Maven-related docs
...
Closes gh-7937
2017-01-10 09:13:00 -05:00
891045880d
Merge branch '1.5.x'
2017-01-10 09:10:36 -05:00
8934dfaecf
Merge branch '1.4.x' into 1.5.x
2017-01-10 09:10:26 -05:00
ddca9a1687
Update springloaded version to 1.2.6.RELEASE in Gradle-related docs
...
Closes gh-7937
2017-01-10 09:08:35 -05:00
a2bd186a78
Merge branch '1.5.x'
2017-01-09 14:09:55 -05:00
0401ba8429
Fix heading level for kafka docs
...
Closes gh-7915
2017-01-09 14:08:54 -05:00
d039e4a94f
Merge branch '1.5.x'
2017-01-08 09:05:54 +01:00
49828d9377
Merge branch '1.4.x' into 1.5.x
2017-01-08 09:05:27 +01:00
b9eda3f26b
Document favicon support
...
Closes gh-7903
2017-01-08 09:04:53 +01:00
9afa52c18f
Merge branch '1.5.x'
2017-01-06 12:45:20 +01:00
4523927e28
Polish
2017-01-06 12:44:32 +01:00
dbb9a1bd20
Merge branch '1.5.x'
2017-01-06 10:13:20 +01:00
7a75fb0f38
Fix test-specific configuration metadata
...
Most of the config keys defined by the `spring-boot-test-autoconfigure`
module can't be overridden because they are mapped with `@PropertyMapping`
on an annotation. It is confusing that such keys are exposed in content
assistance as using them will have no effect.
This commit removes the annotation processor from the build so that the
`@ConfigurationProperties` beans aren't processed anymore. Instead, manual
metadata is written for the two only keys that are effectively used in
regular configuration.
As a result, the `additional-spring-configuration-metadata` file has been
renamed to `spring-configuration-metadata` since nothing is processing it
anymore.
Closes gh-7887
2017-01-06 10:12:57 +01:00
c35454e5f4
Merge branch '1.5.x'
2017-01-05 23:40:58 -08:00
554f6c8714
Document LDAP support
...
Add documentation for the LDAP support.
Closes gh-7733
2017-01-05 23:37:12 -08:00
10de30ff11
Polish LDAP contribution
...
See gh-7733
2017-01-05 23:35:43 -08:00
6a84c369fd
Add LDAP auto-configuration support
...
Add auto-configuration support for spring-ldap and spring-data-ldap.
See gh-2645
See gh-7733
2017-01-05 23:34:50 -08:00
6776ec2704
Merge branch '1.5.x'
2017-01-05 11:04:37 -08:00
565f75438e
Polish
2017-01-05 11:04:07 -08:00
66a9d4e744
Merge branch '1.5.x'
2017-01-05 16:32:10 +01:00
615804ff34
Polish configuration keys documentation
2017-01-05 16:19:12 +01:00
21be9ef666
Merge remote-tracking branch 'origin/1.5.x'
2017-01-05 11:59:49 +00:00
fe344df9c5
Change default order of OAuth2 resource server filter chain
...
The default is now SecurityProperties.ACCESS_OVERRIDE_ORDER-1
(instead of 3), and the user can set it with
security.oauth2.resource.filter-order (as opposed to being hard
coded). The filter is provided by Spring OAuth2 so this change is
a BeanPostProcessor to call a setter on that object.
Fixes gh-5072
2017-01-05 11:58:36 +00:00
0cfc32e5a1
Merge branch '1.5.x'
2017-01-05 12:25:19 +01:00
6eea679535
Add `LoggersEndpoint` to application properties appendix
...
Closes gh-7877
2017-01-05 12:24:48 +01:00
de4e3508f1
Merge branch '1.5.x'
2017-01-04 12:42:40 +01:00
0a26a4146b
Make `spring.session.store-type` mandatory
...
This commit removes the automatic enabling of Redis as the Spring Session
store when it is available. This case is covered by a warning in `1.4.x`
that this commit removes as well.
Closes gh-7858
2017-01-04 12:42:04 +01:00
9a113e3b64
Merge branch '1.5.x'
2017-01-04 10:48:25 +01:00
bf7271afa5
Upgrade to Couchbase Cache Client 2.1.0
...
As of 2.1 cache expiration times are to be set in seconds. This commit
migrates to the new method, yet keeping the milliseconds unit.
Closes gh-7824
2017-01-04 10:46:17 +01:00
2ea7187165
Add a note that CRaSH support will be removed in documentation
...
Closes gh-7856
2017-01-04 10:10:15 +01:00
506f6497c0
Merge branch '1.5.x'
2017-01-04 09:56:19 +01:00
f915ae197a
Polish
2017-01-04 09:53:45 +01:00
24f5125a8b
Merge branch '1.5.x'
2017-01-03 19:01:17 -08:00
f8a53cf775
Update actuator security documentation
...
Update documentation to align with the new role based method.
See gh-6889
2017-01-03 18:01:32 -08:00
7c51941578
Document Cloud Foundry actuator endpoint support
...
Add a Cloud Foundry specific section to "Production Ready Features".
See gh-7108
2017-01-03 17:27:14 -08:00
2fe4d60b47
Add `management.cloudfoundry.*` meta-data
...
Update configuration meta-data and appendix to include
`management.cloudfoundry.*` meta-data.
See gh-7108
2017-01-03 17:24:58 -08:00
18dcf31aa6
Polish documentation formatting
2017-01-03 17:24:37 -08:00
85f176da08
Merge branch '1.5.x'
2017-01-03 11:39:33 +01:00
fe89af5e82
Polish contribution
...
Closes gh-7796
2017-01-03 11:33:57 +01:00
Johnny Lim
Stephane Nicoll
Phillip Webb
Andy Wilkinson
Michael J. Simons
Alessandro Falappa
Vedran Pavic
drumonii
Kazuki Shimizu
Eddú Meléndez
Dave Syer