5b92a0278b
Merge branch '1.5.x'
2017-04-11 09:41:08 +02:00
3f883f1898
Merge branch '1.4.x' into 1.5.x
2017-04-11 09:38:11 +02:00
404bb2d171
Polish
...
See gh-8879
2017-04-11 09:37:22 +02:00
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
Stephane Nicoll
Phillip Verheyden
Andy Wilkinson
lexandro
Vedran Pavic
Kamil Wozniak
Johnny Lim