Commit Graph
61724 Commits
Author SHA1 Message Date
Stéphane Nicoll f48cc3ac10 Move Spring AMQP 0.9 support to spring-boot-rabbitmq
Now that Spring AMQP supports AMQP 1.0 as well, we need to straighten
out our existing support. AMQP 0.9 is RabbitMQ specific, so we can no
longer refer it to "amqp". This commit migrates the existing support
to spring-boot-rabbitmq and renames the starters as well.

For continuity, users should migrate from "spring-boot-starter-amqp"
to "spring-boot-starter-rabbitmq". While the root package has been
changed for consistency, most names are the same, including
configuration properties still in the "spring.rabbitmq" namespace.

Keys to configure the version of the RabbitMQ clients have migrated to
'rabbitmq.client' and 'rabbitmq.stream.client' respectively.

Closes gh-49677
2026-07-15 15:10:09 +02:00
Stéphane Nicoll 467fde153f Merge pull request #50877 from gichanGim
* feat/gh-50792-webmvc-resource-handler-customizer:
  Make ResourceHandlerRegistrationCustomizer public

Closes gh-50877
2026-07-15 13:29:09 +02:00
gichanGim 728cbc67ff Make ResourceHandlerRegistrationCustomizer public
See gh-50877

Signed-off-by: gichanGim <k.kychan2003@gmail.com>
2026-07-15 13:27:18 +02:00
Stéphane Nicoll 57aa6d26d8 Merge branch '4.1.x' 2026-07-15 13:26:15 +02:00
Stéphane Nicoll 7ef46fb87a Merge branch '4.0.x' into 4.1.x 2026-07-15 13:25:59 +02:00
Stéphane Nicoll f01e775082 Polish 2026-07-15 13:22:42 +02:00
Stéphane Nicoll d7a86dfd0d Merge pull request #50500 from scordio
* ApplicationContextAssertProvider-generics:
  Polish "Add self-reference to ApplicationContextAssertProvider"
  Add self-reference to ApplicationContextAssertProvider

Closes gh-50500
2026-07-15 13:21:53 +02:00
Stéphane Nicoll e3e01fe9d5 Polish "Add self-reference to ApplicationContextAssertProvider"
See gh-50500
2026-07-15 12:05:39 +02:00
Stefano Cordio cb9b32bd22 Add self-reference to ApplicationContextAssertProvider
See gh-50500

Signed-off-by: Stefano Cordio <stefano.cordio@gmail.com>
2026-07-15 12:05:23 +02:00
Stéphane Nicoll 268a030335 Merge pull request #50367 from GollapudiSrikanth
* srikanthgollapudi-archunit-config-properties-style:
  Polish contribution
  Harmonize use of Collections and Maps in configuration properties

Closes gh-50367
2026-07-15 11:45:19 +02:00
Stéphane Nicoll 10fdd20606 Polish contribution
This commit applies the same rules to ConfigurationPropertiesSource.

See gh-50367
2026-07-15 11:37:31 +02:00
Venkata Naga Sai Srikanth Gollapudi 87c4755a86 Harmonize use of Collections and Maps in configuration properties
See gh-50367

Signed-off-by: Venkata Naga Sai Srikanth Gollapudi <42247688+gollapudisrikanth@users.noreply.github.com>
2026-07-15 11:37:31 +02:00
Stéphane Nicoll 6644a6cbff Merge pull request #50194 from zxuhan
* gh-50192-application-temp-path:
  Expose Path getters on ApplicationTemp

Closes gh-50194
2026-07-15 11:35:13 +02:00
zxuhan7 ab4d78a107 Expose Path getters on ApplicationTemp
See gh-50194

Signed-off-by: zxuhan7 <zxuhan7@gmail.com>
2026-07-15 11:24:52 +02:00
Stéphane Nicoll 6d28fc10f9 Start development of Spring Boot 4.2.x 2026-07-15 10:30:43 +02:00
Stéphane Nicoll 493315f8cf Merge branch '4.1.x' 2026-07-15 10:26:56 +02:00
Stéphane Nicoll ad641b6bd6 Prepare 4.1.x 2026-07-15 10:25:21 +02:00
Andy Wilkinson 4407c656c0 Merge branch '4.0.x'
Closes gh-50952
2026-07-15 09:02:03 +01:00
Andy Wilkinson daa7e4917b Use GRADLE_USER_HOME to locate gradle.properties
Closes gh-50951
2026-07-15 09:01:25 +01:00
Stéphane Nicoll 9eb03d13fb Configure virtual threads on RedisMessageListenerContainer
Closes gh-50884
2026-07-15 09:45:44 +02:00
Stéphane Nicoll a500eaaefe Merge branch '4.0.x' 2026-07-15 08:02:02 +02:00
Stéphane Nicoll 8c6c3fd1e4 Polish "Upgrade to Gradle 9.6.1"
Stop using providers.properties as it is deprecated

See gh-50793
2026-07-15 07:51:22 +02:00
Stéphane Nicoll 7a89c31f91 Merge branch '4.0.x'
Closes gh-50950
2026-07-14 18:28:28 +02:00
Stéphane Nicoll b75932f259 Merge pull request #50779 from dhruv-15-03
* fix-jul-bridge-uninstall-asymmetry:
  Polish "Avoid removing application-managed JUL bridge handler"
  Avoid removing application-managed JUL bridge handler

Closes gh-50779
2026-07-14 18:21:46 +02:00
Stéphane Nicoll a2af5acbe2 Polish "Avoid removing application-managed JUL bridge handler"
See gh-50779
2026-07-14 18:17:03 +02:00
dhruv-15-03 fe5164521d Avoid removing application-managed JUL bridge handler
`LogbackLoggingSystem` and `Log4J2LoggingSystem` install a JUL bridge
handler only when the application is not already managing `java.util.logging`.
However, `cleanUp()` removed the bridge handler whenever the bridge class
was present on the classpath, so Spring Boot uninstalled a bridge handler
that an application had installed and managed itself.

Track whether the bridge handler was installed by Spring Boot and only
remove it during cleanup when that is the case.

See gh-50779

Signed-off-by: dhruv-15-03 <dhruvrastogi2004@gmail.com>
2026-07-14 18:11:50 +02:00
Stéphane Nicoll 1c423ab57d Merge pull request #50801 from ns3154
* gh-50797-lazy-jpa-bootstrap-executor:
  Polish "Lazily resolve JPA fallback bootstrap executor"
  Lazily resolve JPA fallback bootstrap executor

Closes gh-50801
2026-07-14 17:54:33 +02:00
Stéphane Nicoll d4d20787c1 Polish "Lazily resolve JPA fallback bootstrap executor"
See gh-50801
2026-07-14 17:45:54 +02:00
Ns 8c519369ec Lazily resolve JPA fallback bootstrap executor
Previously, the `entityManagerFactoryBuilder` bean method injected a
`Map<String, AsyncTaskExecutor>` to determine the fallback executor used
for background JPA bootstrapping. A `Map` parameter is resolved eagerly,
so this forced early initialization of every `AsyncTaskExecutor` bean
whenever the builder was created, even when background bootstrapping was
not in use. When an `AsyncTaskExecutor` directly or transitively
depended on the `EntityManagerFactory`, this resulted in a
`BeanCurrentlyInCreationException`.

The fallback executor is now resolved lazily.
`EntityManagerFactoryBuilder` holds a `Supplier` that is only invoked
when background bootstrapping is actually required, and the executor is
then looked up from the `BeanFactory` rather than eagerly injected. A
new `Supplier`-based constructor is added for this purpose; the existing
constructor that accepts an `AsyncTaskExecutor` is retained and
delegates to it.

The same eager `Map<String, AsyncTaskExecutor>` injection, along with an
unused private method, is also removed from
`DataJpaRepositoriesAutoConfiguration`.

See gh-50801

Signed-off-by: Ns <397827222@qq.com>
2026-07-14 17:11:14 +02:00
Stéphane Nicoll 46ed3df7e6 Merge branch '4.0.x'
Closes gh-50948
2026-07-14 16:26:27 +02:00
Stéphane Nicoll c7dd44815a Upgrade to Native Build Tools Plugin 1.1.4
Closes gh-50947
2026-07-14 16:20:52 +02:00
Stéphane Nicoll 2eedeabe9a Upgrade to Gradle 9.6.1
This commit also suppresses new warnings from the Native Build Tools
Plugin, see https://github.com/graalvm/native-build-tools/pull/903

Closes gh-50793
2026-07-14 16:03:14 +02:00
Stéphane Nicoll 1f43bb3b4f Merge branch '4.0.x'
Closes gh-50946
2026-07-14 15:44:39 +02:00
Stéphane Nicoll eb621439bc Harmonize Gradle versions used for testing on Java 26
Closes gh-50945
2026-07-14 15:44:03 +02:00
Stéphane Nicoll 6c160f17d9 Merge branch '4.0.x'
Closes gh-50944
2026-07-14 15:38:56 +02:00
Stéphane Nicoll bbacbc6291 Do not require WebClient.Builder in CloudFoundry auto-configuration
Closes gh-50928
2026-07-14 15:37:40 +02:00
Stéphane Nicoll 02b3242057 Merge branch '4.0.x'
Closes gh-50943
2026-07-14 11:38:01 +02:00
Stéphane Nicoll 2a40555069 Merge pull request #50909 from quaff
* patch-225:
  Inject Customizers as ObjectProvider to keep consistency

Closes gh-50909
2026-07-14 11:29:11 +02:00
Yanming Zhou 7522f679fd Inject Customizers as ObjectProvider to keep consistency
See gh-50909

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2026-07-14 11:23:34 +02:00
Stéphane Nicoll 666d7d042d Merge branch '4.0.x'
Closes gh-50942
2026-07-14 11:12:24 +02:00
Stéphane Nicoll f8e62d6f18 Merge pull request #50916 from dlwldnjs1009
* cf-reactive-health-absent-4.0.x:
  Polish "Guard reactive Cloud Foundry health extension"
  Guard reactive Cloud Foundry health extension

Closes gh-50916
2026-07-14 11:12:19 +02:00
Stéphane Nicoll a0c8fa445b Polish "Guard reactive Cloud Foundry health extension"
See gh-50916
2026-07-14 11:09:17 +02:00
Lee JiWon bda889997d Guard reactive Cloud Foundry health extension
Move the reactive Cloud Foundry health endpoint extension into a
health-specific configuration guarded by @ConditionalOnClass. When
spring-boot-health is absent, scanning the outer configuration attempts
to resolve ReactiveHealthEndpointWebExtension and causes context refresh
to fail.

See gh-50916

Signed-off-by: Lee JiWon <dlwldnjs1009@gmail.com>
2026-07-14 08:37:44 +02:00
Stéphane Nicoll f004d3077c Merge branch '4.0.x'
Closes gh-50941
2026-07-14 08:35:49 +02:00
Stéphane Nicoll d5cde2ece1 Merge pull request #50919 from SebTardif
* fix/image-buildpack-temp-and-stream-cleanup:
  Close streams and delete intermediate temps in ImageBuildpack

Closes gh-50919
2026-07-14 08:35:42 +02:00
Sebastien Tardif 7bdb1320bf Close streams and delete intermediate temps in ImageBuildpack
ExportedLayers left the intermediate create-builder-scratch-source
temp file behind after rebased layer files were written, and opened
layer InputStreams without closing them when StreamUtils.copy does
not close either stream. Delete the source temp in a finally block
and use try-with-resources for the apply path so layer files can be
deleted reliably.

See gh-50919

Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>
2026-07-14 08:33:33 +02:00
Stéphane Nicoll 1fb29ef797 Merge branch '4.0.x'
Closes gh-50940
2026-07-14 08:12:44 +02:00
Stéphane Nicoll 401a719654 Merge pull request #50931 from ngocnhan-tran1996
* gh-50930:
  Fix key for the MongoDB health indicator in reference guide

Closes gh-50931
2026-07-14 08:12:37 +02:00
Tran Ngoc Nhan c463dd033b Fix key for the MongoDB health indicator in reference guide
See gh-50931

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2026-07-14 08:07:07 +02:00
Stéphane Nicoll 822752a0b0 Merge branch '4.0.x'
Closes gh-50939
2026-07-14 08:05:41 +02:00