Scott Frederick
c22cbb0e2d
Merge branch '3.1.x'
...
Closes gh-36124
2023-06-29 16:55:19 -06:00
Scott Frederick
0a51c466f4
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36123
2023-06-29 16:54:45 -06:00
Scott Frederick
884489e73a
Apply system properties to RestTemplate HttpClient
...
Fixes gh-35815
2023-06-29 16:31:09 -06:00
Andy Wilkinson
abaade28ea
Merge branch '3.1.x'
...
Closes gh-36122
2023-06-29 18:10:52 +01:00
Andy Wilkinson
e2f8fcf292
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36121
2023-06-29 18:10:33 +01:00
Andy Wilkinson
6effd6061c
Provide hints when template auto-config is excluded
...
Fixes gh-35682
2023-06-29 18:09:30 +01:00
Andy Wilkinson
b32697b3ce
Add support to @ClassPathExclusions for excluding packages
...
Closes gh-36120
2023-06-29 16:53:36 +01:00
Moritz Halbritter
cff26d9843
Merge branch '3.1.x'
...
Closes gh-36113
2023-06-29 11:42:12 +02:00
Moritz Halbritter
20321b5685
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36112
2023-06-29 11:39:20 +02:00
Moritz Halbritter
2b398827de
Add "baggage" section to tracing docs
...
Closes gh-34977
2023-06-29 11:30:58 +02:00
Scott Frederick
7d019c612e
Merge branch '3.1.x'
2023-06-28 15:12:06 -06:00
Scott Frederick
c2146deeda
Merge branch '3.0.x' into 3.1.x
2023-06-28 15:11:58 -06:00
Scott Frederick
80e72836ef
Disable Paketo builder native system test on Java 20
...
See gh-35897
2023-06-28 15:11:32 -06:00
Andy Wilkinson
2390c6c1b9
Merge branch '3.1.x'
...
Closes gh-36105
2023-06-28 14:19:49 +01:00
Andy Wilkinson
3ef1738a5e
Remove containers after use in Docker Compose integration tests
...
Closes gh-36104
2023-06-28 14:12:39 +01:00
Andy Wilkinson
0b39429f96
Remove containers after use in Docker Compose integration tests
...
Closes gh-36104
2023-06-28 14:11:37 +01:00
Andy Wilkinson
b5a131d966
Merge branch '3.1.x'
...
Closes gh-36100
2023-06-27 20:31:16 +01:00
Andy Wilkinson
ba8b1717fb
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36099
2023-06-27 20:30:47 +01:00
Andy Wilkinson
79cd3a027a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36098
2023-06-27 20:30:24 +01:00
Andy Wilkinson
9e1f2c4257
Tolerate Flway 9.20
...
Closes gh-36029
2023-06-27 20:22:24 +01:00
Andy Wilkinson
6156db2b2e
Merge branch '3.1.x'
2023-06-27 20:14:14 +01:00
Andy Wilkinson
28af839dff
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36097
2023-06-27 20:13:57 +01:00
Andy Wilkinson
b3c321e40c
Polish javadoc of RestTemplateBuilder.requestFactory(Function)
...
Closes gh-36046
2023-06-27 20:13:11 +01:00
Andy Wilkinson
d7ec5a3a30
Merge branch '3.1.x'
2023-06-27 20:10:56 +01:00
Andy Wilkinson
a1a336ddd8
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36095
2023-06-27 20:08:39 +01:00
Andy Wilkinson
b2bc114d6f
Update javadoc to link to non-deprecated ConstructorBinding
...
Closes gh-36045
2023-06-27 20:08:03 +01:00
Andy Wilkinson
f0e1fdfd11
Merge branch '3.1.x'
...
Closes gh-36014
2023-06-27 14:33:18 +01:00
Andy Wilkinson
4d6c3bd804
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36013
2023-06-27 14:32:17 +01:00
Andy Wilkinson
97773e5271
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36011
2023-06-27 14:30:11 +01:00
Andy Wilkinson
15d6858db9
Upgrade CI images to ubuntu:jammy-20230605
...
Closes gh-36012
2023-06-27 14:28:44 +01:00
Andy Wilkinson
2011c95c75
Merge branch '3.1.x'
...
Closes gh-36093
2023-06-27 14:24:41 +01:00
Andy Wilkinson
d4031f3424
Merge pull request #36077 from eddumelendez
...
* gh-36077:
Use Selenium's bom
Closes gh-36077
2023-06-27 14:24:29 +01:00
Eddú Meléndez
29ebaab0cb
Use Selenium's bom
...
See gh-36077
2023-06-27 14:24:06 +01:00
Andy Wilkinson
98d459d76c
Revert "Merge branch '3.1.x'"
...
See gh-36092
2023-06-27 14:16:20 +01:00
Andy Wilkinson
6851904651
Merge branch '3.1.x'
...
Closes gh-36092
2023-06-27 14:03:09 +01:00
Andy Wilkinson
9a57611ef5
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36091
2023-06-27 14:02:57 +01:00
Andy Wilkinson
ffbef7bb80
Test server.max-http-request-header-size with Undertow
...
Closes gh-36047
2023-06-27 13:50:04 +01:00
Andy Wilkinson
3da43404da
Merge branch '3.1.x'
...
Closes gh-36090
2023-06-27 11:18:38 +01:00
Andy Wilkinson
d90223a317
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36089
2023-06-27 11:18:25 +01:00
Andy Wilkinson
156bcb1dea
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36088
2023-06-27 11:18:13 +01:00
Andy Wilkinson
e8cbb9ae1b
Stop using deprecated JavaExec property in spring-boot-smoke-test-ant
...
Closes gh-36086
2023-06-27 11:17:50 +01:00
Andy Wilkinson
c038d27c49
Merge branch '3.1.x'
...
Closes gh-36085
2023-06-27 11:11:34 +01:00
Andy Wilkinson
b4d7e1837e
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36084
2023-06-27 11:11:20 +01:00
Andy Wilkinson
774993b510
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36083
2023-06-27 11:10:51 +01:00
Andy Wilkinson
0fdaba2487
Make TestSliceMetadata depend on source set's processResources task
...
Closes gh-36082
2023-06-27 11:10:30 +01:00
Andy Wilkinson
3bf1b76770
Merge branch '3.1.x'
...
Closes gh-36080
2023-06-27 09:41:34 +01:00
Andy Wilkinson
b20f2a76c6
Merge branch '3.0.x' into 3.1.x
...
Closes gh-36079
2023-06-27 09:41:19 +01:00
Andy Wilkinson
7d73b07161
Merge branch '2.7.x' into 3.0.x
...
Closes gh-36078
2023-06-27 09:41:07 +01:00
Andy Wilkinson
92e488345d
Upgrade to nohttp 0.0.11
...
Closes gh-36074
2023-06-27 09:40:12 +01:00
Andy Wilkinson
dbb24286ff
Separate stopping and destruction so web server can be restarted
...
Previously, when a Servlet-based WebServer was stopped it would also
stop the ServletContext. This led to problems as Tomcat and Undertow
would then not allow a restart. Jetty would allow a restart but
duplicate servlet registrations would then be attempted.
This commit modifies the WebServer lifecycle to separate stopping
and destruction for both servlet and reactive web servers. This
allows a WebServer's stop() implementation to leave some components
running so that they can be restarted. To completely shut down a
WebServer destroy() must now be called.
Both Tomcat and Jetty WebServers have been updated to stop their
network connections when stop() is called but leave other components
running. This works with both servlet and reactive web servers.
Note that an Undertow-based Servlet web server does not support
stop and restart. Once stopped, a Servlet Deployment cannot be
restarted and it does not appear to be possible to separate the
lifecycle of its network connections and a Servlet deployment.
Reactor Netty and Undertow-based reactive web servers can now also
be stopped and then restarted. Calling stop() stops the whole server
but this does not cause a problem as there's no (application-exposed)
ServletContext involved. There may be room to optimize this in the
future if the need arises.
Closes gh-34955
2023-06-26 20:58:59 +01:00