Commit Graph
59 Commits
Author SHA1 Message Date
Scott Frederick cbbe588d1f Retain SSL host config customizations when reloading SSL bundles
Tomcat's SSL configuration is applied to an `SSLHostConfig` for each
host name. When an SSL bundle was updated, a new `SSLHostConfig` was
created and used to replace the existing one for that host name,
discarding any customizations that had been applied to it (for example
by a `TomcatConnectorCustomizer`).

Reuse the existing `SSLHostConfig` for the host name when one is
present, applying the updated bundle to it rather than replacing it. The
existing `SSLHostConfigCertificate` is also reused, as adding a second
certificate with an undefined type to an `SSLHostConfig` is rejected by
Tomcat.

See gh-51290

Signed-off-by: Scott Frederick <scottyfred@gmail.com>
2026-08-25 18:52:34 -07:00
Andy Wilkinson ee059ae3ca Add CI for Java 27
Closes gh-51423
2026-08-24 14:52:36 +01:00
Stéphane Nicoll b9ebff0084 Use RestClient in tests and infrastructure code
Closes gh-51120
2026-07-24 15:10:43 +02:00
Vinod Kumar 92bd807edd Add WAR TLD loader integration test
See gh-50418

Signed-off-by: Vinod Kumar <codingkiddo@gmail.com>
2026-06-24 20:33:04 +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
Phillip Webb 67959c1309 Fix spring-boot-loader-tests-signed-jar-rsa forward merge issue
See gh-50292
2026-05-05 12:10:31 -07:00
Phillip Webb 031cf98084 Merge branch '3.5.x' into 4.0.x
Closes gh-50297
2026-05-05 11:21:40 -07:00
Andy Wilkinson cd88bf71f5 Merge branch '3.5.x' into 4.0.x
Closes gh-50017
2026-04-10 12:28:27 +01:00
Stéphane Nicoll 456a104f60 Merge branch '3.5.x' into 4.0.x
Closes gh-49525
2026-03-09 14:06:20 +01:00
Andy Wilkinson 278de05619 Make a Java 26 container image available to LoaderIntegrationTests
See gh-49189
2026-02-11 15:29:39 +00:00
Andy Wilkinson 3873f25eee Merge branch '3.5.x'
Closes gh-48500
2025-12-11 14:57:29 +00:00
Andy Wilkinson 3becdc7d47 Move server.error properties to spring.web.error
Closes gh-48201
2025-11-20 11:55:23 +00:00
Stéphane Nicoll d1e5fe3248 Merge branch '3.5.x'
Closes gh-48106
2025-11-13 10:31:25 +01:00
Phillip WebbandAndy Wilkinson 619454548b Restore support for Jersey
Restore support for Jersey now that it supports JAX-RS 4.

Closes gh-47967

Co-authored-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2025-11-05 10:51:08 -08:00
Stéphane Nicoll 724f706f34 Move auto-configuration for WebTestClient in autoconfigure
Closes gh-47892
2025-10-31 12:05:25 +01:00
Stéphane Nicoll 6b3edf88b9 Document AssertJ support for RestTestClient
Closes gh-47881
2025-10-31 10:13:44 +01:00
Andy Wilkinson 4e86ff060f Adapt to deprecations in latest Framework snaphots
See gh-47850
2025-10-29 11:34:30 +00:00
Andy Wilkinson c0c66e2ac3 Update SNI test app to use spring-boot-starter-webmvc 2025-10-23 17:16:45 +01:00
Andy Wilkinson 8978d8c359 Avoid using deprecated spring-boot-starter-web 2025-10-23 16:34:54 +01:00
Andy Wilkinson 81aa674adb Remove support for embedded launch scripts
Closes gh-47666
2025-10-20 20:03:14 +01:00
Yanming Zhou 609b0b444e Use JsonMapper instead of ObjectMapper where feasible
See gh-47503

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-10-20 13:16:52 +02:00
Phillip Webb 183d765b4d Support actuator with Jackson 2 only
See gh-47688
2025-10-17 13:17:19 -07:00
Stéphane Nicoll adb6481c62 Polish "Upgrade to Testcontainers 2.0.1"
See gh-47664
2025-10-17 17:23:35 +02:00
Eddú Meléndez 7f64615690 Upgrade to Testcontainers 2.0.1
* Update dependencies name
  Modules are prefixed with `testcontainers-`
* Update container classes
  Container classes are under `org.testcontainers.<module-name>` package

See gh-47664

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>
2025-10-17 17:11:24 +02:00
Phillip Webb cba4f7ae21 Consistently package mappings and exchanges classes
Mirror the package names used in actuator for classes to support
mappings and exchanges in `spring-boot-servlet`, `spring-boot-webmvc`
and `spring-boot-webflux`.

Closes gh-46217
2025-10-15 15:56:41 -07:00
Stéphane Nicoll 712389b2ea Merge branch '3.5.x' 2025-10-15 08:45:03 +02:00
Phillip Webb 34e0382858 Move actuator heath code to spring-boot-health
Closes gh-46357
2025-10-14 21:51:24 -07:00
Phillip Webb ddf26080d6 Rationalize endpoint packages
Use consistent packages for endpoints and endpoint
auto-configuration.

Closes gh-47606
2025-10-13 18:37:59 -07:00
Andy Wilkinson 5afbec7033 Correct package in spring-boot-resttestclient to match module name
See gh-46356
See gh-47322
2025-10-10 12:50:48 +01:00
Andy WilkinsonandPhillip Webb 9eb05ebb10 Create spring-boot-resttestclient and spring-boot-webtestclient modules
Create `spring-boot-resttestclient` and `spring-boot-webtestclient`
modules to hold test client auto-configuration and `TestRestTemplate`
code.

Previous these classes were contained in `spring-boot-resetclient-test`
and `spring-boot-webclient-test` which was incorrect since the `-test`
modules should hold code need to test the given modules, not supporting
test classes.

See gh-46356

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2025-10-09 22:12:39 -07:00
Andy Wilkinson 16d8878cd8 Support embedded web environment with @AutoConfigureWebTestClient
Simplify `WebTestClient` testing support by removing the direct
context customizer in favor of using `@AutoConfigureWebTestClient`.

See gh-46356
2025-10-09 22:11:44 -07:00
Andy Wilkinson 3bf53f8bf5 Introduce @AutoConfigureTestRestTemplate
Add `@AutoConfigureTestRestTemplate` which can be used to
auto-configure a `TestRestTemplate`.

See gh-46356
2025-10-09 22:09:36 -07:00
Stéphane Nicoll 533544d8fc Polish 2025-10-07 10:39:54 +02:00
Andy Wilkinson 1ebc557bd5 Consistent configuration of test repository URLs 2025-10-06 23:09:27 +01:00
Andy Wilkinson 2eaad0585c Consistent configuration of docker-test-maven-repository 2025-10-06 22:21:36 +01:00
Andy Wilkinson 46022d2a4e Third time lucky fixing the Windows build?
See 44099d3d, c1924f2, a5dbc5b
2025-10-06 20:19:03 +01:00
Andy Wilkinson a5dbc5bb22 Alternative attempt at fixing the Windows build
See 44099d3d, c1924f2
2025-10-06 19:48:06 +01:00
Andy Wilkinson c1924f2fcd Try to fix Windows build
See 44099d3d
2025-10-06 19:32:53 +01:00
Andy Wilkinson 44099d3d21 Build with Gradle 9.1.0 2025-10-06 18:30:48 +01:00
Phillip Webb 2a521ce4e9 Remove spring-boot-web-server-test module
Remove the `spring-boot-web-server-test` module, adding
`SpringBootTestRandomPortContextCustomizerFactory` to
`spring-boot-web-server` as a replacement for
`SpringBootTestRandomPortApplicationListener`.

See gh-46356
See gh-47322
2025-10-01 21:54:54 -07:00
Phillip Webb 279de9e807 Migrate to BaseUrlUriTemplateHandler
Remove `LocalHostUriTemplateHandler` and migrate existing code to use
`BaseUrlUriTemplateHandler`.

See gh-46356
See gh-47322
2025-10-01 21:54:32 -07:00
Phillip Webb 97c89b480f Move @LocalServerPort and @LocalManagementServerPort
Move `@LocalServerPort` and `@LocalManagementServerPort` back to
`spring-boot-test`. The should help reduce upgrade pain since these
annotations are fairly commonly used. It also removes the need for
depending on `spring-boot-webserver-test`.

This is slight compromise with the module structure, since the
web-server module usually contributes the properties referenced
by the annotations.

See gh-46356
See gh-47322
2025-10-01 21:53:58 -07:00
Phillip Webb bba56ffc8b Move RestTestClientBuilderCustomizer to spring-boot-test
Relocate `RestTestClientBuilderCustomizer` to `spring-boot-test`
and break the direct link to web-server by making use of
`spring.factories` and the new `BaseUrlProviders` class.

See gh-46356
2025-10-01 21:51:20 -07:00
Phillip Webb 6f909114e7 Move WebTestClientBuilderCustomizer to spring-boot-test
Relocate `WebTestClientBuilderCustomizer` to `spring-boot-test`
and break the direct link to web-server and http-codec by making
use of `spring.factories` and the new `BaseUrlProviders` class.

A new `spring-boot-test-integration-test` module has also been
added to ensure hold the previous tests.

See gh-46356
2025-10-01 21:50:13 -07:00
Phillip Webb bc46bb2a24 Drop spring-boot-loader-classic support
Closes gh-45714
2025-09-23 15:31:51 -07:00
Stéphane Nicoll 1de09fb81d Adapt assertion for availability probes being available by default
See gh-22825
2025-09-15 16:26:02 +02:00
Andy Wilkinson 2dc80b4047 Move Prometheus code from s-b-actuator to s-b-micrometer-metrics
Closes gh-47175
2025-09-12 15:19:34 +01:00
Stéphane Nicoll d7c482aa16 Replace @OptionalParameter with JSpecify's @Nullable
This commit removes OptionalParameter in favor of the nullness support
introduced in Spring Framework 7. The parameter of an action can now
be flagged as optional using JSpecify's @Nullable, and simplifies the
setup for those who are using JSpecify as only a single annotation is
required.

Closes gh-45390
2025-09-10 15:01:43 +02:00
Andy Wilkinson d353038c58 Update Jackson support to require Jackson 3
Closes gh-45535
2025-09-02 11:37:09 +01:00
Andy Wilkinson 8bfb170ebc Remove support for Jersey
Spring Boot 4 requires Jakarta EE 11. Jersey 4 will support EE 11 but
its release schedule is uncertain. Furthermore, Jersey does not yet
support Jackson 3 and there's no clear timeline for when Jackson 3
will be supported.

In light of the above, this commit removes support for Jersey.
Reinstating support can be considered once there's a Jersey GA that
supports Jakarta EE 11 or its clear that one will be available in
time for Boot's GA in November. Ideally, support for Jackson 3 would
also be available before reinstating Jersey support.

Closes gh-47017
2025-09-02 11:36:52 +01:00