Stephane Nicoll
b30d4303d5
Polish contribution
...
Closes gh-8230
2017-02-09 15:54:59 +01:00
Stephane Nicoll
064faf9560
Merge branch '1.5.x'
2017-02-09 10:43:20 +01:00
Stephane Nicoll
aa49468171
Allow to define a custom MessageRecoverer
...
This commit improves `SimpleRabbitListenerContainerFactoryConfigurer` to
use a custom `MessageConverter`. If such a bean is present, it is used
for the default factory that is auto-configured.
Closes gh-8194
2017-02-09 10:43:03 +01:00
Stephane Nicoll
ba05f4012c
Merge branch '1.5.x'
2017-02-08 14:32:58 +01:00
Stephane Nicoll
aff50f6787
Merge branch '1.4.x' into 1.5.x
2017-02-08 14:32:45 +01:00
Kamil Wozniak
f46e3dc9f3
Fix link in doc to Spring Test
...
Closes gh-8226
2017-02-08 14:31:42 +01:00
Stephane Nicoll
a31a792192
Merge branch '1.5.x'
2017-02-07 16:35:59 +01:00
Stephane Nicoll
d42a54e880
Add explicit note about Mockito 2 in the documentation
...
Closes gh-8217
2017-02-07 16:35:16 +01:00
Stephane Nicoll
130e0808d0
Merge branch '1.4.x' into 1.5.x
2017-02-07 16:31:02 +01:00
Stephane Nicoll
570b0593a6
Document SMTP timeout settings
...
Closes gh-8213
2017-02-07 16:22:03 +01:00
Stephane Nicoll
5c663a9ece
Merge branch '1.5.x'
2017-02-01 09:08:33 +01:00
Johnny Lim
846994e498
Polish
...
Closes gh-8148
2017-02-01 09:07:47 +01:00
Stephane Nicoll
d67ce78e8b
Merge branch '1.5.x'
2017-01-24 13:23:06 +01:00
Johnny Lim
e0de28a1f7
Polish
...
Closes gh-8076
2017-01-24 13:22:22 +01: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
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
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
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
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
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
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
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
Phillip Webb
c35454e5f4
Merge branch '1.5.x'
2017-01-05 23:40:58 -08:00
Phillip Webb
554f6c8714
Document LDAP support
...
Add documentation for the LDAP support.
Closes gh-7733
2017-01-05 23:37:12 -08:00
Phillip Webb
6776ec2704
Merge branch '1.5.x'
2017-01-05 11:04:37 -08:00
Phillip Webb
565f75438e
Polish
2017-01-05 11:04:07 -08:00
Dave Syer
21be9ef666
Merge remote-tracking branch 'origin/1.5.x'
2017-01-05 11:59:49 +00:00
Dave Syer
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
Stephane Nicoll
de4e3508f1
Merge branch '1.5.x'
2017-01-04 12:42:40 +01:00
Stephane Nicoll
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
Stephane Nicoll
9a113e3b64
Merge branch '1.5.x'
2017-01-04 10:48:25 +01:00
Stephane Nicoll
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
Stephane Nicoll
576d5dd58f
Merge branch '1.5.x'
2016-12-28 12:10:14 +01:00
Stephane Nicoll
378b53d42b
Merge branch '1.4.x' into 1.5.x
2016-12-28 12:09:13 +01:00
Stephane Nicoll
3389af2c2f
Fix build failure (II)
2016-12-28 12:08:55 +01:00
Stephane Nicoll
6ecb525a57
Fix build failure
2016-12-28 11:52:53 +01:00
Stephane Nicoll
ad3b767b03
Merge branch '1.5.x'
2016-12-28 10:14:53 +01:00
Stephane Nicoll
d2900b8612
Merge branch '1.4.x' into 1.5.x
2016-12-28 10:14:38 +01:00
Stephane Nicoll
a862b6dc79
Polish documentation
...
Closes gh-7771
2016-12-28 10:14:22 +01:00
Stephane Nicoll
7cf08be353
Merge branch '1.5.x'
2016-12-27 17:51:32 +01:00
Stephane Nicoll
435ca3db69
Polish actuator security changes
...
Closes gh-7569
2016-12-27 17:50:10 +01:00
Stephane Nicoll
3fdfc3f052
Merge branch '1.5.x'
2016-12-27 11:12:38 +01:00
Stephane Nicoll
b24c8d04ba
Allow to customize the auto-configured JestClient
...
This commit adds a `HttpClientConfigBuilderCustomizer` to further tune
the auto-configured `JestClient`.
Closes gh-7762
2016-12-27 11:12:23 +01:00
Phillip Webb
8b47561f7e
Merge branch '1.5.x'
2016-12-20 21:56:04 -08:00
Phillip Webb
1f7b3cad45
Polish Kafka properties
...
Closes gh-7672
2016-12-20 18:15:11 -08:00
Gary Russell
bdda470305
Support arbitrary Kafka properties
...
Add support for arbitrary Kafka properties via
`spring.kafka.properties.*` and also a `spring.kafka.max.poll.records`
property.
See gh-7672
2016-12-20 18:14:55 -08:00
Stephane Nicoll
998ff2feee
Merge branch '1.5.x'
2016-12-20 11:59:32 +01:00
Stephane Nicoll
851ce2286f
Allow to override Couchbase's CustomConversions
...
Closes gh-7700
2016-12-20 11:59:16 +01:00
Phillip Webb
1f417997f3
Merge branch '1.5.x'
2016-12-19 13:21:18 -08:00
Phillip Webb
4b9cba351b
Merge branch '1.4.x' into 1.5.x
2016-12-19 12:36:57 -08:00
Phillip Webb
e578ace7d7
Polish doc formatting
2016-12-19 10:29:42 -08:00
Stephane Nicoll
f03da0b4f7
Merge branch '1.5.x'
2016-12-19 16:00:19 +01:00
Stephane Nicoll
9668006aea
Merge branch '1.4.x' into 1.5.x
2016-12-19 16:00:04 +01:00
Stephane Nicoll
3237e4ab3e
Add link between reference and how-to
...
See gh-7652
2016-12-19 15:59:49 +01:00
Andy Wilkinson
943262bb97
Raise the minimum supported version of Hibernate to 5.2.x
...
Closes gh-7586
2016-12-15 21:31:53 +00:00
Stephane Nicoll
0ea3277769
Merge branch '1.5.x'
2016-12-15 09:21:24 +01:00
Stephane Nicoll
0fbe56eabc
Merge branch '1.4.x' into 1.5.x
2016-12-15 09:21:11 +01:00
Stephane Nicoll
c8bdf74327
Expand ConfigurationProperties doc
...
Closes gh-7620
2016-12-15 09:20:24 +01:00
Stephane Nicoll
ede0b0f940
Merge branch '1.5.x'
2016-12-01 14:55:15 +01:00
Stephane Nicoll
c127c1fdf9
Polish doc
...
Closes gh-7381
2016-12-01 14:54:54 +01:00
Stephane Nicoll
2dbebf67e8
Merge branch '1.5.x'
2016-11-30 10:56:14 +01:00
Stephane Nicoll
7c02daabc3
Polish contribution
...
Closes gh-7533
2016-11-30 10:55:32 +01:00
Johnny Lim
c654eff41b
Update doc for spring.data.neo4j.open-in-view
...
See gh-7533
2016-11-30 10:42:18 +01:00
Stephane Nicoll
0568afc6cb
Merge branch '1.5.x'
2016-11-30 08:31:41 +01:00
Johnny Lim
423f8037ce
Polish
...
Closes gh-7530
2016-11-30 08:31:13 +01:00
Stephane Nicoll
2577d79ff1
Merge branch '1.5.x'
2016-11-29 14:54:38 +01:00
Stephane Nicoll
b618c70e52
Add test slice for pure jdbc tests
...
This commit adds `@JdbcTest`, a new test slice for pure jdbc tests. It
provides the same basic features than `@DataJpaTest`.
Closes gh-6563
2016-11-29 14:54:15 +01:00
Andy Wilkinson
4c01e940ea
Merge branch '1.5.x'
2016-11-28 11:33:13 +00:00
Andy Wilkinson
50c39661ad
Merge branch '1.4.x' into 1.5.x
2016-11-28 11:33:00 +00:00
Andy Wilkinson
491bd745de
Document Jersey's package scanning limitations
...
Closes gh-7496
2016-11-28 11:32:48 +00:00
Andy Wilkinson
4a10cfe112
Merge branch '1.5.x'
2016-11-25 10:24:43 +00:00
Phillip Johnson
f64d5303cf
Document and test array support for spring.profiles.*
...
Closes gh-7175
Closes gh-6995
2016-11-25 10:24:14 +00:00
Stephane Nicoll
3bfbbeb9f4
Merge branch '1.5.x'
2016-11-24 17:44:17 +01:00
Stephane Nicoll
22208f6a9e
Auto-configure validation constraints on bean methods
...
This commit auto-configures `MethodValidationPostProcessor` if necessary
when a JSR-303 validator implementation is detected on the classpath.
Closes gh-6228
2016-11-24 17:40:33 +01:00
Phillip Webb
ab3a001286
Merge branch '1.5.x'
2016-11-22 15:49:27 -08:00
Phillip Webb
dc237043b8
Merge branch '1.4.x' into 1.5.x
2016-11-22 15:48:52 -08:00
Phillip Webb
74670cb20f
Allow WebDriver beans to define their own scope
...
Update `WebDriverScope` so that only `WebDriver` beans with no explicit
scope are moved.
Fixes gh-7454
2016-11-22 15:48:28 -08:00
Phillip Webb
e0dfff2b23
Merge branch '1.5.x'
2016-11-22 14:54:17 -08:00