Andy Wilkinson
cfaf5700a7
Upgrade to Jackson 2.9.0.pr4
...
Closes gh-9563
2017-06-21 06:22:59 -07:00
Andy Wilkinson
5e9437bd81
Start building against Spring Data Kay snapshots
...
See gh-9569
2017-06-21 06:22:59 -07:00
Stephane Nicoll
6aec6d68f6
Upgrade to Groovy 2.5.0-beta-1
...
Closes gh-9564
2017-06-21 10:16:04 +02:00
Stephane Nicoll
cabe59d65a
Remove animal sniffer
...
See gh-9564
2017-06-21 10:10:02 +02:00
Stephane Nicoll
75274d3024
Merge branch '1.5.x'
2017-06-20 14:48:04 +02:00
Stephane Nicoll
fc57a0eddc
Merge pull request #9544 from htynkn:feature/use-getUsableSpace-in-DiskSpaceHealthIndicator
...
* pr/9544:
Polish "Use getUsableSpace() in DiskSpaceHealthIndicator"
Use getUsableSpace() in DiskSpaceHealthIndicator
2017-06-20 14:47:52 +02:00
Stephane Nicoll
3f70638f1c
Polish "Use getUsableSpace() in DiskSpaceHealthIndicator"
...
Closes gh-9544
2017-06-20 14:44:11 +02:00
Huang YunKun
158416fdd0
Use getUsableSpace() in DiskSpaceHealthIndicator
...
See gh-9544
2017-06-20 14:43:38 +02:00
Stephane Nicoll
35d062f50d
Alias spring.datasource.name to Hikari's poolName property
...
Closes gh-9547
2017-06-20 14:30:18 +02:00
Stephane Nicoll
78a9ace582
Polish
2017-06-20 11:58:51 +02:00
Stephane Nicoll
03b43225b8
Allow Hikari to export MBeans on the auto-configured datasource
...
This commit makes sure that if the `register-mbeans` property of the
Hikary datasource config is set, Spring Boot doesn't attempt to expose
the mbean again.
Closes gh-5114
2017-06-20 11:49:19 +02:00
Brian Clozel
e4c4251f61
Switch back to Spring Framework 5.0.0 SNAPSHOTS
2017-06-20 10:17:15 +02:00
Andy Wilkinson
49a62a7c33
Correct the scope of the spring-boot-test-support dependency
...
Closes gh-9550
2017-06-19 11:36:05 +01:00
Stephane Nicoll
0adeb1da2c
Merge pull request #8534 from eddumelendez:gh-8411
...
* pr/8534:
Polish
Polish "Add support for CustomConversions with Cassandra"
Add support for CustomConversions with Cassandra
2017-06-19 08:38:35 +02:00
Stephane Nicoll
2916cdf953
Polish
2017-06-19 08:38:04 +02:00
Stephane Nicoll
49797b1153
Polish "Add support for CustomConversions with Cassandra"
...
Closes gh-8534
2017-06-19 08:28:24 +02:00
Eddú Meléndez
744a1ed497
Add support for CustomConversions with Cassandra
...
This commit add the support for CustomConversions in
spring-data-cassandra. To customize, bean just need to be declared and
it will be auto-configured.
See gh-8534
2017-06-19 08:28:23 +02:00
Stephane Nicoll
7f7c60610c
Merge branch '1.5.x'
2017-06-17 10:40:36 +02:00
Stephane Nicoll
3ead213c7d
Merge pull request #9539 from dsyer:1.5.x
...
* pr/9539:
Upgrade to Spring Retry 1.2.1
2017-06-17 10:38:58 +02:00
Dave Syer
f4a475cef8
Upgrade to Spring Retry 1.2.1
...
Closes gh-9539
2017-06-17 10:38:34 +02:00
Madhura Bhave
fce299c1c1
Merge branch '1.5.x'
2017-06-16 11:38:18 -07:00
Madhura Bhave
e437c4cd67
OAuth2ClientIdCondition should not match if clientId absent
...
Fixes gh-9435
2017-06-16 10:55:49 -07:00
Stephane Nicoll
350c701da3
Polish
2017-06-16 15:48:36 +02:00
Andy Wilkinson
2ffe480490
Polish
2017-06-16 09:24:56 +01:00
Andy Wilkinson
cbae31364f
Suppress deprecation warning from LettuceConnectionFactory
...
See gh-9538
2017-06-16 09:21:59 +01:00
Andy Wilkinson
991314c63d
Merge branch '1.5.x'
2017-06-16 09:13:42 +01:00
Andy Wilkinson
59122358d3
Clean up and format code
2017-06-16 08:58:14 +01:00
Stephane Nicoll
573007166c
Remove version of override for resources plugin
...
Closes gh-9537
2017-06-16 09:54:30 +02:00
Stephane Nicoll
d559f7a5bb
Harmonize key description
...
See gh-9374
2017-06-16 09:38:46 +02:00
Stephane Nicoll
4d6965a147
Polish
2017-06-16 09:26:09 +02:00
Stephane Nicoll
2dcb441745
Upgrade to Spring Integration 5.0.0 M5
...
Closes gh-9287
2017-06-16 09:06:29 +02:00
Stephane Nicoll
fcbd043605
Upgrade to Spring Security 5.0.0 M2
...
Closes gh-9288
2017-06-16 09:05:52 +02:00
Stephane Nicoll
b1db24569c
Upgrade to Spring Session 2.0.0.M2
...
Closes gh-9505
2017-06-16 09:04:43 +02:00
Andy Wilkinson
1fe9066b5b
Use fixed name for SpringApplication command line args property source
...
Closes gh-8680
2017-06-15 21:19:34 +01:00
Andy Wilkinson
4a030d5a7a
Drop support for auto-configuring an embedded Elasticsearch node
...
Elastic have announced [1] that embedded Elasticsearch is no longer
supported. This commit brings us into line with that announcement by
removing the auto-configuration that would create an Elasticsearch
Node and NodeClient.
To use the Elasticsearch auto-configuration, a user must now provide
the address of one or more cluster nodes
(via the spring.elastisearch.cluster-nodes property) which will then
be used to create a TransportClient.
See gh-9374
[1] https://www.elastic.co/blog/elasticsearch-the-server
2017-06-15 19:52:24 +01:00
Stephane Nicoll
dbabfc224c
Add support for Lettuce in RedisTestServer
...
Previously, RedisTestServer only supported Jedis and would blow up if
only Lettuce was on the classpath. This commit defensively checks which
driver is available and chose the appropriate one, defaulting to Jedis.
Closes gh-9524
2017-06-15 14:42:24 +02:00
Stephane Nicoll
865971a540
Merge pull request #9526 from mp911de:set-lettuce-shutdown-timeout-properly
...
* pr/9526:
Polish "Set Lettuce shutdown timeout properly"
Reduce Lettuce shutdown timeout to 100ms
Set Lettuce shutdown timeout properly
2017-06-15 14:00:10 +02:00
Stephane Nicoll
053b8b5853
Polish "Set Lettuce shutdown timeout properly"
...
Closes gh-9526
2017-06-15 13:49:52 +02:00
Mark Paluch
0a9646dbf4
Reduce Lettuce shutdown timeout to 100ms
...
Reducing the default to 100ms is a good compromise to retain a quiet time
in for parallel execution and optimize for default, single-threaded
execution (such as test execution or regular application shutdown). The
shutdown timeout can be adjusted to fit specific application needs.
See gh-9526
2017-06-15 13:46:16 +02:00
Mark Paluch
69d2185618
Set Lettuce shutdown timeout properly
...
We now properly set the Lettuce client shutdown for unpooled and pooled
configuration.
See gh-9526
2017-06-15 13:45:59 +02:00
Stephane Nicoll
eb30fe06ec
Merge branch '1.5.x'
2017-06-15 13:43:44 +02:00
Stephane Nicoll
5d69318e2d
Add reference to SpringBootApplication in EnableAutoConfiguration
...
Closes gh-9521
2017-06-15 13:43:13 +02:00
Stephane Nicoll
5538fbaae2
Merge pull request #9443 from tsachev:gh-9442
...
* pr/9443:
Polish
Polish "Allow abstract serializers/deserializer in @JsonComponent"
Allow abstract serializers/deserializer in @JsonComponent
2017-06-15 13:35:56 +02:00
Stephane Nicoll
31ee45bf36
Polish
2017-06-15 13:35:33 +02:00
Stephane Nicoll
c5c6a526d3
Polish "Allow abstract serializers/deserializer in @JsonComponent"
...
Closes gh-9443
2017-06-15 13:30:25 +02:00
Vladimir Tsanev
6ba7849094
Allow abstract serializers/deserializer in @JsonComponent
...
Previously JsonComponentModule tried to instantiate all
inner classes and failed with InstantiationException when
the class is abstract and extends JsonSerializer/JsonDeserializer.
With this change is now possible to have common logic inner abstract classes.
See gh-9443
2017-06-15 13:27:26 +02:00
Stephane Nicoll
de7b7ac55b
Merge pull request #9224 from jayarampradhan:master
...
* pr/9224:
Polish "Add Slice test annotation for Redis"
Add Slice test annotation for Redis
2017-06-15 11:40:36 +02:00
Stephane Nicoll
dd53ed0aec
Polish "Add Slice test annotation for Redis"
...
Closes gh-9224
2017-06-15 11:38:32 +02:00
Jayaram Pradhan
2d36d2a7e4
Add Slice test annotation for Redis
...
This commit adds new annotation `@DataRedisTest` which provides test
infrastructure for redis.
See gh-9224
2017-06-15 11:12:13 +02:00
Stephane Nicoll
3a63241628
Fix RedisRepositoriesAutoConfiguration condition
...
Rather than checking if Jedis is on the classpath, this commit changes
the conditions of `RedisRepositoriesAutoConfiguration` to check for the
presence of a `RedisConnectionFactory` bean that is going to be
necessary to create the Redis repositories anyway.
Checking for Jedis is no longer correct since we now support Lettuce as
well.
Closes gh-9523
2017-06-15 11:11:48 +02:00