Commit Graph
38 Commits
Author SHA1 Message Date
Andy Wilkinson 6a74bb85a3 Merge branch '4.0.x'
Closes gh-50440
2026-05-14 15:03:44 +01:00
Andy Wilkinson add52b6ccd Merge branch '3.5.x' into 4.0.x
Closes gh-50439
2026-05-14 15:02:24 +01:00
Andy Wilkinson a329d7009e Fix graceful shutdown with Jetty
Thanks to the misleadingly named isJetty10 method, 6b9ccdca
unintentionally introduced a call to Future.get() that was only
required with Jetty 9. The method probably should have been called
isAtLeastJetty10.

See gh-50383
2026-05-13 20:25:33 +01:00
Sebastien Tardif 0608a35e0d Remove compatibility code for EOL dependency versions
Remove NoSuchMethodError catch blocks and reflective fallbacks for
dependency versions that are no longer supported

See gh-50383

Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>
2026-05-12 10:08:57 -07:00
Andy Wilkinson 11825b9b17 Merge branch '4.0.x'
Closes gh-49315
2026-02-24 16:27:05 +00:00
Andy Wilkinson 75ccf2cdba Merge branch '3.5.x' into 4.0.x
Closes gh-49314
2026-02-24 16:26:50 +00:00
Andy Wilkinson 809578cd00 Upgrade to Jetty 12.1.6
Closes gh-49133
2026-02-05 17:46:50 +00:00
Andy Wilkinson 4bbb0f731c Upgrade to Jetty 12.1.6
Closes gh-49102
2026-02-05 15:14:08 +00:00
Moritz Halbritter 4b73f38d44 Merge branch '4.0.x'
Closes gh-48990
2026-01-27 13:41:19 +01:00
Moritz Halbritter b38338fe32 Merge branch '3.5.x' into 4.0.x
Closes gh-48989
2026-01-27 13:41:04 +01:00
jdsalasca b1e9fdc3ec Provide support for adding to the mime types that are compressed
Signed-off-by: jdsalasca <jdsalasc@unal.edu.co>

See gh-48930
2026-01-23 09:25:12 +00:00
Phillip Webb 0463b4d0bc Add @AutoConfigureWebServer test annotation
Introduce `@AutoConfigureWebServer` test annotation to support
`@SpringBootTest` with specific classes and a random port.

Closes gh-48815
2026-01-21 19:32:43 -08:00
Moritz Halbritter c9be84af6e Delete web server's temporary directories when the context is closed
Closes gh-9983
2026-01-20 10:16:54 +01:00
Andy Wilkinson 19be9b648f Remove unnecessary jetty-ee11-servlets dependency
Closes gh-48677
2026-01-07 09:21:30 +00:00
Stéphane Nicoll 2e2981bfe4 Merge branch '3.5.x' into 4.0.x
Closes gh-48682
2026-01-06 12:35:34 +01:00
Phillip Webb 2685f4bf29 Change tomcat and jetty runtime modules to starters
Change `spring-boot-tomcat-runtime` and `spring-boot-jetty-runtime`
into starter POMs and reduce the number of dependencies needed for
`spring-boot-tomcat` and `spring-boot-jetty`.

The runtime starters provide only the jars required to run the
embedded server along with the module jar itself (excluding transitive
dependencies) and `spring-boot-webserver` (excluding transitive
dependencies).

The build setup required for an executable jar is slightly different
between Maven and Gradle. For Maven, the regular module is put in the
`provided` scope. For Gradle, the regular module remains in main
configuration and the runtime jar is put in the `providedRuntime`
configuration. The reference documentation has been updated to
show how to configure things if starters are being used.

Manual testing has been performed to ensure that wars build with Maven
and Gradle work with both Tomcat and Jetty in both deployed and
`java -jar` modes.

Closes gh-48175
2025-11-19 21:59:03 -08:00
Stéphane Nicoll 3d23261f87 Merge branch '3.5.x'
Closes gh-48122
2025-11-13 14:55:19 +01:00
Stéphane Nicoll d1e5fe3248 Merge branch '3.5.x'
Closes gh-48106
2025-11-13 10:31:25 +01:00
Andy Wilkinson 0e44f1de42 Merge branch '3.5.x' 2025-11-10 10:39:32 +00:00
Andy Wilkinson aa95282290 Polish @since tags
Closes gh-47779
2025-10-23 12:48:58 +01:00
Andy Wilkinson 635e766aaf Make it easier to create executable and deployable war
Closes gh-46944
2025-10-22 10:13:46 +01:00
Moritz Halbritter 64136a9901 Remove public modifier from referenced configurations in auto-configurations
Closes gh-47715
2025-10-20 15:18:11 +02:00
Brian Clozel 90c656c529 Merge branch '3.5.x'
Closes gh-47718
2025-10-20 14:32:35 +02:00
Moritz Halbritter 5906185fd8 Improve null-safety of module/spring-boot-web-server
See gh-47263
2025-10-15 16:58:20 +02:00
Moritz Halbritter c92617a015 Add nullability annotations to tests in module/spring-boot-jetty
See gh-47263
2025-10-06 13:07:57 +02:00
Brian Clozel 319e462cba Use new Jetty CompressionHandler
Prior to this commit, our Jetty support for compression was using the
`GzipHandler` which is deprecated as of Jetty 12.1.
This commit adds two new dependencies to the module and uses the new
`CompressionHandler` with the `GzipCompression` algorithm.

Closes gh-47134
2025-10-02 22:02:49 +02:00
Andy Wilkinson 51b606e941 Polish 2025-09-24 12:47:09 +01:00
Stéphane Nicoll 3e0e7cde68 Upgrade to Jetty 12.1.1
Closes gh-47131
2025-09-09 09:52:47 +02:00
Phillip WebbandMoritz Halbritter 239f384ac0 Update PropertyMapper to better support nullability
Refactor `PropertyMapper` so that it no longer calls adapter or
predicate methods by default when the source value is `null`. This
effectively makes all default calls the same as using
`alwaysWhenNotNull` in the previous generation of the code.

For the limited times when you do need to deal with `null` values, the
new `always()` method can be used.

For example,

	map.from(source::method).to(destination::method);

Will not call `destination.method(...)` if `source.method()` returns
`null`.

Where as:

	map.from(source::method).always().to(destination::method);

Will call  `destination.method(null)` if `source.method()` returns
`null`.

This update provides clearer semantics for the API and allows for better
JSpecify nullability annotations. It has also simplified much of our
existing property mapper code.

Closes gh-47024

Co-authored-by: Moritz Halbritter <moritz.halbritter@broadcom.com>
2025-09-05 14:43:33 -07:00
Phillip Webb 7140be8751 Rename metrics, observation, and tracing modules
Rename modules to include 'micrometer'.

Closes gh-46925
2025-08-20 16:05:11 -07:00
Brian Clozel 8c0051a02e Drop Undertow support
Spring Framework 7.0 requires a Servlet 6.1 baseline for Servlet containers.

Partial Servlet 6.1 support is available on the `main` Undertow branch,
but there isn't any milestone version available for the undertow 2.4
generation. At this stage of our 4.0 schedule, we think it's safer to drop
Undertow support now.

Closes: gh-46917
2025-08-20 09:30:40 +02:00
Stéphane Nicoll 088ef836c1 Polish "Upgrade to Jetty 12.1.0"
See https://github.com/jetty/jetty.project/issues/13483
See gh-46906
2025-08-19 15:08:31 +02:00
Stéphane Nicoll 4a8dc3efd2 Upgrade to Jetty 12.1.0
Closes gh-46906
2025-08-19 14:29:50 +02:00
Stéphane Nicoll e37dbf81eb Upgrade to Jetty 12.0.24
Closes gh-46741
2025-08-08 16:21:12 +02:00
Moritz Halbritter edc4c9e04d Add nullability annotations to module/spring-boot-jetty
See gh-46587
2025-08-04 11:27:40 +02:00
Moritz Halbritter c0f1f641ce Make auto-configurations final and remove public members
Closes gh-32883
2025-07-29 09:48:49 +02:00
Andy Wilkinson 94215d3fdc Move Threading enum from spring-boot-autoconfigure to spring-boot
The enum itself is not specifically tied to auto-configuration so
spring-boot is a better place for it. The related condition,
`@ConditionalOnThreading`, remains in spring-boot-autoconfigure. This
aligns things with the similar `CloudPlatform` and
`@ConditionalOnCloudPlatform`.

Closes gh-46406
2025-07-11 13:49:41 +01:00
Phillip Webb decc32dde3 Restructure project directories to better fit Gradle
Closes gh-46358
2025-07-10 17:54:08 -07:00