Commit Graph

21208 Commits

Author SHA1 Message Date
Phillip Webb
4853477081 Reformat code 2018-05-25 18:17:37 -07:00
Stephane Nicoll
75c10e615e Merge branch '2.0.x' 2018-05-25 16:45:57 +02:00
Stephane Nicoll
606eb9dda3 Merge pull request #13260 from torakiki:patch-1
* pr/13260:
  Fix documentation error
2018-05-25 16:45:45 +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
625f428aad Upgrade to gson 2.8.5
Closes gh-13245
2018-05-24 11:40:54 +02:00
Stephane Nicoll
8997143f31 Fix checkstyle violations 2018-05-24 11:40:54 +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
Stephane Nicoll
65738e63fb Polish 2018-05-22 08:28:09 +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
e47e499af2 Merge branch '2.0.x' 2018-05-21 17:26:40 -07:00
Phillip Webb
f84014d7df Add save_build_info param to maven sync job
Update CI pipeline so that the `sync-to-maven-central` job has access
to the artifactory build info.

Closes gh-13223
2018-05-21 17:24:43 -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
Phillip Webb
9f4f229b83 Polish title case in CONTRIBUTING.md 2018-05-21 17:10:52 -07:00
Phillip Webb
2fa057a06c Document how to raise security issues
Update contributing documentation and the issue template with
instructions on how to report security vulnerabilities.

Closes gh-12509
2018-05-21 17:07:44 -07:00
Phillip Webb
37646517cf Polish 2018-05-21 15:17:42 -07:00
Stephane Nicoll
074bbaa579 Merge pull request #13139 from izeye:type-parameter
* pr/13139:
  Use type parameter for Supplier in AggregateBinder.merge()
2018-05-18 14:46:51 +02: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
c1236ed81b Merge pull request #13208 from mihhail-lapushkin:master
* pr/13208:
  Polish contribution
  Support custom UriTemplateHandler in LocalHostUriTemplateHandler
2018-05-18 14:26:18 +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
Stephane Nicoll
d9029ef69e Fix documentation of spring.kafka.producer.batch-size
Closes gh-13127
2018-05-17 16:08:38 +02:00
Stephane Nicoll
bd722f257d Merge pull request #13197 from izeye:polish-20180517-2nd
* pr/13197:
  Make ErrorProperties.whitelabel final
2018-05-17 15:32:10 +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
Stephane Nicoll
64f43c373f Merge pull request #13192 from izeye:polish-20180517
* pr/13192:
  Polish
2018-05-17 15:30:49 +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
Andy Wilkinson
ff19eea05b Merge branch '2.0.x' 2018-05-17 11:39:33 +01:00
Andy Wilkinson
c271f8ef8b Merge branch '1.5.x' into 2.0.x 2018-05-17 11:39:08 +01:00
Andy Wilkinson
64158ebaf5 Reinstate use of ConversionService for String -> File conversion
Prior to 3db5c70b, RelaxedDataBinder would use a ConversionService
to convert a String into a File via its ObjectToObjectConverter.
3db5c70b changed the configuration of the data binder such that a
FileEditor was registered. Property editors take precedence over any
conversion service so the FileEditor was used instead. This caused a
regression as the FileEditor uses slightly unusual logic for a String
to File conversion. Specifically, when given a value of ".", it will
locate a ClassPathResource for the root of the classpath and use the
result of calling getFile() on that resource. This fails when the
root of the classpath is in a jar file and also provides a different
result when the root of the classpath is not the current directory.

This commit updates RelaxedDataBinder to suppress the registration
of an editor for File. This restores the behaviour prior to 3db5c70b
by allowing the ConversionService to be used instead.

Closes gh-12786
2018-05-17 11:38:48 +01:00