Andy Wilkinson
30cd86bab5
Merge branch '2.0.x'
2018-10-15 21:03:00 +01:00
Andy Wilkinson
a70aafd35a
Upgrade to Reactor Bismuth-SR12
...
Closes gh-14838
2018-10-15 21:02:11 +01:00
Andy Wilkinson
a9524d32ac
Upgrade to Spring Integration 5.0.9.RELEASE
...
Closes gh-14834
2018-10-15 21:01:55 +01:00
Andy Wilkinson
4527d4f397
Merge branch '2.0.x'
2018-10-15 20:51:43 +01:00
Andy Wilkinson
0263914844
Merge branch '1.5.x' into 2.0.x
2018-10-15 20:51:34 +01:00
Andy Wilkinson
2f42ac6630
Upgrade to Spring Amqp 1.7.11.RELEASE
...
Closes gh-14837
2018-10-15 20:51:21 +01:00
Andy Wilkinson
ad10459320
Merge branch '2.0.x'
2018-10-15 20:45:51 +01:00
Andy Wilkinson
0c9cd908e9
Merge branch '1.5.x' into 2.0.x
2018-10-15 20:45:40 +01:00
Andy Wilkinson
c22b07ce56
Upgrade to Spring Security OAuth 2.0.16.RELEASE
...
Closes gh-14832
2018-10-15 20:45:08 +01:00
Phillip Webb
3665917d44
Merge branch '2.0.x'
2018-10-15 11:32:09 -07:00
Phillip Webb
c306e03112
Support '-' in endpoint names
...
Update the `EndpointId` constraints to allow '-' in names.
Closes gh-14773
2018-10-15 11:27:30 -07:00
Andy Wilkinson
1e2d5a1382
Auto-configure Micrometer's HumioMeterRegistry
...
Closes gh-14804
2018-10-15 18:10:35 +01:00
Phillip Webb
9a80e88a73
Merge branch '2.0.x'
2018-10-15 09:52:09 -07:00
Phillip Webb
d8b9685635
Support '.' in endpoint names
...
Update the `EndpointId` constraints to allow '.' in names.
Closes gh-14773
2018-10-15 09:37:44 -07:00
Stephane Nicoll
edf4045c3b
Add missing tests for Kairos config adapter
...
Closes gh-14821
2018-10-15 17:55:07 +02:00
Stephane Nicoll
ffe5e88d8e
Merge branch '2.0.x'
2018-10-15 16:43:32 +02:00
Stephane Nicoll
99a45bdef8
Fix datasource prefix in multiple-datasource configuration doc
...
Closes gh-13195
2018-10-15 16:42:34 +02:00
Andy Wilkinson
e53e8bf79f
Merge branch '2.0.x'
2018-10-15 15:29:10 +01:00
Andy Wilkinson
0fedf8d2af
Keep Liquibase-specific DataSource open for use by LiquibaseEndpoint
...
Closes gh-13832
2018-10-15 15:26:26 +01:00
Stephane Nicoll
eaf6a116d7
Merge branch '2.0.x'
2018-10-15 15:13:45 +02:00
Stephane Nicoll
d4ec45e192
Fix javadoc generation
2018-10-15 15:12:52 +02:00
Stephane Nicoll
102bffc711
Merge branch '2.0.x'
2018-10-15 15:10:18 +02:00
Stephane Nicoll
99dcdd7dbf
Merge branch '1.5.x' into 2.0.x
2018-10-15 15:09:54 +02:00
Stephane Nicoll
ce84068e91
Upgrade to Spring Data Ingalls SR16
...
Closes gh-14727
2018-10-15 15:09:07 +02:00
Stephane Nicoll
0ac6542696
Upgrade to Spring Framework 4.3.20.RELEASE
...
Closes gh-14721
2018-10-15 15:08:32 +02:00
Andy Wilkinson
a4eb636913
Merge branch '2.0.x'
2018-10-15 13:58:17 +01:00
Andy Wilkinson
6d98851fb5
Use Couchbase's DiagnosticsReport to determine its health
...
Previously, Couchbase's health was determined by retrieving the bucket info
from the cluster info. This retrieval could take over one minute in some
cases even when Couchbase is health. This latency is too large for a health
check.
The Couchbase team have recommended the of a Cluster#diagnostics instead.
This provides a much lower latency view of the cluster's health. This
commit updates CouchbaseHealthIndicator to use Cluster#diagnostics while
retaining support, in a deprecated form, for the old info-based mechanism
should anyone want to opt back into that in 2.0.x.
Closes gh-14685
2018-10-15 13:44:42 +01:00
Stephane Nicoll
2ae81fe4a2
Merge branch '2.0.x'
2018-10-15 14:15:50 +02:00
Stephane Nicoll
b7b9bf209e
Upgrade to Spring Data Kay SR11
...
Closes gh-14728
2018-10-15 14:15:27 +02:00
Stephane Nicoll
89349c6eb9
Auto-configure KairosDB metrics
...
Closes gh-14821
2018-10-15 14:13:10 +02:00
Andy Wilkinson
267eff15f1
Merge branch '2.0.x'
2018-10-15 12:24:39 +01:00
Andy Wilkinson
ab7c1af3ec
Auto-configure SpringSecurityDialect for v5 and deprecate v4
...
Closes gh-14828
2018-10-15 12:18:40 +01:00
Andy Wilkinson
a25e4a860c
Upgrade to Thymeleaf Extras Spring Security 3.0.3.RELEASE
...
Closes gh-14829
2018-10-15 12:02:16 +01:00
Andy Wilkinson
eaf38e9355
Upgrade to Spring Data Lovelace-SR1
...
Closes gh-14729
2018-10-15 11:46:27 +01:00
Stephane Nicoll
aef167f14f
Merge branch '2.0.x'
2018-10-15 11:27:17 +02:00
Stephane Nicoll
0fdf96da3b
Upgrade to Spring Framework 5.0.10.RELEASE
...
Closes gh-14722
2018-10-15 11:26:16 +02:00
Brian Clozel
d5236b91ce
Polish
2018-10-15 10:59:38 +02:00
artsiom
9e5f171510
Support cachecontrol config property in WebFlux
...
Closes gh-14724
2018-10-15 10:59:38 +02:00
Stephane Nicoll
66af20f940
Upgrade to Spring Framework 5.0.10.RELEASE
...
Closes gh-14722
2018-10-15 10:51:14 +02:00
Stephane Nicoll
1103e93b2d
Merge branch '2.0.x'
2018-10-15 10:50:43 +02:00
Stephane Nicoll
eeb7cab661
Upgrade to Neo4j Ogm 3.1.4
...
Closes gh-14826
2018-10-15 10:50:06 +02:00
Stephane Nicoll
f86ed38abf
Upgrade to Groovy 2.5.3
...
Closes gh-14825
2018-10-15 10:03:42 +02:00
Stephane Nicoll
1a0d53dec0
Replace ReflectionTestUtils usage by hasFieldOrPropertyWithValue
...
Closes gh-14696
2018-10-15 08:25:10 +02:00
Phillip Webb
cfa130b2ef
Merge branch '2.0.x'
2018-10-14 19:14:04 -07:00
Phillip Webb
bb4e9a5bc1
Merge pull request #14822 from Hanope
...
* pr/14822:
Fix typo in EndpointIdTests
2018-10-14 19:13:07 -07:00
Hanope
535dd7470f
Fix typo in EndpointIdTests
...
Closes gh-14822
2018-10-14 19:11:56 -07:00
Phillip Webb
98cbea5279
Merge branch '2.0.x'
2018-10-14 19:08:42 -07:00
Phillip Webb
3eb877425e
Upgrade to Micrometer 1.0.7
...
Closes gh-14808
2018-10-14 19:07:50 -07:00
Phillip Webb
18319ac276
Remove deprecated Endpoint ID methods
...
See gh-14773
2018-10-14 13:55:13 -07:00
Phillip Webb
1bf97e9b5e
Merge branch '2.0.x'
2018-10-14 13:53:28 -07:00