Commit Graph
100 Commits
Author SHA1 Message Date
Phillip Webb 017bd4bc5b Bump version in Eclipse project setup to 4.1.x 2025-12-19 15:04:48 -08:00
Phillip Webb 9dfa6a8761 Merge branch '4.0.x' 2025-12-19 15:04:19 -08:00
Phillip Webb f7e2e9e10a Update Eclipse working sets in project setup 2025-12-19 14:56:19 -08:00
Phillip Webb aaf66f4d50 Merge branch '3.5.x' 2025-12-17 20:46:23 -08:00
Phillip Webb 08e2cab6b0 Polish javadoc for when to use class names rather than class references
See gh-48395
2025-12-17 20:46:01 -08:00
Phillip Webb e69be7ccce Merge branch '3.5.x'
Closes gh-48569
2025-12-17 11:48:48 -08:00
Phillip Webb 15ede46eb8 Improve javadoc for when to use class names rather than class references
Closes gh-48395
2025-12-17 11:48:03 -08:00
Phillip Webb da516741b2 Consider modules when deducing WebApplicationType
Introduce a strategy to `WebApplicationType` to allow modules to
implement deduction logic.

Prior to this commit, modules played no part in deducing the
`WebApplicationType`. This meant that a user with `spring-webflux`
for client purposes would deduce `REACTIVE` despite no
`spring-boot-webflux` module being present.

The following deduction logic order is now implemented:

1) If the `spring-boot-webmvc` module is being used and Spring MVC
   classes are found then `SERVLET` is used.

2) If the `spring-boot-webflux` module is being used and Spring WebFlux
   classes are found then `REACTIVE` is used.

3) If `spring-web` is found and servlet classes are available then
   `SERVLET` is used.

4) If none of the above are satisfied, `NONE` is used.

This commit also updates `SpringBootTestContextBootstrapper` to use
the same deduction logic.

Fixes gh-48517
2025-12-15 20:30:16 -08:00
Phillip Webb f9fa1346d1 Upgrade to Spring Security 7.0.2
Closes gh-48444
2025-12-15 15:11:04 -08:00
Phillip Webb 7347d7e504 Merge pull request #48480 from ngocnhan-tran1996
* pr/48480:
  Allow Info to be built with null map values

Closes gh-48480
2025-12-09 10:48:43 -08:00
Phillip Webb 0254c693cf Merge branch '3.5.x'
Closes gh-48478
2025-12-09 08:42:36 -08:00
Phillip Webb 502a58af9c Merge branch '3.4.x' into 3.5.x
Closes gh-48477
2025-12-09 08:36:35 -08:00
Phillip Webb 448acaa5be Remove Apache header from spring-boot-gradle-plugin examples
Closes gh-48474
2025-12-09 08:35:00 -08:00
Phillip Webb 1573104dfc Allow Info to be built with null map values
Fixes gh-48401
2025-12-08 11:55:37 -08:00
Phillip Webb 2639d1ead5 Allow Info to be built with null values
Fixes gh-48401
2025-12-05 13:11:54 -08:00
Phillip Webb cee616fd47 Merge pull request #48396 from ngocnhan-tran1996
* pr/48396:
  Fix Javadoc reference for SampleJackson2OnlyApplication

Closes gh-48396
2025-12-05 10:13:29 -08:00
Phillip Webb ba032dba21 Fix links to GitHub source files
Closes gh-48394
2025-12-05 10:09:38 -08:00
Phillip Webb ba02e898f8 Merge pull request #48398 from ngocnhan-tran1996
* pr/48398:
  Correct path java files

Closes gh-48398
2025-12-05 10:01:25 -08:00
Phillip Webb 739b92e525 Consider reactive indicators in HealthEndpointGroupMembershipValidator
Update `HealthEndpointGroupMembershipValidator` to also consider
reactive health indicators.

Fixes gh-48387
2025-12-04 14:09:21 -08:00
Phillip Webb e93f9c313c Guard against WebServerApplicationContext not being present
Update security matchers and WebFlux actuator support to guard against
the `WebServerApplicationContext` class not being present.

Fixes gh-48388
2025-12-03 22:41:32 -08:00
Phillip Webb d61558147d Merge branch '3.5.x'
Closes gh-48369
2025-12-01 17:08:54 -08:00
Phillip Webb 99e121f652 Merge branch '3.4.x' into 3.5.x
Closes gh-48368
2025-12-01 17:08:46 -08:00
Phillip Webb 18595e557b Trigger docs build with specific SHA
Closes gh-44204
2025-12-01 17:08:21 -08:00
Phillip Webb 64ea2fdd24 Fix spring-boot-kotlin-serialization-json starter name
Rename `spring-boot-starter-kotlin-serialization` to
`spring-boot-starter-kotlin-serialization-json` to align with module.

Fixes gh-48262
2025-12-01 11:51:53 -08:00
Phillip Webb d87aa53f12 Remove outdated modules section from README
Closes gh-48291
2025-12-01 11:04:11 -08:00
Phillip Webb a89e89504f Merge branch '3.5.x'
Closes gh-48238
2025-11-21 17:07:40 -08:00
Phillip Webb aae9f47cbc Merge branch '3.4.x' into 3.5.x
Closes gh-48237
2025-11-21 17:07:33 -08:00
Phillip Webb 580ad488f0 Upgrade to Antora Spring UI v0.4.25
Closes gh-48236
2025-11-21 17:06:53 -08:00
Phillip Webb 0f4de3c4f4 Merge branch '3.5.x'
Closes gh-48212
2025-11-20 14:18:32 -08:00
Phillip Webb 39c0d17b87 Merge branch '3.4.x' into 3.5.x
Closes gh-48211
2025-11-20 14:18:11 -08:00
Phillip Webb 4d94fcba9a Upgrade to Antora Spring UI v0.4.24
Closes gh-48210
2025-11-20 14:17:47 -08:00
Phillip Webb 384e8b9b74 Next development version (v4.0.1-SNAPSHOT) 2025-11-20 10:38:42 -08: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
Phillip Webb 2e75008ba1 Merge branch '3.5.x'
Closes gh-48197
2025-11-19 21:58:48 -08:00
Phillip Webb f7b4a8b377 Merge branch '3.4.x' into 3.5.x
Closes gh-48196
2025-11-19 21:58:36 -08:00
Phillip Webb 4a8d01d2b6 Exclude starter POMs from lib-provided when using Gradle
Fixes gh-48195
2025-11-19 21:58:03 -08:00
Phillip Webb 97d58c21ce Merge branch '3.5.x' 2025-11-19 10:35:08 -08:00
Phillip Webb 0bb0d5370a Merge branch '3.4.x' into 3.5.x
Closes gh-48192
2025-11-19 10:34:56 -08:00
Phillip Webb 4625534e83 Force Testcontainers Docker API version for Docker 29.0.0+ compatibility
Add `docker-java.properties` to spring-boot-testcontainers and
`spring-boot-test` to force an API version upgrade.

Fixes gh-48104
2025-11-19 10:33:34 -08:00
Phillip Webb 058e455cd8 Merge branch '3.5.x'
Closes gh-48190
2025-11-19 09:38:25 -08:00
Phillip Webb 7891ebf8b1 Merge branch '3.4.x' into 3.5.x
Closes gh-48189
2025-11-19 09:38:12 -08:00
Phillip Webb b0f50581bc Upgrade to antora-ui-spring v0.4.21
Closes gh-48188
2025-11-19 09:37:42 -08:00
Phillip Webb c42364ce88 Revert "Merge pull request #46818 from BenchmarkingBuffalo"
This reverts commit 4730dcfef7, reversing
changes made to 024bb7278e.

See gh-46818
2025-11-18 17:24:29 -08:00
Phillip Webb d4b9786b8b Merge branch '3.5.x'
Closes gh-48177
2025-11-18 17:08:35 -08:00
Phillip Webb 4a016ec04d Merge branch '3.4.x' into 3.5.x
Closes gh-48176
2025-11-18 16:10:05 -08:00
Phillip Webb 3040dc14cd Apply system environment prefix to management context
Update `ManagementContextFactory` so that any system environment prefix
set on the parent environment is applied to the child.

Closes gh-45858
2025-11-18 15:44:49 -08:00
Phillip Webb 2e54aa6760 Merge branch '3.5.x'
Closes gh-48160
2025-11-17 21:00:09 -08:00
Phillip Webb c3c983f1d8 Merge branch '3.4.x' into 3.5.x
Closes gh-48159
2025-11-17 20:59:53 -08:00
Phillip Webb 7837583484 Add credentials to ivy settings to support commercial builds
Closes gh-46824
2025-11-17 20:54:34 -08:00
Phillip Webb 2bb967de14 Merge branch '3.5.x' 2025-11-17 18:12:48 -08:00
Phillip Webb 80ed778179 Merge branch '3.4.x' into 3.5.x 2025-11-17 18:11:41 -08:00
Phillip Webb 0d0493e45e Fix SpringRepositoriesExtensionTests
See gh-46823
2025-11-17 18:11:32 -08:00
Phillip Webb 7a8bc93fef Merge branch '3.5.x'
Closes gh-48158
2025-11-17 13:00:26 -08:00
Phillip Webb fec4a92c8c Merge branch '3.4.x' into 3.5.x
Closes gh-48157
2025-11-17 12:59:17 -08:00
Phillip Webb 018fc57d64 Use spring.mavenRepositories in buildSrc for all build types
Refine `buildSrc` so that `spring.mavenRepositories()` are considered
for all build types (not just milestones and snapshots). We now pass
"springFrameworkVersion" to `SpringRepositorySupport.groovy` so that
repo.spring.io doesn't get added for OSS builds using release artifacts.

Closes gh-46823
2025-11-17 12:54:31 -08:00
Phillip Webb 2a9e6a2b93 Merge branch '3.5.x'
Fixes gh-48059
2025-11-17 11:39:19 -08:00
Phillip Webb 5954918c60 Merge branch '3.4.x' into 3.5.x
Fixes gh-48058
2025-11-17 11:37:46 -08:00
Phillip Webb 90d53b6d1b Merge branch '3.5.x'
Closes gh-48128
2025-11-13 15:27:15 -08:00
Phillip Webb c90f61ce66 Merge branch '3.4.x' into 3.5.x
Closes gh-48127
2025-11-13 15:25:08 -08:00
Phillip Webb 53bda71c3e Use platform when exporting buildpack images
Update `DockerApi` and `Builder` to support export of images with a
specified platform. This prevents 'NotFound: content digest sha256:'
errors when building an amd64 image on an arm64 machine.

Fixes gh-46665
2025-11-13 15:19:26 -08:00
Phillip Webb 55c3f03144 Merge branch '3.5.x'
Closes gh-48103
2025-11-12 20:44:55 -08:00
Phillip Webb d1dc9579eb Merge branch '3.4.x' into 3.5.x
Closes gh-48102
2025-11-12 20:05:58 -08:00
Phillip Webb 9b387cbe77 Support recent Docker installs by raising the API version when possible
Update `DockerApi` so that the URL uses version `v1.50` whenever
possible. Prior to this commit, `v1.24` was often used which breaks
recent Docker installs due to the dropping of API version v1.43 and
below.

If the actual API version running is less than `v1.50`, but greater
than the minimum required for the API call, it will be used instead.
This hopefully means that older versions of Docker will continue to
work as they did previously.

Fixes gh-48050
2025-11-12 19:57:36 -08:00
Phillip Webb a25bcfc610 Merge branch '3.5.x'
Closes gh-48099
2025-11-12 14:22:17 -08:00
Phillip Webb 25a5d4343e Merge branch '3.4.x' into 3.5.x
Closes gh-48098
2025-11-12 13:44:02 -08:00
Phillip Webb b6460eaf67 Merge pull request #47292 from hojooo
* pr/47292:
  Polish 'Correctly handle platform specific buildpack builds'
  Correctly handle platform specific buildpack builds

Closes gh-47292
2025-11-12 13:27:07 -08:00
Phillip Webb 39f3d1c72c Polish 'Correctly handle platform specific buildpack builds'
See gh-47292
2025-11-12 11:07:29 -08:00
Phillip Webb 6158a52b8c Support deprecated EnvironmentPostProcessor arguments
Fixes gh-48047
2025-11-10 15:51:53 -08:00
Phillip Webb 1da6296c95 Merge branch '3.5.x'
Closes gh-47994
2025-11-07 19:15:15 -08:00
Phillip Webb b9216a05e6 Merge branch '3.4.x' into 3.5.x
Closes gh-47993
2025-11-07 19:14:55 -08:00
Phillip Webb 046d4fd22b Upgrade to Antora 3.2.0-alpha.10 (with related extensions)
Closes gh-47417
2025-11-07 19:13:16 -08:00
Phillip Webb 830768d8da Merge branch '3.5.x' 2025-11-07 12:32:28 -08:00
Phillip Webb 2d7c2776fe Merge branch '3.4.x' into 3.5.x 2025-11-07 12:32:22 -08:00
Phillip Webb 5dac202e80 Upgrade Antora extensions
See gh-47417
2025-11-07 12:32:09 -08:00
Phillip Webb 03e3a6650e Upgrade to Spring Security 7.0.0-RC3
Closes gh-47844
2025-11-06 10:17:39 -08:00
Phillip Webb 08857b4c7f Cache SystemEnvironmentPropertyMapper configuration property names
Add a static cache to `SystemEnvironmentPropertyMapper` for property
source name to configuration property name conversion. This update
should help ease object allocations for system environment names which
are unlikely to change often.

Closes gh-14121
2025-11-05 14:30:31 -08: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
Phillip Webb d0d332b42f Merge branch '3.5.x'
Closes gh-47968
2025-11-05 09:52:47 -08:00
Phillip Webb 3690a958f2 Replace use of ubuntu-noble-run-base with ubuntu-noble-run
Update code and documentation to use the correct Paketo base image of
`ubuntu-noble-run` rather than `ubuntu-noble-run-base` which was
published only for testing purposes.

Closes gh-47966
2025-11-05 09:49:35 -08:00
Phillip Webb 00bd0efc56 Merge branch '3.5.x'
Closes gh-47946
2025-11-04 15:36:55 -08:00
Phillip Webb 0ca8f6d03f Replace calls to deprecated setConnectionTimeout method
Replace calls to the recently deprecated `setConnectionTimeout` method
of `HttpComponentsClientHttpRequestFactory` and align the HTTP client
builder with the HTTP async client builder.

This commit also introduces a `withConnectionConfigCustomizer` and
allows connection timeouts settings to be used.

Closes gh-47940
2025-11-04 14:12:55 -08:00
Phillip Webb 2f33f73e76 Fix spring.http.serviceclient metadata JSON
Fix type in `Map` reference.

Closes gh-47943
2025-11-04 08:27:18 -08:00
Phillip Webb 827b0c14a9 Rename OnlyOnceLoggingDenyMeterFilter
Rename `OnlyOnceLoggingDenyMeterFilter` to
`MaximumAllowableTagsMeterFilter`.

Closes gh-47925
2025-11-03 20:56:28 -08:00
Phillip Webb 7849474291 Merge branch '3.5.x'
Closes gh-47924
2025-11-03 20:41:23 -08:00
Phillip Webb 61fadeb897 Merge branch '3.4.x' into 3.5.x
Closes gh-47923
2025-11-03 20:22:30 -08:00
Phillip Webb 631711f2e6 Prevent unlimited growth of AutoConfiguredCompositeMeterRegistry
Update `OnlyOnceLoggingDenyMeterFilter` to directly implement the
maximum number of allowable tag values. With this change in place
we can remove calls to `MeterFilter.maximumAllowableTags`. This also
allows `MeterRegistryPostProcessor` to have a stronger signal about
the filters that it should also apply to the
`AutoConfiguredCompositeMeterRegistry` since it can now do a standard
`instanceof` check.

Fixes gh-47285
2025-11-03 20:14:01 -08:00
Phillip Webb 4b2c6fa40b Merge branch '3.5.x'
Closes gh-47901
2025-10-31 12:45:54 -07:00
Phillip Webb 4309ab071b Merge branch '3.4.x' into 3.5.x
Closes gh-47900
2025-10-31 11:54:25 -07:00
Phillip Webb 8a03a82820 Merge pull request #47180 from siva-sai-udaygiri
* pr/47180:
  Polish 'Handle HTTP 407 with clear error message'
  Handle HTTP 407 with clear error message

Closes gh-47180
2025-10-31 11:52:20 -07:00
Phillip Webb abce914a76 Polish 'Handle HTTP 407 with clear error message'
See gh-47180
2025-10-31 11:50:39 -07:00
Phillip Webb e5d6edfa10 Merge branch '3.5.x' 2025-10-31 09:30:54 -07:00
Phillip Webb 22781fc6a0 Polish DEFAULT_SERVICE_NAME javadoc
See gh-44494
2025-10-31 09:30:19 -07:00
Phillip Webb 0f3631b7cc Merge branch '3.5.x'
Closes gh-47899
2025-10-31 09:25:55 -07:00
Phillip Webb a5833095ff Merge branch '3.4.x' into 3.5.x
Closes gh-47898
2025-10-31 09:25:11 -07:00
Phillip Webb cf7e30f225 Clarify when BootstrapContext get methods may return null
Closes gh-47896
2025-10-31 09:24:29 -07:00
Phillip Webb 2e79fc01cb Allow URL to be specified when working with HtmlUnit beans
Update `@AutoConfigureMockMvc` to move HtmlUnit configuration under
a dedicated attribute and provide support for configuring the URL
that is used.

Closes gh-47857
2025-10-29 20:47:42 -07:00
Phillip Webb 03787364be Merge branch '3.5.x' 2025-10-23 16:20:48 -07:00
Phillip Webb 5ae18f6b64 Merge branch '3.4.x' into 3.5.x 2025-10-23 16:20:43 -07:00
Phillip Webb a16c8813ec Set ignore-already-exists-error to true 2025-10-23 15:52:27 -07:00
Phillip Webb d56db5e87c Revert "Temporarily drop build stage"
This reverts commit b582f5dabf.
2025-10-23 15:47:21 -07:00