Stephane Nicoll
e2c14c590a
Merge branch '2.0.x'
2018-05-29 09:04:31 +02:00
dreis2211
3ed31d60dc
Add assertion in IntegrationAutoConfigurationTests
...
Closes gh-13280
2018-05-29 09:04:00 +02:00
Stephane Nicoll
6814b7f240
Merge branch '2.0.x'
2018-05-28 14:29:00 +02:00
Stephane Nicoll
8a9d0bd22a
Merge branch '1.5.x' into 2.0.x
2018-05-28 14:28:45 +02:00
Stephane Nicoll
ec65cb1753
Merge branch '2.0.x'
2018-05-28 10:52:42 +02:00
Stephane Nicoll
15ba50ab3e
Merge branch '1.5.x' into 2.0.x
2018-05-28 10:52:21 +02:00
Johnny Lim
de01e7aad4
Polish
...
See gh-13243
2018-05-28 09:46:40 +02:00
Stephane Nicoll
f91b53747a
Merge branch '2.0.x'
2018-05-28 09:41:41 +02:00
Johnny Lim
f385a1cb11
Polish
...
Closes gh-13243
2018-05-28 09:36:15 +02:00
Stephane Nicoll
7462401291
Merge branch '2.0.x'
2018-05-28 09:28:30 +02:00
Eddú Meléndez
065eebfb4b
Fix javadoc
...
Closes gh-13274
2018-05-28 09:26:16 +02:00
Stephane Nicoll
be9a0ef65d
Merge branch '2.0.x'
2018-05-27 18:04:38 +02:00
hengyunabc
b75e58b70f
Add enforce-rule to ensure maven version >= 3.5.0
...
Closes gh-13271
2018-05-27 18:03:52 +02:00
Phillip Webb
3739699d79
Merge branch '2.0.x'
2018-05-26 08:44:13 -07:00
Phillip Webb
dba73d76b8
Merge branch '1.5.x' into 2.0.x
2018-05-26 08:43:27 -07:00
Stephane Nicoll
1bb53ff44c
Merge branch '2.0.x'
2018-05-26 12:44:50 +02:00
Arnaud Heritier
b60eadb10b
Add missing semicolon in example
...
Closes gh-13266
2018-05-26 12:44:11 +02:00
Phillip Webb
68ffbafbae
Fix checkstyle violations
2018-05-26 00:01:45 -07:00
Phillip Webb
3702da4573
Formatting
2018-05-25 23:52:38 -07:00
Phillip Webb
2215709165
Merge branch '2.0.x'
2018-05-25 23:50:39 -07:00
Phillip Webb
6f0ccc64a5
Fix checkstyle violations
2018-05-25 23:03:17 -07:00
Phillip Webb
9fd3b9103a
Format code
2018-05-25 23:02:45 -07:00
Phillip Webb
e544922dd7
Merge branch '1.5.x' into 2.0.x
2018-05-25 23:02:08 -07:00
Phillip Webb
5626b7a50d
Merge branch '2.0.x'
2018-05-25 20:58:31 -07:00
Phillip Webb
9c5f207e22
Fix merge error
2018-05-25 20:57:46 -07:00
Phillip Webb
d8157c94f3
Merge branch '2.0.x'
2018-05-25 19:48:37 -07:00
Phillip Webb
21d80d87a3
Merge branch '1.5.x' into 2.0.x
2018-05-25 18:45:37 -07:00
Stephane Nicoll
75c10e615e
Merge branch '2.0.x'
2018-05-25 16:45:57 +02:00
Andrea Vacondio
aed118c410
Fix documentation error
...
Closes gh-13260
2018-05-25 16:43:35 +02:00
Madhura Bhave
940c3d1b75
Merge branch '2.0.x'
2018-05-25 10:39:22 +02:00
Madhura Bhave
552878c431
Fix javadoc
2018-05-25 10:37:39 +02:00
Stephane Nicoll
79967a482a
Merge branch '2.0.x'
2018-05-24 11:44:10 +02:00
Stephane Nicoll
a5b53b263e
Merge branch '1.5.x' into 2.0.x
2018-05-24 11:43:48 +02:00
Stephane Nicoll
4464a5f5bd
Remove code deprecated in 2.0
...
Closes gh-12962
2018-05-22 14:48:25 +02:00
Stephane Nicoll
1ea3e95ff6
Merge branch '2.0.x'
2018-05-22 13:40:51 +02:00
Stephane Nicoll
585135a280
Polish
2018-05-22 13:40:40 +02:00
Stephane Nicoll
d5abd57a91
Remove deprecated use of spring.main.web-environment
...
Closes gh-13231
2018-05-22 13:39:02 +02:00
Stephane Nicoll
12bbb18844
Merge branch '2.0.x'
2018-05-22 12:51:31 +02:00
Stephane Nicoll
a124379dd9
Remove use of deprecated `web` methods
...
Closes gh-13231
2018-05-22 12:51:06 +02:00
Stephane Nicoll
699b6ce6dc
Remove reference to Jersey 1
...
Closes gh-12582
2018-05-22 10:50:27 +02:00
Phillip Webb
c5f63c19a4
Merge branch '2.0.x'
2018-05-21 21:38:32 -07:00
Phillip Webb
2dc4f1df00
Polish
2018-05-21 21:32:42 -07:00
Phillip Webb
40e68a6427
Merge branch '2.0.x'
2018-05-21 17:20:04 -07:00
Phillip Webb
6d8b4710d7
Merge branch '1.5.x' into 2.0.x
2018-05-21 17:18:49 -07:00
Johnny Lim
d72ba70cba
Use type parameter for Supplier in AggregateBinder.merge()
...
Closes gh-13139
2018-05-18 14:35:16 +02:00
Stephane Nicoll
243023f2ad
Merge branch '2.0.x'
2018-05-18 14:26:31 +02:00
Stephane Nicoll
300f6bf4d7
Polish contribution
...
Closes gh-13208
2018-05-18 14:20:31 +02:00
Mihhail Lapushkin
d31dbac69e
Support custom UriTemplateHandler in LocalHostUriTemplateHandler
...
See gh-13208
2018-05-18 14:19:01 +02:00
Stephane Nicoll
27c60e3deb
Merge branch '2.0.x'
2018-05-18 13:42:57 +02:00
Stephane Nicoll
48cf025093
Polish
2018-05-18 13:42:45 +02:00
Stephane Nicoll
d35d221b5c
Merge branch '2.0.x'
2018-05-18 11:54:43 +02:00
Stephane Nicoll
6893be5479
Make sure that RabbitMQ metrics are configured early
...
The ConnectionFactory can be used early in user configuration to
configure an `Exchange`. Such connection may not hold the proper
MetricCollector and can be cached, leading to missed metrics
information.
This commit moves the configuration of RabbitMQ metrics to a
BeanPostProcessor so that the proper MetricCollector is configured
before any connection is created.
Closes gh-12855
2018-05-18 11:54:11 +02:00
Stephane Nicoll
8364d121b1
Merge branch '2.0.x'
2018-05-17 16:18:17 +02:00
Stephane Nicoll
125b5974c0
Merge branch '1.5.x' into 2.0.x
2018-05-17 16:17:55 +02:00
Johnny Lim
b7fe3a5332
Make ErrorProperties.whitelabel final
...
Closes gh-13197
2018-05-17 15:31:51 +02:00
Stephane Nicoll
afe6abb20d
Merge branch '2.0.x'
2018-05-17 15:31:02 +02:00
Johnny Lim
75639aa682
Polish
...
Closes gh-13192
2018-05-17 15:29:50 +02:00
Stephane Nicoll
b51b997b70
Run specific health check
...
This commit improves the `health` endpoint to run health check for a
particular component or, if that component is itself a composite, an
instance of that component.
Concretely, it is now possible to issue a `GET` on
`/actuator/health/{component}` and
`/actuator/health/{component}/instance` to retrieve the health of a
component or an instance of a composite component, respectively.
If details cannot be showed for the current user, any request leads to a
404 and does not invoke the health check at all.
Closes gh-8865
2018-05-17 15:26:38 +02:00
Andy Wilkinson
9f6d3bb21d
Upgrade to Spring Data Lovelace M3
...
Closes gh-13169
2018-05-17 14:08:28 +01:00
Stephane Nicoll
beafba4487
Merge branch '2.0.x'
2018-05-17 09:35:29 +02:00
Stephane Nicoll
1d2edc1d37
Fix wrong reference to WebApplicationType
...
Closes gh-13195
2018-05-17 09:35:07 +02:00
Stephane Nicoll
2c176a3770
Add support for ReactiveHealthIndicatorRegistry
...
This commit updates the initial proposal to add support for reactive
use cases as well. A reactive application can use
ReactiveHealthIndicatorRegistry as an alternative to
HealthIndicatorRegistry.
Closes gh-4965
2018-05-16 17:48:41 +02:00
Stephane Nicoll
95b251590e
Polish "Introduce HealthIndicatorRegistry"
...
See gh-4965
Co-authored-by: Andy Wilkinson <awilkinson@pivotal.io>
2018-05-16 17:39:20 +02:00
Vedran Pavic
d829d522be
Introduce HealthIndicatorRegistry
...
This commit introduces HealthIndicatorRegistry which handles
registration of HealthIndicator instances. Registering new
HealthIndicator instances is now possible in runtime.
See gh-4965
2018-05-16 13:59:34 +02:00
Stephane Nicoll
ffdcdc0dc6
Merge branch '2.0.x'
2018-05-16 13:17:15 +02:00
Stephane Nicoll
7b7e802129
Merge branch '1.5.x' into 2.0.x
2018-05-16 13:16:54 +02:00
Andy Wilkinson
69aa4913e3
Align tests for OAuth properties adapter with changes in Spring Security
...
Closes gh-13185
2018-05-16 11:30:28 +01:00
Andy Wilkinson
d8f9aad8d4
Upgrade to Spring Security 5.1.0.M1
...
Closes gh-13185
2018-05-16 10:22:28 +01:00
Stephane Nicoll
9ea4fce03e
Merge branch '2.0.x'
2018-05-16 09:29:02 +02:00
Johnny Lim
652bbf4ab2
Polish DefaultErrorWebExceptionHandler.renderErrorView()
...
Closes gh-13174
2018-05-16 09:28:26 +02:00
Andy Wilkinson
38b491018c
Upgrade to Solr 7.2.1
...
Closes gh-13182
2018-05-15 17:22:27 +01:00
Andy Wilkinson
b5185fbe10
Upgrade to Lettuce 5.1.0.M1
...
Closes gh-13181
2018-05-15 17:22:26 +01:00
Andy Wilkinson
148997fd43
Upgrade to Elasticsearch 6.2.4
...
Closes gh-13178
2018-05-15 17:11:28 +01:00
Andy Wilkinson
795ff45a65
Upgrade to Cassandra Java Driver 3.5.0
...
Closes gh-13177
2018-05-15 16:57:51 +01:00
Andy Wilkinson
150a19523c
Start building against Spring Data Lovelace M3 snapshots
...
See gh-13169
2018-05-15 16:57:51 +01:00
Andy Wilkinson
33fadda4d9
Upgrade to Mongo Driver Reactive Streams 1.9.0-beta1
...
Closes gh-13180
2018-05-15 16:57:50 +01:00
Andy Wilkinson
3dfacaa1e3
Upgrade to MongoDB 3.8.0-beta2
...
Closes gh-13179
2018-05-15 16:57:50 +01:00
Stephane Nicoll
e5ac3bc391
Merge branch '2.0.x'
2018-05-15 15:10:04 +02:00
Johnny Lim
b9aa934d78
Remove @Deprecated on CouchbaseProperties.Endpoints.setKeyValue()
...
Closes gh-13171
2018-05-15 15:09:35 +02:00
Stephane Nicoll
ed02d02d19
Polish "Allow repackage maven goal to take a source classifier"
...
Closes gh-11061
2018-05-15 15:02:22 +02:00
Björn
3c8e012411
Allow repackage maven goal to take a source classifier
...
Previously, the "classifier" attribute was only used to determine the
target classifier of the repackaged archive, always using the main
artifact as the source.
This commit changes the semantic of the attribute so that an existing
archive matching the "classifier" attribute can be used as source,
replacing the archive the same way the goal replaces the main archive
if no classifier is found.
If no artifact with the specified classifier exists, the repackaged
archive is still processed based on the main archive and attached to
the lifecycle using the value of the classifier attribute.
See gh-11061
2018-05-15 15:02:22 +02:00
Andy Wilkinson
08a12e7964
Merge branch '2.0.x'
2018-05-15 10:28:56 +01:00
Andy Wilkinson
be0b8eb871
Merge branch '1.5.x' into 2.0.x
2018-05-15 10:28:46 +01:00
Andy Wilkinson
72b45584eb
Merge branch '2.0.x'
2018-05-15 09:18:06 +01:00
Andy Wilkinson
8b028e30d3
Merge branch '1.5.x' into 2.0.x
2018-05-15 09:18:01 +01:00
Andy Wilkinson
46855ab8eb
Merge branch '2.0.x'
2018-05-14 20:07:57 +01:00
Andy Wilkinson
73e525a280
Merge branch '1.5.x' into 2.0.x
2018-05-14 20:07:46 +01:00
Andy Wilkinson
16457ad988
Merge branch '2.0.x'
2018-05-14 17:54:50 +01:00
Andy Wilkinson
cddc2b4483
Merge branch '1.5.x' into 2.0.x
2018-05-14 17:54:31 +01:00
Stephane Nicoll
497aebe010
Merge branch '2.0.x'
2018-05-14 18:21:33 +02:00
Stephane Nicoll
a3a6a2b291
Polish "Add CLI manifest for Scoop"
...
Closes gh-12541
2018-05-14 18:20:57 +02:00
Andrey Saksonov
daccdbb18d
Add CLI manifest for Scoop
...
See gh-12541
2018-05-14 18:00:32 +02:00
Stephane Nicoll
24024b00da
Merge branch '2.0.x'
2018-05-14 17:42:15 +02:00
Stephane Nicoll
2be1c8f527
Polish "Set classloader for JMX endpoints to application classloader"
...
Closes gh-12209
2018-05-14 17:41:47 +02:00
David Herberth
e44c81672f
Set classloader for JMX endpoints to application classloader
...
See gh-12209
2018-05-14 17:41:31 +02:00
Frank Pavageau
ab7f6654d8
Manage the Mockito/JUnit 5 dependency
...
This requires an updated Mockito dependency as well, since it was
introduced in Mockito 2.17.0 but really works starting with 2.18.0.
Closes gh-12890
2018-05-14 16:21:23 +02:00
Stephane Nicoll
c7eec5c45e
Polish "Add liquibase test rollback on update property"
...
Closes gh-13159
2018-05-14 16:14:11 +02:00
Vladyslav Kiriushkin
08279c889c
Add liquibase test rollback on update property
...
See gh-13159
2018-05-14 16:06:08 +02:00
Stephane Nicoll
b839c98de9
Merge branch '2.0.x'
2018-05-14 16:04:30 +02:00
Sebastien Deleuze
d747d43b23
Update Kotlin refdoc with the new tutorial
...
Closes gh-13161
2018-05-14 16:03:46 +02:00