Commit Graph

27102 Commits

Author SHA1 Message Date
Stephane Nicoll
ca44e83279 Merge branch '2.3.x'
Closes gh-21802
2020-06-11 11:22:37 +02:00
Stephane Nicoll
ca5afb6e90 Fix flaky integration test
Closes gh-21487
2020-06-11 11:20:49 +02:00
Spring Buildmaster
5abca71056 Next development version (v2.1.16.BUILD-SNAPSHOT) 2020-06-11 09:14:56 +00:00
Stephane Nicoll
e7ad3b6157 Merge branch '2.3.x' 2020-06-11 10:37:50 +02:00
Stephane Nicoll
a74afc104c Upgrade to Spring Batch 4.2.4
Closes gh-21784
2020-06-11 10:36:36 +02:00
Stephane Nicoll
e892bc1ff8 Merge branch '2.2.x' into 2.3.x 2020-06-11 10:35:49 +02:00
Stephane Nicoll
9af5f70b75 Upgrade to Spring Batch 4.2.4
Closes gh-21783
2020-06-11 10:34:50 +02:00
Stephane Nicoll
74ab92843e Merge branch '2.3.x' 2020-06-11 09:59:44 +02:00
Stephane Nicoll
cbd5b77fa4 Upgrade to Spring Data Neumann-SR1
Closes gh-21776
2020-06-11 09:58:35 +02:00
Stephane Nicoll
122f5afd42 Upgrade to Spring Integration 5.3.1
Closes gh-21779
2020-06-11 09:58:02 +02:00
Stephane Nicoll
760aec3136 Upgrade to Spring Kafka 2.5.2
Closes gh-21782
2020-06-11 09:57:27 +02:00
Stephane Nicoll
43ef49e2e4 Merge branch '2.3.x' 2020-06-11 08:56:54 +02:00
Stephane Nicoll
92ef361a4a Merge branch '2.2.x' into 2.3.x 2020-06-11 08:56:20 +02:00
Stephane Nicoll
e64bfb80e4 Upgrade to Postgresql 42.2.14
Closes gh-21888
2020-06-11 08:55:47 +02:00
Stephane Nicoll
664436a3d6 Upgrade to Spring Kafka 2.3.9
Closes gh-21781
2020-06-11 08:54:52 +02:00
Stephane Nicoll
028ecfb147 Merge branch '2.1.x' into 2.2.x 2020-06-11 08:54:01 +02:00
Stephane Nicoll
49ba5dc6bc Upgrade to Postgresql 42.2.14
Closes gh-21887
2020-06-11 08:44:30 +02:00
Stephane Nicoll
c496f2401f Upgrade to Netty Tcnative 2.0.31.Final
Closes gh-21886
2020-06-11 08:44:29 +02:00
Stephane Nicoll
7dee9e34b5 Upgrade to Spring Kafka 2.2.14
Closes gh-21780
2020-06-11 08:43:39 +02:00
Phillip Webb
087c62d34b Merge branch '2.3.x' 2020-06-10 22:14:44 -07:00
Phillip Webb
3b71403b99 Merge branch '2.2.x' into 2.3.x 2020-06-10 22:14:33 -07:00
Phillip Webb
ac197be815 Fix checkstyle issue 2020-06-10 22:14:09 -07:00
Phillip Webb
aecd13bb9b Merge branch '2.3.x' 2020-06-10 22:06:03 -07:00
Phillip Webb
7e5d6bafa8 Merge branch '2.2.x' into 2.3.x 2020-06-10 22:05:40 -07:00
Phillip Webb
3f36f6ea47 Rollback to Spring Batch 4.2.2
See gh-21885
2020-06-10 22:04:32 -07:00
Phillip Webb
02bfc9d30a Polish 2020-06-10 21:50:17 -07:00
Madhura Bhave
f96a2f2b83 Merge branch '2.3.x'
Closes gh-21881
2020-06-10 18:52:32 -07:00
Madhura Bhave
83485e625d Merge branch '2.2.x' into 2.3.x
Closes gh-21880
2020-06-10 18:50:41 -07:00
Madhura Bhave
4e014da9e9 Return all loggers for Log4j2
This commit aligns log4j2's behavior with logback such that loggers
with a null configuredLevel are also returned by the actuator endpoint.

Fixes gh-20037
2020-06-10 18:48:14 -07:00
Madhura Bhave
92ce94b3d8 Align default log levels for Log4j2 and Logback
Fixes gh-21293
2020-06-10 18:48:01 -07:00
Phillip Webb
14de4b888c Merge branch '2.3.x' 2020-06-10 17:49:59 -07:00
Phillip Webb
70f6ada29a Further reduce repetition in CI pipeline.yml
See gh-21716
2020-06-10 17:49:46 -07:00
Phillip Webb
22bd8258f5 Merge branch '2.3.x' 2020-06-10 17:40:58 -07:00
Phillip Webb
c34bcd496d Merge branch '2.2.x' into 2.3.x 2020-06-10 17:40:40 -07:00
Phillip Webb
3fe4fb1373 Merge branch '2.1.x' into 2.2.x 2020-06-10 17:33:48 -07:00
Phillip Webb
418859fab6 Further reduce repetition in CI pipeline.yml
See gh-21716
2020-06-10 17:25:40 -07:00
Phillip Webb
42dfc470b3 Merge branch '2.3.x' 2020-06-10 17:19:18 -07:00
Phillip Webb
3ca58f616f Polish pipeline YAML 2020-06-10 17:18:52 -07:00
Phillip Webb
e1113cae03 Merge branch '2.3.x' 2020-06-10 17:15:35 -07:00
Phillip Webb
e08f70c007 Merge branch '2.2.x' into 2.3.x 2020-06-10 17:15:22 -07:00
Phillip Webb
da09e227c7 Merge branch '2.1.x' into 2.2.x 2020-06-10 17:14:37 -07:00
Phillip Webb
0957c7460b Polish pipeline YAML 2020-06-10 17:06:39 -07:00
Phillip Webb
1c3cf22064 Merge branch '2.3.x' 2020-06-10 16:44:52 -07:00
Phillip Webb
4e88150afb Merge branch '2.2.x' into 2.3.x 2020-06-10 16:44:40 -07:00
Phillip Webb
f39a3f963b Merge branch '2.1.x' into 2.2.x 2020-06-10 16:44:22 -07:00
Phillip Webb
7e64f9709a Use milestone as docker tag
Update the pipeline YAML to use ((milestone)) rather than ((branch))
when tagging docker images.

See gh-21716
2020-06-10 16:43:09 -07:00
Phillip Webb
d7a90ff770 Merge branch '2.3.x'
Closes gh-21878
2020-06-10 16:40:51 -07:00
Phillip Webb
8fb3a31ab2 Merge branch '2.2.x' into 2.3.x
Closes gh-21877
2020-06-10 16:34:58 -07:00
Phillip Webb
9aa8a073d6 Merge branch '2.1.x' into 2.2.x
Closes gh-21876
2020-06-10 16:33:34 -07:00
Phillip Webb
3a8d173845 Reduce repetition in CI pipeline.yml
Use YAML anchors and aliases to reduce the amount of repetition
in our CI pipeline YAML.

Closes gh-21716
2020-06-10 16:32:45 -07:00