Commit Graph

9576 Commits

Author SHA1 Message Date
Phillip Webb bb7936a000 Merge branch '2.3.x'
Closes gh-21896
2020-06-11 14:52:34 -07:00
Phillip Webb 069d2769f4 Reinstate disabled Reactor Netty test
Reinstate test now that we are on a reactor-netty releases that fixes
reactor/reactor-netty issue 1093.

Closes gh-21437
2020-06-11 14:52:21 -07:00
Phillip Webb 82abcd3043 Merge branch '2.3.x' 2020-06-11 13:26:44 -07:00
Phillip Webb 2a37b2e258 Refine PropertiesLauncher close logic
Further attempt to fix Windows file issues.

See gh-21575
2020-06-11 13:25:56 -07:00
Phillip Webb 3892f4402a Merge branch '2.3.x'
Closes gh-21895
2020-06-11 12:32:41 -07:00
Phillip Webb 1e7da4d3ca Allow digest builder references
Update `BuildRequest` to also allow digest based references.

Closes gh-21879
2020-06-11 12:31:29 -07:00
Phillip Webb 866ebf7c13 Merge branch '2.3.x' 2020-06-11 12:26:42 -07:00
Phillip Webb 8a249daf1a Refactor PropertiesLauncher so jars can be closed
Refactor the internals of `PropertiesLauncher` so that opened jar files
are tracked and can be closed after a test completes.

See gh-21575
2020-06-11 12:26:08 -07:00
Madhura Bhave fc9760ba49 Merge branch '2.3.x'
Closes gh-21894
2020-06-11 11:49:06 -07:00
dreis2211 469dfc285b Fix deprecation in NettyRSocketServerFactoryTests
See gh-21872
2020-06-11 11:46:11 -07:00
Scott Frederick 9d9a501b17 Merge branch '2.3.x'
Closes gh-21892
2020-06-11 11:55:20 -05:00
Scott Frederick 7a2939f129 Use non-blocking I/O for Docker API
This commit changes the NamedPipeSocket used for communication with
a local Docker daemon to use a non-blocking AsynchronousByteChannel
instead of a blocking RandomAccessFile, modeled after a similar
change to the docker-java project. This eliminates the potential for
a blocking call to hang indefinitely.

Fixes gh-21672
2020-06-11 11:53:52 -05:00
Andy Wilkinson 6ac100583c Merge branch '2.3.x'
Closes gh-21891
2020-06-11 17:36:50 +01:00
Andy Wilkinson d347346a93 Upgrade to Spring Asciidoctor Extensions 0.4.3.RELEASE
Pick up the workaround for the AsciidoctorJ bug that prevents the
configprops macro's attributes from being parsed. The lack of parsing
meant that the envvar format was being lost and properties were being
written in the canonical form instead.

Closes gh-21794
2020-06-11 17:36:25 +01:00
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
Stephane Nicoll a74afc104c Upgrade to Spring Batch 4.2.4
Closes gh-21784
2020-06-11 10:36:36 +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
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
Scott Frederick 9ae6816785 Merge branch '2.3.x'
Closes gh-21874
2020-06-10 13:57:06 -05: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 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 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 dd93b523a4 Merge branch '2.3.x'
Closes gh-21869
2020-06-10 19:02:29 +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 a8da75a396 Merge branch '2.3.x'
Closes gh-21867
2020-06-10 18:13:57 +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
Andy Wilkinson 3e5fcee187 Upgrade to Spring Security 5.3.3.RELEASE
Closes gh-21863
2020-06-10 17:04:04 +01:00
Andy Wilkinson 52975e4480 Upgrade to Spring AMQP 2.2.7.RELEASE
Closes gh-21862
2020-06-10 17:04:04 +01:00
Andy Wilkinson 25cc16a54c Upgrade to RSocket 1.0.1
Closes gh-21861
2020-06-10 17:04:03 +01:00
Andy Wilkinson df42b3ac39 Upgrade to R2DBC Bom Arabba-SR4
Closes gh-21860
2020-06-10 17:04:03 +01:00
Andy Wilkinson 6e68101b9f Upgrade to Postgresql 42.2.13
Closes gh-21859
2020-06-10 17:04:03 +01:00
Andy Wilkinson bf83e237ea Upgrade to OkHttp3 3.14.9
Closes gh-21858
2020-06-10 17:04:03 +01:00