Phillip Webb
8aec4de399
Merge branch '2.1.x'
2019-04-03 17:34:01 -07:00
Phillip Webb
617f97f788
Fix checkstyle violation
2019-04-03 17:33:34 -07:00
Phillip Webb
ddbfb2530d
Update copyright header of changed files
2019-04-03 17:01:00 -07:00
Phillip Webb
ad7eebee9e
Merge branch '2.1.x'
2019-04-03 17:00:25 -07:00
Phillip Webb
f12ab1ff90
Update copyright header of changed files
2019-04-03 16:13:00 -07:00
Phillip Webb
34fee1adfa
Polish
2019-04-03 16:12:37 -07:00
Andy Wilkinson
c5c53849ce
Merge branch '2.1.x'
2019-04-03 14:41:15 +01:00
Andy Wilkinson
e404ac39bf
Upgrade to Spring Integration 5.1.4
...
See gh-16350
2019-04-03 14:40:59 +01:00
Andy Wilkinson
efd2f685d3
Upgrade to Spring Session Bean-SR4
...
See gh-16357
2019-04-03 14:40:59 +01:00
Andy Wilkinson
c3b5d9c363
Upgrade to Sqlite Jdbc 3.27.2
...
Closes gh-16440
2019-04-03 14:40:59 +01:00
Andy Wilkinson
4cf273770c
Upgrade to Mockito 2.25.1
...
Closes gh-16439
2019-04-03 14:40:59 +01:00
Andy Wilkinson
78a15c2234
Upgrade to Mariadb 2.4.1
...
Closes gh-16438
2019-04-03 14:40:59 +01:00
Andy Wilkinson
3fd0c26402
Upgrade to Junit Jupiter 5.4.1
...
Closes gh-16437
2019-04-03 14:40:28 +01:00
Andy Wilkinson
62462c9ced
Upgrade to Hibernate 5.4.2.Final
...
Closes gh-16436
2019-04-03 14:40:28 +01:00
Andy Wilkinson
fe4d96e60b
Upgrade to Elasticsearch 6.6.2
...
Closes gh-16435
2019-04-03 14:40:28 +01:00
Andy Wilkinson
8b195940a6
Upgrade to Assertj 3.12.2
...
Closes gh-16434
2019-04-03 14:40:28 +01:00
Andy Wilkinson
e7261f3d3f
Upgrade to Artemis 2.7.0
...
Closes gh-16432
2019-04-03 14:40:28 +01:00
Andy Wilkinson
7661287760
Upgrade to Thymeleaf Layout Dialect 2.4.1
...
Closes gh-16431
2019-04-03 14:40:28 +01:00
Andy Wilkinson
674a96e369
Upgrade to Classmate 1.5.0
...
Closes gh-16430
2019-04-03 14:40:28 +01:00
Andy Wilkinson
ca0119950f
Align with new fail-fast behaviour in Micrometer 1.1.4
...
Closes gh-16425
2019-04-03 14:39:29 +01:00
Stephane Nicoll
5f4bd37eb1
Merge branch '2.1.x'
2019-04-03 13:56:58 +02:00
Stephane Nicoll
3c058585bf
Upgrade to Micrometer 1.1.4
...
Close gh-16425
2019-04-03 13:54:41 +02:00
Andy Wilkinson
e3f4d4a165
Merge branch '2.1.x'
2019-04-03 11:40:31 +01:00
Andy Wilkinson
961b0307d6
Upgrade to Netty Tcnative 2.0.24.Final
...
Closes gh-16429
2019-04-03 11:40:21 +01:00
Stephane Nicoll
c5d0ebccff
Merge branch '2.1.x'
2019-04-03 12:09:42 +02:00
Brian Clozel
f221061d81
Avoid bean method proxying in WebMVC and WebFlux config
...
This commit applies changes similar to what's been done in gh-9068, for
MVC and WebFlux configurations. This is now possible thanks to the
changes done in Spring Framework in
https://github.com/spring-projects/spring-framework/pull/22596
Fixes gh-16427
2019-04-03 12:08:29 +02:00
Stephane Nicoll
a90d0a224f
Upgrade to Spring Batch 4.1.2
...
Closes gh-16423
2019-04-03 12:07:09 +02:00
Stephane Nicoll
edb5937571
Merge branch '2.1.x'
2019-04-03 11:46:58 +02:00
Johnny Lim
9fae1e5d0e
Check for Reactor Netty disconnected client errors
...
Closes gh-16046
2019-04-03 11:45:51 +02:00
Andy Wilkinson
5c4537add9
Merge branch '2.1.x'
2019-04-03 09:52:58 +01:00
Andy Wilkinson
52ebf20cbf
Merge branch '2.0.x' into 2.1.x
2019-04-03 09:52:45 +01:00
Andy Wilkinson
bfe65c8a5c
Merge branch '1.5.x' into 2.0.x
2019-04-03 09:52:28 +01:00
Stephane Nicoll
445870941f
Upgrade to Spring Session Bean-SR4
...
Closes gh-16357
2019-04-03 10:11:49 +02:00
Stephane Nicoll
03762d5a96
Upgrade to Spring Session Apple-SR9
...
Closes gh-16356
2019-04-03 10:10:27 +02:00
Stephane Nicoll
c57b4fcb04
Upgrade to Spring Integration 5.1.4
...
Closes gh-16350
2019-04-03 10:08:48 +02:00
Stephane Nicoll
1acc3d7161
Upgrade to Spring Integration 5.0.13
...
Closes gh-16349
2019-04-03 10:07:29 +02:00
Andy Wilkinson
bc00ad0fc5
Merge branch '2.1.x'
2019-04-03 08:32:34 +01:00
Andy Wilkinson
7b151f2a11
Merge branch '2.0.x' into 2.1.x
2019-04-03 08:32:22 +01:00
Andy Wilkinson
49423645f7
Merge branch '1.5.x' into 2.0.x
2019-04-03 08:32:11 +01:00
Andy Wilkinson
925850f267
Upgrade to Kafka 2.2.0
...
Closes gh-16420
2019-04-03 08:16:52 +01:00
Andy Wilkinson
967aafedec
Start building against Spring Kafka 2.3.0 snapshots
...
See gh-16302
2019-04-03 08:16:52 +01:00
dreis2211
03a5bb7857
Avoid using deprecated @SolrDocument#solrCoreName
...
Closes gh-16419
2019-04-03 09:02:23 +02:00
Phillip Webb
52e635b823
Merge branch '2.1.x'
2019-04-02 20:50:22 -07:00
Phillip Webb
912e0a87a8
Merge branch '2.0.x' into 2.1.x
2019-04-02 20:49:44 -07:00
Phillip Webb
8c2e0a61ae
Merge branch '1.5.x' into 2.0.x
2019-04-02 20:48:00 -07:00
Madhura Bhave
04517495af
Merge branch '2.1.x'
2019-04-02 15:52:35 -07:00
Madhura Bhave
ddc52502f5
Document @MockBean behavior during context refresh
...
Closes gh-16333
2019-04-02 15:50:51 -07:00
Phillip Webb
2376f973f4
Merge branch '2.1.x'
2019-04-02 13:46:36 -07:00
Phillip Webb
47c6bf741d
Merge branch '2.0.x' into 2.1.x
2019-04-02 13:40:21 -07:00
Phillip Webb
07c000c5b7
Merge branch '1.5.x' into 2.0.x
2019-04-02 13:34:28 -07:00