Phillip Webb
c7746fba3b
Allow promote script to be run again
2019-04-03 21:27:50 -07:00
Phillip Webb
d6496c00b9
Fixup promote script
2019-04-03 20:33:41 -07:00
Spring Buildmaster
15c9ca7455
Next development version (v2.1.5.BUILD-SNAPSHOT)
2019-04-04 03:16:47 +00:00
Phillip Webb
617f97f788
Fix checkstyle violation
2019-04-03 17:33:34 -07:00
Phillip Webb
ec094cdfda
Increase timeout for promote script
...
Increase the timeout used when checking if artifacts have landed in
Bintray from 20m to 40m. Also added some additional protection against
the curl command failing.
Closes gh-16443
2019-04-03 16:35:49 -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
Madhura Bhave
8ad9bfe29b
Merge branch '2.0.x' into 2.1.x
2019-04-03 13:54:35 -07:00
Spring Buildmaster
8e3cbd9a2f
Next development version (v2.0.10.BUILD-SNAPSHOT)
2019-04-03 15:04:03 +00: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
3c058585bf
Upgrade to Micrometer 1.1.4
...
Close gh-16425
2019-04-03 13:54:41 +02:00
Stephane Nicoll
6a4e89dc0f
Merge branch '2.0.x' into 2.1.x
2019-04-03 13:13:01 +02:00
Stephane Nicoll
1421ca7612
Polish
2019-04-03 13:12:37 +02:00
Stephane Nicoll
2eaaff2e2f
Merge branch '2.0.x' into 2.1.x
2019-04-03 12:58:16 +02:00
Stephane Nicoll
dd1bdea048
Merge branch '1.5.x' into 2.0.x
2019-04-03 12:57:35 +02:00
Stephane Nicoll
0d256da068
Fixup version numbers following release
2019-04-03 12:56:41 +02:00
Andy Wilkinson
961b0307d6
Upgrade to Netty Tcnative 2.0.24.Final
...
Closes gh-16429
2019-04-03 11:40:21 +01:00
Andy Wilkinson
67bb390246
Merge branch '2.0.x' into 2.1.x
2019-04-03 11:39:44 +01:00
Andy Wilkinson
1db848af0d
Upgrade to Solr 6.6.6
...
Closes gh-16428
2019-04-03 11:38:16 +01:00
Spring Buildmaster
ca3a864565
Next Development Version
2019-04-03 10:34:44 +00: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
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
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
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
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
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
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
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
eff2f92c48
Fix formatting following formatter update
2019-04-02 15:55:34 -07:00
Madhura Bhave
ddc52502f5
Document @MockBean behavior during context refresh
...
Closes gh-16333
2019-04-02 15:50:51 -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