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
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
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
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
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
70f6ada29a
Further reduce repetition in CI pipeline.yml
...
See gh-21716
2020-06-10 17:49:46 -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
3ca58f616f
Polish pipeline YAML
2020-06-10 17:18:52 -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
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
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
Phillip Webb
ce13235e76
Polish
2020-06-10 16:32:45 -07:00
Scott Frederick
7a793a11fb
Merge branch '2.2.x' into 2.3.x
...
Fixes gh-21036 in 2.3.1
2020-06-10 13:55:12 -05:00
Scott Frederick
0fa1d0ef2e
Handle bind exceptions in management context
...
This commit updates the logic for handling binding exceptions in the
management context when it is separate from the application context.
The changes allow the exception details to be visible to
DefaultErrorAttributes without causing the servlet container to
detect an error condition.
Fixes gh-21036
2020-06-10 13:53:04 -05:00
Andy Wilkinson
fdd908d204
Merge branch '2.2.x' into 2.3.x
2020-06-10 19:28:18 +01:00
Andy Wilkinson
3927bd81eb
Upgrade to Spring Integration 5.2.7.RELEASE
...
Closes gh-21778
2020-06-10 19:24:43 +01:00
Andy Wilkinson
4eea0329d3
Upgrade to Spring Data Moore SR8
...
Closes gh-21775
2020-06-10 19:24:12 +01:00
Andy Wilkinson
97639939e1
Merge branch '2.2.x' into 2.3.x
2020-06-10 19:23:13 +01:00
Andy Wilkinson
9cffcf9e5b
Merge branch '2.1.x' into 2.2.x
2020-06-10 19:22:37 +01:00
Andy Wilkinson
d3ea55c175
Merge branch '2.2.x' into 2.3.x
2020-06-10 19:21:47 +01:00
Andy Wilkinson
0fd98f240c
Merge branch '2.1.x' into 2.2.x
2020-06-10 19:21:33 +01:00
Andy Wilkinson
ea55bb32a2
Upgrade to Spring Data Lovelace-SR18
...
Closes gh-21774
2020-06-10 19:20:53 +01:00
Andy Wilkinson
4eba8e2dc2
Upgrade to Spring Integration 5.1.11.RELEASE
...
Closes gh-21777
2020-06-10 19:16:40 +01:00
Andy Wilkinson
0f2f7812d9
Upgrade to Postgresql 42.2.14
...
Closes gh-21871
2020-06-10 19:06:45 +01:00
Andy Wilkinson
a9fffb3920
Upgrade to Netty tcNative 2.0.31.Final
...
Closes gh-21870
2020-06-10 19:06:44 +01:00
Andy Wilkinson
90bd433083
Allow child contexts to configure server properties
...
Previously, HttpMessageConvertersAutoConfiguration registered
ServerProperties. When this happened in a parent context, any child
contexts would skip registering ServerProperties due to its presence
in the parent context. This prevents the child contexts from
configuring their own server properties.
This commit updates HttpMessageConvertersAutoConfiguration to
bind server.servlet.encoding directly instead of enabling
ServerProperties. With ServerProperties no longer enabled in a parent
context, child contexts are now able to configure their own server
properties.
Fixes gh-21789
2020-06-10 18:56:57 +01:00
Stephane Nicoll
6c926f7849
Merge pull request #21769 from tszmytka
...
* pr/21769:
Back-off if a custom ReactiveSessionFactory is defined
Closes gh-21769
2020-06-10 18:13:08 +02:00
Tomek Szmytka
8890660a71
Back-off if a custom ReactiveSessionFactory is defined
...
This commit makes sure that CassandraReactiveDataAutoConfiguration does
not create a reactiveCassandraSessionFactory bean if the user has
provided their own.
See gh-21769
2020-06-10 18:10:05 +02:00
Andy Wilkinson
9ef9b63527
Upgrade to Undertow 2.1.3.Final
...
Closes gh-21865
2020-06-10 17:04:04 +01:00
Andy Wilkinson
9c639b1be2
Upgrade to Tomcat 9.0.36
...
Closes gh-21864
2020-06-10 17:04:04 +01:00