Commit Graph

26227 Commits

Author SHA1 Message Date
Phillip Webb
bbf94c22da Polish 2018-05-03 22:42:49 -07:00
Phillip Webb
8c0c0ee55a Merge branch '2.0.x' 2018-05-03 12:44:58 -07:00
Phillip Webb
e125085993 Merge branch '1.5.x' into 2.0.x 2018-05-03 12:43:50 -07:00
Stephane Nicoll
36a377764f Merge branch '2.0.x' 2018-05-03 15:53:32 +02:00
Stephane Nicoll
700ec6b840 Polish "Complete SSL configuration for Kafka"
Closes gh-13031
2018-05-03 15:50:33 +02:00
Toshiaki Maki
d208641c59 Complete SSL configuration for Kafka
See gh-13031
2018-05-03 15:38:49 +02:00
Andy Wilkinson
4ea7d3a767 Merge branch '2.0.x' 2018-05-03 11:35:58 +01:00
Andy Wilkinson
f5fabbc1b9 Remove the use of internal API from Gradle Plugin's BootJar
Closes gh-13037
2018-05-03 11:34:42 +01:00
Stephane Nicoll
921c037956 Merge branch '2.0.x' 2018-05-03 11:47:33 +02:00
Stephane Nicoll
69ab956e8b Stop assuming datasource creation failure originates from auto-config
There are documented way to reuse bits of the infrastructure in user
config to offer similar datasource configuration. If that fails, the
regular failure there will kick in.

This commit improves `DataSourceBeanCreationFailureAnalyzer` to not
misguide users that the auto-configuration has failed. Rather, it
describes what has failed in a more generic way.

Closes gh-12947
2018-05-03 11:46:27 +02:00
Stephane Nicoll
ca1b637728 Merge branch '2.0.x' 2018-05-03 11:14:59 +02:00
Stephane Nicoll
b3ad902902 Merge branch '1.5.x' into 2.0.x 2018-05-03 11:14:42 +02:00
Gary Russell
8cf34238d3 Start building against Spring Kafka 2.2.0 snapshots
Closes gh-13007
2018-05-02 16:15:08 +02:00
Stephane Nicoll
eab2d4a404 Merge branch '2.0.x' 2018-05-02 16:13:31 +02:00
Johnny Lim
e7d2f22911 Polish IgnoreTopLevelConverterNotFoundBindHandlerTests
Closes gh-13022
2018-05-02 16:12:37 +02:00
Johnny Lim
12cdc8b0e0 Fix @since for IgnoreTopLevelConverterNotFoundBindHandler
Closes gh-13019
2018-05-02 16:11:37 +02:00
Stephane Nicoll
7879b38615 Merge branch '2.0.x' 2018-05-02 16:09:56 +02:00
Stephane Nicoll
7cca56e15b Upgrade to HikariCP 2.7.9
Closes gh-12783
2018-05-02 16:09:02 +02:00
Stephane Nicoll
4eeddbd889 Merge branch '2.0.x' 2018-05-02 16:08:03 +02:00
Stephane Nicoll
d6244889f5 Add default value for "spring.flyway.locations"
See gh-12193
2018-05-02 16:07:38 +02:00
Stephane Nicoll
79c222da78 Allow to provide manual metadata for keys that are not unique
Closes gh-12193
2018-05-02 16:04:02 +02:00
Stephane Nicoll
44fd7d953e Merge branch '2.0.x' 2018-05-02 16:00:25 +02:00
Stephane Nicoll
782d8c63da Merge branch '1.5.x' into 2.0.x 2018-05-02 15:59:56 +02:00
Andy Wilkinson
0526594a3c Merge branch '2.0.x' 2018-05-02 12:26:23 +01:00
Andy Wilkinson
f019d5c85b Merge branch '1.5.x' into 2.0.x 2018-05-02 12:22:04 +01:00
Andy Wilkinson
1fda677f2d Merge branch '2.0.x' 2018-05-02 11:36:23 +01:00
Andy Wilkinson
0a9d950a44 Start building against Spring Kafka 2.1.6 snapshots
See gh-13018
2018-05-02 11:32:26 +01:00
Andy Wilkinson
2a8eb2c113 Start building against Spring Integration 5.0.5 snapshots
See gh-13016
2018-05-02 11:31:29 +01:00
Andy Wilkinson
c50687758e Start building against Spring Data Kay SR7 snapshots
See gh-13017
2018-05-02 11:30:53 +01:00
Andy Wilkinson
0d67ca1e81 Starting building against Spring Framework 5.0.6 snapshots
See gh-13021
2018-05-02 11:29:25 +01:00
Andy Wilkinson
c17a451744 Merge branch '2.0.x' 2018-05-02 10:57:47 +01:00
Andy Wilkinson
49089546f8 Merge branch '1.5.x' into 2.0.x 2018-05-02 10:57:29 +01:00
Stephane Nicoll
0819822eb6 Merge branch '2.0.x' 2018-05-02 10:42:03 +02:00
Stephane Nicoll
fbf8f57773 Merge branch '1.5.x' into 2.0.x 2018-05-02 10:41:24 +02:00
Madhura Bhave
a193c89c6d Merge branch '2.0.x' 2018-05-01 16:42:24 -07:00
Madhura Bhave
aad279208e Throw exception if RandomAccessData tries to read beyond EOF
Fixes gh-12986
2018-05-01 16:35:43 -07:00
Madhura Bhave
ef0cfc43fe Merge branch '2.0.x' 2018-05-01 11:34:39 -07:00
Madhura Bhave
d268b2102f Fix typo 2018-05-01 11:33:47 -07:00
Stephane Nicoll
9f7be62687 Backport polish commit "22b99a90" 2018-05-01 11:33:26 -07:00
Andy Wilkinson
c37e6ebac5 Merge branch '2.0.x' 2018-05-01 09:25:14 +01:00
Andy Wilkinson
d5841982d9 Upgrade to Testcontainers 1.7.2
See gh-12821
2018-05-01 09:25:04 +01:00
Stephane Nicoll
0fcffae0d9 Merge branch '2.0.x' 2018-04-30 16:50:51 +02:00
Johnny Lim
d8700522d3 Rename nested *AutoConfiguration classes to *Configuration
Closes gh-12989
2018-04-30 16:50:18 +02:00
Stephane Nicoll
335ca62239 Merge branch '2.0.x' 2018-04-30 16:45:30 +02:00
Johnny Lim
a723ac95a9 Polish
Closes gh-12999
2018-04-30 16:44:46 +02:00
Stephane Nicoll
284fe969e0 Merge branch '2.0.x' 2018-04-30 16:43:02 +02:00
Yaman Jain
50ca33ecd2 Fix typo
Closes gh-12996
2018-04-30 16:42:22 +02:00
Stephane Nicoll
fb8a5a9864 Polish "Add cache actuator endpoint"
This commit improves the initial proposal by providing a by name read
operation that returns the detail of a particular cache. It also adds
more tests and complete API documentation for the feature.

Closes gh-12216
2018-04-30 16:34:00 +02:00
Johannes Edmeier
1a57673345 Add cache actuator endpoint
This commits adds an actuator endpoint which lists the caches per
context and cacheManager and provides a delete operation to clear the
caches. As the statistics are exposed via the metrics endpoint they are
not included

See gh-12216
2018-04-30 16:34:00 +02:00
Andy Wilkinson
0699f65969 Merge branch '2.0.x' 2018-04-30 12:26:38 +01:00