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
