Commit Graph
80 Commits
Author SHA1 Message Date
Andy Wilkinson 617e08b5b1 Merge branch '4.1.x'
Closes gh-51814
2026-09-17 08:50:34 +01:00
Andy Wilkinson c73645bb8a Merge branch '4.0.x' into 4.1.x
Closes gh-51813
2026-09-17 08:50:23 +01:00
Andy Wilkinson 7ce43c7b73 Use Java 27 GA in CI
Closes gh-51812
2026-09-17 08:49:58 +01:00
Phillip Webb 862b763d00 Merge branch '4.1.x'
Closes gh-51458
2026-08-25 18:54:13 -07:00
Phillip Webb 9d617d0cae Merge branch '4.0.x' into 4.1.x
Closes gh-51457
2026-08-25 18:54:05 -07:00
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 87430a4c5f Merge branch '4.1.x'
Closes gh-51429
2026-08-24 15:25:19 +01:00
Andy Wilkinson ec28f8b530 Merge branch '4.0.x' into 4.1.x
Closes gh-51428
2026-08-24 15:24:59 +01:00
Andy Wilkinson ee059ae3ca Add CI for Java 27
Closes gh-51423
2026-08-24 14:52:36 +01:00
Stéphane Nicoll e7741bf152 Start building against Spring Framework 7.1.0-M1 snapshots
See gh-51123
2026-07-27 21:16:50 +02:00
Stéphane Nicoll 297ee86945 Polish "Deprecate TestRestTemplate"
See gh-46632
2026-07-27 21:12:35 +02:00
Brian Clozel 4daf90ada1 Replace TestRestTemplate with RestTestClient in integration tests
Before deprecating `TestRestTemplate`, we must first stop using it in
integration tests and replace it with:
* `RestTestClient` when the Spring MVC infrastructure is present
* `RestClient` when the test does not have Spring MVC on classpath

See gh-46632
2026-07-27 16:11:46 +02:00
Stéphane Nicoll 3959c56bdd Deprecate RestTemplate support
With Spring Framework 7.1 deprecating RestTemplate for removal, this
commit deprecates our supporting infrastructure as well, and steers
users towards RestClient instead:

* RestTemplateAutoConfiguration and
  RestTemplateObservationAutoConfiguration
* RestTemplateBuilder, RestTemplateBuilderConfigurer, and
  RestTemplateBuilderClientHttpRequestInitializer
* RestTemplateCustomizer, RestTemplateRequestCustomizer, and
  ObservationRestTemplateCustomizer
* MockRestServiceServerAutoConfiguration,
  MockServerRestTemplateCustomizer, and RootUriRequestExpectationManager
  in the test support module

The reference documentation no longer covers RestTemplate and now
solely documents RestClient and WebClient. Code snippets and sample
tests that only existed to illustrate RestTemplate usage have been
removed accordingly.

Closes gh-51118
2026-07-25 08:32:32 +02:00
Stéphane Nicoll 9821dade80 Merge branch '4.0.x' into 4.1.x
Closes gh-51121
2026-07-24 15:19:14 +02:00
Stéphane Nicoll b9ebff0084 Use RestClient in tests and infrastructure code
Closes gh-51120
2026-07-24 15:10:43 +02:00
Andy Wilkinson 3ea9ca1b6c Merge branch '4.0.x'
Closes gh-50854
2026-06-24 20:34:29 +01: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 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
Phillip Webb f642f09c04 Merge branch '4.0.x' 2026-05-05 12:11:06 -07: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 fae5a098f7 Merge branch '4.0.x'
Closes gh-50298
2026-05-05 11:35:27 -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 783dcb9d97 Merge branch '4.0.x'
Closes gh-50018
2026-04-10 12:37:02 +01:00
Andy Wilkinson cd88bf71f5 Merge branch '3.5.x' into 4.0.x
Closes gh-50017
2026-04-10 12:28:27 +01:00
Phillip Webb b650f3c558 Rework spring-boot-health for reuse
Update `spring-boot-health` to allow for better reuse outside
of the actuator module.

See gh-49048
2026-03-19 15:12:30 -07:00
Stéphane Nicoll 1a52ed167e Merge branch '4.0.x'
Closes gh-49526
2026-03-09 14:06:33 +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 4f4b93d898 Merge branch '4.0.x'
See gh-49192
2026-02-11 15:30:13 +00:00
Andy Wilkinson 278de05619 Make a Java 26 container image available to LoaderIntegrationTests
See gh-49189
2026-02-11 15:29:39 +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
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