Commit Graph

12491 Commits

Author SHA1 Message Date
Stephane Nicoll beb72ca8ee Merge branch '1.5.x' 2017-06-22 09:31:04 +02:00
Stephane Nicoll b037d7a4cb Polish 2017-06-22 09:29:47 +02:00
Stephane Nicoll 0aabe38479 Merge pull request #9570 from izeye:polish-20170622
* pr/9570:
  Polish
2017-06-22 09:29:16 +02:00
Johnny Lim 8ca70a7efd Polish
See gh-9570
2017-06-22 09:28:49 +02:00
Stephane Nicoll 0d3a79aaa3 Merge pull request #9567 from eddumelendez:gh-7325
* pr/9567:
  Polish "Add prefix to all properties in maven plugin"
  Add prefix to all properties in maven plugin
2017-06-22 09:14:11 +02:00
Stephane Nicoll e230952dd2 Polish "Add prefix to all properties in maven plugin"
Closes gh-9567
2017-06-22 09:13:44 +02:00
Eddú Meléndez 4510be0f8f Add prefix to all properties in maven plugin
This commit add prefix `spring-boot` to all Mojo's properties.

See gh-9567
2017-06-22 09:13:44 +02:00
Andy Wilkinson 39c1757a96 Merge branch '1.5.x' 2017-06-21 14:31:21 -07:00
Andy Wilkinson 7a04708c41 Make sure the HealthMvcEndpoint is thread-safe
Previously, HealthMvcEndpoint stored the cached Health and its last
access time in two separate fields. Neither field was volatile and
no synchronization was used. This meant that there were potential
visibility problems. In a possible worst case scenario one field may
see the updated access time but an old health so it would incorrectly
believe that the old health was up-to-date and return it.

This commit reworks the endpoint to store the cached health and the
time at which it was created in a single, volatile field. This ensures
that the cached health and its creation time will be visible across
threads. Note that a race between threads when the cache is stale is
still possible. This race may result in multiple calls to the
delegate but these should be harmless.

Closes gh-9454
2017-06-21 14:19:10 -07:00
Andy Wilkinson b41c5d6a9a Merge branch '1.5.x' 2017-06-21 12:53:00 -07:00
Andy Wilkinson e6a3ca5da6 Address deprecation warning that's generated by Gradle 4.x
In Gradle 4.x, SourceSetOutput now has multiple classes directories
and getClassesDir() has been deprecated. This commit introduces the
use of reflection to use getClassesDirs() when it's available rather
than getClassesDir().

Closes gh-9559
2017-06-21 12:52:05 -07:00
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