2bdbe343df
Merge branch '1.5.x'
2017-04-10 16:14:13 +02:00
a132bd141f
Merge branch '1.4.x' into 1.5.x
2017-04-10 16:13:53 +02:00
0a55e3e736
Polish "Clarify edge case docs on ConditionalOnClass"
...
Closes gh-8185
2017-04-10 16:12:11 +02:00
08f8219248
Clarify edge case docs on ConditionalOnClass
...
When used as a meta-annotation the value() attribute of
@ConditionalOnClass will fail silently resulting in the @Conditional
nature of the annotation being ignored.
See gh-8185
2017-04-10 15:58:17 +02:00
b099471df3
Merge branch '1.5.x'
2017-04-10 15:54:53 +02:00
2d930fd653
Merge branch '1.4.x' into 1.5.x
2017-04-10 15:54:34 +02:00
a8860ba7e9
Clarify use of `@TestConfiguration`
...
As `@TestComponent` is an implementation detail at this point really, this
commit removes any reference to it from the doc.
Closes gh-8421
2017-04-10 15:54:08 +02:00
2d169d526a
Merge branch '1.5.x'
2017-04-07 10:05:40 +02:00
fffb53ccf5
Fix neo4j embedded documentation
...
The neo4j embedded driver no longer embeds the neo4j kernel and users are
expected to add that dependency manually. We don't provide dependency
management for any of them so this commit updates the documentation to
refers to the official documentation.
Closes gh-8567
2017-04-07 10:04:41 +02:00
b08016f15a
Polish "Add @DataNeo4jTest" contribution
...
Closes gh-8618
2017-04-02 12:38:24 +02:00
2fd51dd8a1
Upgrade to Spring REST Docs 1.2.0.RC1
...
Closes gh-8716
2017-03-24 21:12:21 +00:00
2f8f400a63
Merge branch '1.5.x'
2017-03-17 09:58:09 +01:00
84dea5264f
Merge branch '1.4.x' into 1.5.x
2017-03-17 09:57:52 +01:00
0ca07fbdc3
Polish contribution
...
Closes gh-8594
2017-03-17 09:56:45 +01:00
36b28540ee
Fix invalid security example in doc
...
Closes gh-8580
2017-03-17 09:51:08 +01:00
883dd5802b
Merge branch '1.5.x'
2017-03-15 14:52:37 +01:00
cc79f6d83d
Merge branch '1.4.x' into 1.5.x
2017-03-15 14:52:19 +01:00
f72e0c08df
Add a note to ActiveMQ pooling in the doc
...
Closes gh-8598
2017-03-15 14:51:55 +01:00
1b395ddd9d
Merge branch '1.5.x'
2017-03-15 08:57:42 +01:00
6be2cc30d3
Merge branch '1.4.x' into 1.5.x
2017-03-15 08:54:21 +01:00
bc157d5b4f
Polish
...
See gh-8621
2017-03-15 08:50:50 +01:00
68ef19b69b
Merge branch '1.5.x'
2017-03-09 18:31:08 +01:00
207ab3ecb4
Merge branch '1.4.x' into 1.5.x
2017-03-09 18:21:40 +01:00
07c56c60ba
Make sure Hazelcast bootstraps before any JCache setup
...
This commit makes sure that if a `javax.cache.CacheManager` is required,
an auto-configured `HazelcastInstance` is fully resolved first. This
prevents the case where the JCache bootstrap actually starts an instance
early, followed by a second (potentially unwanted) instance created by the
regular auto-configuration.
Since the JCache implementation works with an `HazelcastInstance` behind
the scenes, if there is one `HazelcastInstance` configured and it has a
name, then we configure the `CacheProvider` to use that. Future Hazelcast
version will allow to pass the instance directly (i.e. not requiring an
actual name).
Closes gh-8484
2017-03-09 17:59:20 +01:00
d811b5fb1d
Merge branch '1.5.x'
2017-03-03 10:31:26 +01:00
bb8800a625
Deprecate spring.cache.hazelcast.config
...
The additional configuration for an `HazelcastInstance` will be removed
in 2.0. This commit makes sure that the property is deprecated in 1.5
See gh-8470
2017-03-03 10:30:06 +01:00
91009cfc01
Merge branch '1.5.x'
2017-02-20 14:04:55 +01:00
43a534f4ca
Polish contribution
...
Closes gh-8195
2017-02-20 14:03:07 +01:00
3c956441b5
Merge branch '1.5.x'
2017-02-17 10:33:08 +01:00
121ab0a71e
Merge branch '1.4.x' into 1.5.x
2017-02-17 10:32:49 +01:00
1c8f1c709c
Fix audit events related documentation
...
Closes gh-8319
2017-02-17 10:30:07 +01:00
b30d4303d5
Polish contribution
...
Closes gh-8230
2017-02-09 15:54:59 +01:00
064faf9560
Merge branch '1.5.x'
2017-02-09 10:43:20 +01:00
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
ba05f4012c
Merge branch '1.5.x'
2017-02-08 14:32:58 +01:00
aff50f6787
Merge branch '1.4.x' into 1.5.x
2017-02-08 14:32:45 +01:00
f46e3dc9f3
Fix link in doc to Spring Test
...
Closes gh-8226
2017-02-08 14:31:42 +01:00
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
3389af2c2f
Fix build failure (II)
2016-12-28 12:08:55 +01:00
6ecb525a57
Fix build failure
2016-12-28 11:52:53 +01:00
ad3b767b03
Merge branch '1.5.x'
2016-12-28 10:14:53 +01:00
d2900b8612
Merge branch '1.4.x' into 1.5.x
2016-12-28 10:14:38 +01:00
a862b6dc79
Polish documentation
...
Closes gh-7771
2016-12-28 10:14:22 +01:00
7cf08be353
Merge branch '1.5.x'
2016-12-27 17:51:32 +01:00
435ca3db69
Polish actuator security changes
...
Closes gh-7569
2016-12-27 17:50:10 +01:00
3fdfc3f052
Merge branch '1.5.x'
2016-12-27 11:12:38 +01:00
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
8b47561f7e
Merge branch '1.5.x'
2016-12-20 21:56:04 -08:00
1f7b3cad45
Polish Kafka properties
...
Closes gh-7672
2016-12-20 18:15:11 -08:00
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
998ff2feee
Merge branch '1.5.x'
2016-12-20 11:59:32 +01:00
851ce2286f
Allow to override Couchbase's CustomConversions
...
Closes gh-7700
2016-12-20 11:59:16 +01:00
1f417997f3
Merge branch '1.5.x'
2016-12-19 13:21:18 -08:00
4b9cba351b
Merge branch '1.4.x' into 1.5.x
2016-12-19 12:36:57 -08:00
e578ace7d7
Polish doc formatting
2016-12-19 10:29:42 -08:00
f03da0b4f7
Merge branch '1.5.x'
2016-12-19 16:00:19 +01:00
9668006aea
Merge branch '1.4.x' into 1.5.x
2016-12-19 16:00:04 +01:00
3237e4ab3e
Add link between reference and how-to
...
See gh-7652
2016-12-19 15:59:49 +01:00
943262bb97
Raise the minimum supported version of Hibernate to 5.2.x
...
Closes gh-7586
2016-12-15 21:31:53 +00:00
0ea3277769
Merge branch '1.5.x'
2016-12-15 09:21:24 +01:00
0fbe56eabc
Merge branch '1.4.x' into 1.5.x
2016-12-15 09:21:11 +01:00
c8bdf74327
Expand ConfigurationProperties doc
...
Closes gh-7620
2016-12-15 09:20:24 +01:00
ede0b0f940
Merge branch '1.5.x'
2016-12-01 14:55:15 +01:00
c127c1fdf9
Polish doc
...
Closes gh-7381
2016-12-01 14:54:54 +01:00
2dbebf67e8
Merge branch '1.5.x'
2016-11-30 10:56:14 +01:00
7c02daabc3
Polish contribution
...
Closes gh-7533
2016-11-30 10:55:32 +01:00
c654eff41b
Update doc for spring.data.neo4j.open-in-view
...
See gh-7533
2016-11-30 10:42:18 +01:00
0568afc6cb
Merge branch '1.5.x'
2016-11-30 08:31:41 +01:00
423f8037ce
Polish
...
Closes gh-7530
2016-11-30 08:31:13 +01:00
2577d79ff1
Merge branch '1.5.x'
2016-11-29 14:54:38 +01:00
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
4c01e940ea
Merge branch '1.5.x'
2016-11-28 11:33:13 +00:00
50c39661ad
Merge branch '1.4.x' into 1.5.x
2016-11-28 11:33:00 +00:00
491bd745de
Document Jersey's package scanning limitations
...
Closes gh-7496
2016-11-28 11:32:48 +00:00
4a10cfe112
Merge branch '1.5.x'
2016-11-25 10:24:43 +00:00
f64d5303cf
Document and test array support for spring.profiles.*
...
Closes gh-7175
Closes gh-6995
2016-11-25 10:24:14 +00:00
3bfbbeb9f4
Merge branch '1.5.x'
2016-11-24 17:44:17 +01:00
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
ab3a001286
Merge branch '1.5.x'
2016-11-22 15:49:27 -08:00
dc237043b8
Merge branch '1.4.x' into 1.5.x
2016-11-22 15:48:52 -08:00
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
e0dfff2b23
Merge branch '1.5.x'
2016-11-22 14:54:17 -08:00
b6b8bef009
Polish
2016-11-22 14:51:56 -08:00
e3688455fa
Merge branch '1.5.x'
2016-11-22 10:30:31 +01:00
642af52d01
Polish "Apache Kafka support" contribution
...
Closes gh-6961
2016-11-22 10:22:00 +01:00
c4188c8e4a
Add Apache Kafka support
...
See gh-6961
2016-11-22 09:34:01 +01:00
cb7c0b5031
Merge branch '1.5.x'
2016-11-16 16:06:53 -08:00
8038882d46
Polish
...
Closes gh-7403
2016-11-16 13:36:51 -08:00
e4be5c6102
Merge branch '1.5.x'
2016-11-05 07:44:48 +01:00
389acb094b
Merge branch '1.4.x' into 1.5.x
2016-11-05 07:43:09 +01:00
ec9f0ab6b4
Polish
...
Closes gh-7322
2016-11-05 07:42:37 +01:00
14d58b49dd
Merge branch '1.5.x'
2016-11-01 13:36:05 +00:00
8b631390ba
Merge branch '1.4.x' into 1.5.x
2016-11-01 13:36:00 +00:00
307fd94b4f
Correct typo in the documentation for RestTemplateBuilder customization
...
See gh-7054
2016-11-01 13:35:27 +00:00
5bc8101725
Merge branch '1.5.x'
2016-11-01 11:07:01 +00:00
ffbbd2a5f8
Merge branch '1.4.x' into 1.5.x
2016-11-01 11:06:56 +00:00
be78dc4b99
Flesh out the documentation on RestTemplateBuilder customization
...
Closes gh-7054
2016-11-01 11:06:38 +00:00
7be16c7b54
Merge branch '1.5.x'
2016-10-24 14:37:25 +01:00
a56bf44b39
Merge branch '1.4.x' into 1.5.x
2016-10-24 14:37:20 +01:00
8150cbd0d1
Remove commentary on Neo4j's licence
...
Closes gh-7214
2016-10-24 14:36:35 +01:00
363798e9ad
Fix unresolved merge commit
...
Closes gh-7206
2016-10-23 07:51:08 +02:00
Stephane Nicoll
Phillip Verheyden
Andy Wilkinson
lexandro
Vedran Pavic
Kamil Wozniak
Johnny Lim
Michael J. Simons
Phillip Webb
drumonii
Kazuki Shimizu
Dave Syer
Gary Russell
Phillip Johnson