a31a792192
Merge branch '1.5.x'
2017-02-07 16:35:59 +01:00
d42a54e880
Add explicit note about Mockito 2 in the documentation
...
Closes gh-8217
2017-02-07 16:35:16 +01:00
130e0808d0
Merge branch '1.4.x' into 1.5.x
2017-02-07 16:31:02 +01:00
570b0593a6
Document SMTP timeout settings
...
Closes gh-8213
2017-02-07 16:22:03 +01:00
5c663a9ece
Merge branch '1.5.x'
2017-02-01 09:08:33 +01:00
846994e498
Polish
...
Closes gh-8148
2017-02-01 09:07:47 +01:00
d67ce78e8b
Merge branch '1.5.x'
2017-01-24 13:23:06 +01:00
e0de28a1f7
Polish
...
Closes gh-8076
2017-01-24 13:22:22 +01: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
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
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
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
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
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
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
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
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
6776ec2704
Merge branch '1.5.x'
2017-01-05 11:04:37 -08:00
565f75438e
Polish
2017-01-05 11:04:07 -08: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
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
576d5dd58f
Merge branch '1.5.x'
2016-12-28 12:10:14 +01:00
378b53d42b
Merge branch '1.4.x' into 1.5.x
2016-12-28 12:09:13 +01:00
Stephane Nicoll
Johnny Lim
Andy Wilkinson
Michael J. Simons
Phillip Webb
Vedran Pavic
drumonii
Kazuki Shimizu
Dave Syer