33dd9d6d84
Remove Spring Session Mongo support
...
Remove auto-configuration support for Spring Session Mongo since it is
no longer supported in Spring Session 2.0.
See gh-9011
2017-04-27 10:59:22 -07:00
800eb010b1
Change the default JDBC connection pool to Hikari
...
Closes gh-6013
2017-04-27 16:11:45 +02:00
3e60ec6cb4
Polish "Add database initializer for Spring Integration"
...
Closes gh-8881
2017-04-24 15:16:07 +02:00
48bc29c77a
Add database initializer for Spring Integration
...
See gh-8881
2017-04-24 14:46:40 +02:00
42c1eb894e
Merge branch '1.5.x'
2017-04-14 13:58:03 +02:00
8c21e16cf1
Add reference to Infinispan starter
...
Closes gh-8592
2017-04-14 13:57:47 +02:00
04ee374e7f
Polish "Add slice test annotation for LDAP"
...
Closes gh-8536
2017-04-14 10:51:43 +02:00
2830bef95c
Add slice test annotation for LDAP
...
This commit adds new annotation `@DataLdapTest` which provides test
infrastructure for LDAP. By default, embedded ldap server is initialized
if available.
See gh-8536
2017-04-14 10:39:03 +02:00
abe3dba4b9
Merge branch '1.5.x'
2017-04-12 11:46:59 +02:00
f4ab574ea1
Merge branch '1.4.x' into 1.5.x
2017-04-12 11:46:43 +02:00
072160863a
Add a note about transactional tests and `webEnvironment`
...
Closes gh-8232
2017-04-12 11:46:06 +02:00
01089c5f7a
Merge branch '1.5.x'
2017-04-12 11:16:10 +02:00
68c90b24c2
Merge branch '1.4.x' into 1.5.x
2017-04-12 11:15:51 +02:00
40f4c89602
Document list merge restrictions with YAML
...
Closes gh-6911
2017-04-12 11:15:24 +02:00
0cd1285aa4
Polish
...
Closes gh-8879
2017-04-11 09:41:33 +02:00
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
Vedran Pavic
Stephane Nicoll
Eddú Meléndez
Johnny Lim
Phillip Verheyden
Andy Wilkinson
lexandro