Commit Graph

33572 Commits

Author SHA1 Message Date
Stephane Nicoll 120d85d388 Merge branch '2.5.x' 2021-08-05 07:32:12 +02:00
Stephane Nicoll 80c79cea91 Upgrade Java 16 version in CI image
Closes gh-27565
2021-08-05 07:31:50 +02:00
Stephane Nicoll ce9c1d842c Upgrade Java 11 version in CI image
Closes gh-27569
2021-08-05 07:31:19 +02:00
Stephane Nicoll 8e8c561971 Upgrade Java 8 version in CI image
Closes gh-27571
2021-08-05 07:30:50 +02:00
Stephane Nicoll fce0cdcfe2 Upgrade CI to Docker 20.10.8
Closes gh-27564
2021-08-05 07:30:15 +02:00
Stephane Nicoll 995b8b268c Merge branch '2.4.x' into 2.5.x 2021-08-05 07:29:12 +02:00
Stephane Nicoll f5a9ea0123 Upgrade Java 16 version in CI image
Closes gh-27572
2021-08-05 07:28:38 +02:00
Stephane Nicoll d03f9e2f1a Upgrade Java 11 version in CI image
Closes gh-27566
2021-08-05 07:27:08 +02:00
Stephane Nicoll 8a261af8d7 Upgrade Java 8 version in CI image
Closes gh-27567
2021-08-05 07:26:34 +02:00
Stephane Nicoll a93688ee17 Upgrade CI to Docker 20.10.8
Closes gh-27573
2021-08-05 07:26:00 +02:00
Stephane Nicoll 126234c903 Merge branch '2.5.x' 2021-08-04 09:25:37 +02:00
Stephane Nicoll 9826304e29 Merge branch '2.4.x' into 2.5.x
Closes gh-27557
2021-08-04 09:25:25 +02:00
Stephane Nicoll e7b60678dc Merge pull request #27537 from izeye
* pr/27537:
  Use deprecated mainClassName in Gradle test

Closes gh-27537
2021-08-04 09:24:10 +02:00
izeye 9f44cefc56 Use deprecated mainClassName in Gradle test
See gh-27537
2021-08-04 09:23:52 +02:00
Stephane Nicoll e86ba076ec Merge branch '2.5.x'
Closes gh-27556
2021-08-04 08:56:02 +02:00
Stephane Nicoll a9ea8d95f3 Merge branch '2.4.x' into 2.5.x
Closes gh-27555
2021-08-04 08:55:51 +02:00
Stephane Nicoll b85f0ee33d Merge pull request #27538 from wuwen5
* pr/27538:
  Remove dead code in DefaultErrorAttributes

Closes gh-27538
2021-08-04 08:55:38 +02:00
wuwen 46c47dcd29 Remove dead code in DefaultErrorAttributes
See gh-27538
2021-08-04 08:45:30 +02:00
Brian Clozel 8b3bea173c Configure WebTestClient for @AutoConfigureMockMvc tests
As of Spring Framework 5.3, `WebTestClient` can now be configured on top
of `MockMvc` for testing Spring MVC applications in a mock environment.

Prior to this commit, `WebTestClient` would be already configured for
WebFlux mock setups with `@AutoConfigureWebTestClient` or live servers
(for both MVC and WebFlux apps).

This commit enhances the `@AutoConfigureWebMvc` support so that a
`WebTestClient` instance is auto-configured if the spring-webflux
dependency is present on the classpath.

Closes gh-23067
2021-08-03 09:43:44 +02:00
Brian Clozel a1fe82c3dd Fix formatting 2021-08-02 16:54:25 +02:00
Brian Clozel 6be4b34856 Merge pull request #26037 from bono007
* gh-26037_spring_webflux_multipart_configprops:
  Polish "Add spring.webflux.multipart configuration properties"
  Add spring.webflux.multipart configuration properties

Closes gh-26037
2021-08-02 15:43:16 +02:00
Brian Clozel e48cb12252 Polish "Add spring.webflux.multipart configuration properties"
See gh-26254
2021-08-02 15:40:42 +02:00
bono007 4c0b6304ac Add spring.webflux.multipart configuration properties
See gh-26254
2021-08-02 15:40:42 +02:00
Scott Frederick dc5bf0368d Merge branch '2.5.x'
Closes gh-27536
2021-07-30 13:51:25 -05:00
Scott Frederick f60d998ea1 Merge branch '2.4.x' into 2.5.x
Closes gh-27535
2021-07-30 13:50:56 -05:00
Scott Frederick 5d793afcb5 Prevent hanging when deleting Docker builder container after exception
An exception being thrown while the Maven plugin is uploading the app
archive bits to an ephemeral builder container would leave the
interaction with the Docker daemon in a state that caused further
interaction with the daemon (such as deleting the ephemeral builder)
to hang indefinitely. This commit cleans up the connection on an
exception to prevent this condition.

Fixes gh-27515
2021-07-30 13:41:40 -05:00
Andy Wilkinson 64c0eceec7 Add support for dumping the heap on OpenJ9
Closes gh-26466
2021-07-30 15:35:59 +01:00
Andy Wilkinson e30bf0e3e5 Merge branch '2.5.x'
Closes gh-27528
2021-07-29 18:47:40 +01:00
Andy Wilkinson 43d623e696 Merge branch '2.4.x' into 2.5.x
Closes gh-27527
2021-07-29 18:47:31 +01:00
Andy Wilkinson 7eb5f35f2f Make WebTestClient creation back off when no HTTP client available
Fixes gh-27520
2021-07-29 18:45:53 +01:00
Andy Wilkinson 2482607a06 Merge branch '2.5.x'
Closes gh-27526
2021-07-29 17:42:40 +01:00
Andy Wilkinson 533bb24b55 Merge branch '2.4.x' into 2.5.x
Closes gh-27525
2021-07-29 17:42:26 +01:00
Andy Wilkinson ad2d9c0ab1 Customize Cassandra's configuration to reduce container startup time
Closes gh-27524
2021-07-29 17:33:56 +01:00
Andy Wilkinson cdad8e2b7f Merge branch '2.5.x' 2021-07-29 17:28:38 +01:00
Andy Wilkinson 85054723f0 Reinstate GradleProjectBuilder for compatibility with JDK17-ea32
See gh-27521
2021-07-29 17:22:59 +01:00
Andy Wilkinson d9c9382c93 Revert "Revert "Drop JDK 17 system tests until Gradle supports Java 17""
This reverts commit 166f7a627a.

See gh-27523 in 2.6.x
2021-07-29 12:54:47 +01:00
Andy Wilkinson 166f7a627a Revert "Drop JDK 17 system tests until Gradle supports Java 17"
This reverts commit b99b7b1077.

Closes gh-27523
2021-07-29 12:33:41 +01:00
Andy Wilkinson 23c4674352 Merge branch '2.5.x'
Closes gh-27522
2021-07-29 12:24:54 +01:00
Andy Wilkinson ca5af2d456 Test our Gradle plugin against Gradle 7.2-rc-1
Closes gh-27521
2021-07-29 12:05:14 +01:00
Stephane Nicoll 5f2e1f773d Upgrade Ubuntu version in CI images
Closes gh-27516
2021-07-29 07:13:35 +02:00
Stephane Nicoll fa3a28bf72 Merge branch '2.5.x' 2021-07-29 07:12:46 +02:00
Stephane Nicoll f2f4a40a2d Upgrade Ubuntu version in CI images
Closes gh-27517
2021-07-29 07:12:27 +02:00
Stephane Nicoll dc07e67e6e Merge branch '2.4.x' into 2.5.x 2021-07-29 07:11:33 +02:00
Stephane Nicoll 08006c2894 Upgrade Ubuntu version in CI images
Closes gh-27519
2021-07-29 07:11:14 +02:00
Stephane Nicoll e02da55d6d Merge branch '2.3.x' into 2.4.x 2021-07-29 07:10:31 +02:00
Stephane Nicoll 9c71e92c37 Upgrade Ubuntu version in CI images
Closes gh-27518
2021-07-29 07:10:13 +02:00
Andy Wilkinson 1bca2bbc85 Merge branch '2.5.x'
Closes gh-27511
2021-07-27 14:37:30 +01:00
Andy Wilkinson 30f63cc0cf Merge branch '2.4.x' into 2.5.x
Closes gh-27510
2021-07-27 14:37:16 +01:00
Andy Wilkinson ade922baec Stabilize LiveReloadServerTests
Closes gh-27503
2021-07-27 14:36:31 +01:00
Andy Wilkinson e265825653 Merge branch '2.5.x'
Closes gh-27506
2021-07-27 11:03:00 +01:00