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
96d3625b8e
Merge branch '2.0.x' into 2.1.x
2019-04-03 12:06:23 +02:00
Stephane Nicoll
3fb8d504c5
Upgrade to Spring Batch 4.0.3
...
Closes gh-16422
2019-04-03 12:04:40 +02:00
Stephane Nicoll
edb5937571
Merge branch '2.1.x'
2019-04-03 11:46:58 +02:00
Stephane Nicoll
0b828db603
Merge pull request #16406 from izeye
...
* pr/16406:
Check for Reactor Netty disconnected client errors
2019-04-03 11:45: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
Andy Wilkinson
0f27b1a65e
Verify entry output location when extracting zip
...
Closes gh-16028
2019-04-03 09:48:56 +01:00
Stephane Nicoll
a00729108e
Merge branch '2.1.x'
2019-04-03 10:12:16 +02:00
Stephane Nicoll
445870941f
Upgrade to Spring Session Bean-SR4
...
Closes gh-16357
2019-04-03 10:11:49 +02:00
Stephane Nicoll
db52fab9c2
Merge branch '2.0.x' into 2.1.x
2019-04-03 10:11:14 +02:00
Stephane Nicoll
03762d5a96
Upgrade to Spring Session Apple-SR9
...
Closes gh-16356
2019-04-03 10:10:27 +02:00
Stephane Nicoll
019c7709c0
Merge branch '2.1.x'
2019-04-03 10:09:08 +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
a700f85ed0
Merge branch '2.0.x' into 2.1.x
2019-04-03 10:07:52 +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
30bba53a1f
Upgrade to Httpclient 4.5.8
...
Closes gh-16424
2019-04-03 08:30:36 +01:00
Andy Wilkinson
8a4e206e85
Upgrade to Spring Integration 4.3.20
...
Closes gh-16348
2019-04-03 08:29:44 +01:00
Andy Wilkinson
efc030adf3
Upgrade to Spring Security 4.2.12
...
Closes gh-16352
2019-04-03 08:28:54 +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
Stephane Nicoll
c6dcb4b4c1
Merge pull request #16419 from dreis2211
...
* pr/16419:
Avoid using deprecated @SolrDocument#solrCoreName
2019-04-03 09:03:14 +02: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
Phillip Webb
f25469c95f
Update formatting with spring-javaformat 0.0.9
...
See gh-16421
2019-04-02 20:43:36 -07:00
Phillip Webb
cae6a82322
Upgrade to spring-javaformat 0.0.9
...
Closes gh-16421
2019-04-02 20:34:35 -07:00
Phillip Webb
afa58bba04
Merge branch '2.1.x'
2019-04-02 19:42:23 -07:00
Phillip Webb
eefd10d4d1
Merge branch '2.0.x' into 2.1.x
2019-04-02 19:40:28 -07:00
Phillip Webb
f875b74e67
Reformat samples with spring-javaformat 0.0.8
...
See gh-16418
2019-04-02 19:39:23 -07:00
Madhura Bhave
6bb5311984
Merge branch '2.1.x'
2019-04-02 15:58:59 -07:00
Madhura Bhave
eff2f92c48
Fix formatting following formatter update
2019-04-02 15:55:34 -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
Phillip Webb
2ff74b1559
Reformat code with spring-javaformat 0.0.8
...
See gh-16418
2019-04-02 13:30:25 -07:00
Andy Wilkinson
4e337f7466
Merge branch '2.1.x'
2019-04-02 19:55:12 +01:00
Andy Wilkinson
b969d55e05
Upgrade to Spring Kafka 2.2.5
...
Closes gh-16351
2019-04-02 19:51:08 +01:00
Andy Wilkinson
08673c0191
Upgrade to Spring Security 5.1.5
...
Closes gh-16354
2019-04-02 19:49:48 +01:00
Andy Wilkinson
39be22906f
Merge branch '2.0.x' into 2.1.x
2019-04-02 19:49:01 +01:00
