Commit Graph
55771 Commits
Author SHA1 Message Date
Andy Wilkinson 20a4e6ff3c Work around circular dependency regression in Security
This can be reverted once spring-projects/spring-security#17484 has
been fixed

See gh-45492
2025-07-04 15:02:17 +01:00
Andy Wilkinson 4b2861fa14 Disable tests broken by removal of ObjectPostProcessor
This can be reverted once a compatible Authorization Server snapshot
is available.

See gh-45492
2025-07-04 15:02:14 +01:00
Stéphane Nicoll e3ef438d6d Upgrade to Neo4j Java Driver 5.28.7
Closes gh-46272
2025-07-04 10:25:52 +02:00
Stéphane Nicoll 534cad60ce Merge branch '3.5.x' 2025-07-04 10:16:37 +02:00
Stéphane Nicoll c9014e3704 Merge branch '3.4.x' into 3.5.x 2025-07-04 10:14:57 +02:00
Stéphane Nicoll 7958d0e687 Remove debug logging 2025-07-04 10:14:40 +02:00
Stéphane Nicoll 5e969f9296 Merge branch '3.5.x'
Closes gh-46270
2025-07-04 10:09:22 +02:00
Stéphane Nicoll da2168895f Merge branch '3.4.x' into 3.5.x
Closes gh-46269
2025-07-04 10:07:12 +02:00
Stéphane Nicoll 1a81e4718f Set version of Spring Data R2DBC in NoSuchMethodFailureAnalyzerTests
Closes gh-46268
2025-07-04 10:04:52 +02:00
Stéphane Nicoll 36b713eb5d Merge branch '3.5.x'
Closes gh-46264
2025-07-03 20:11:13 +02:00
Stéphane Nicoll 25dd5f1f33 Merge branch '3.4.x' into 3.5.x
Closes gh-46263
2025-07-03 20:10:54 +02:00
Stéphane Nicoll 67de3211e7 Merge pull request #46259 from PiyalAhmed
* pr/46259:
  Remove unnecessary toString() call

Closes gh-46259
2025-07-03 20:10:44 +02:00
Piyal Ahmed 2b14cfee3c Remove unnecessary toString() call
See gh-46259

Signed-off-by: Piyal Ahmed <piya.salamence@gmail.com>
2025-07-03 20:10:00 +02:00
Andy Wilkinson 74e6851044 Merge branch '3.5.x'
Closes gh-46258
2025-07-03 08:51:43 +01:00
Andy Wilkinson 573ad34e7a Merge branch '3.4.x' into 3.5.x
Closes gh-46257
2025-07-03 08:51:29 +01:00
Andy Wilkinson e3bfc1d293 Merge pull request #46256 from Dockerel
* gh-46256:
  Use ThreadLocal.remove() instead of set(null)

Closes gh-46256
2025-07-03 08:50:30 +01:00
Giheon Do f316e3e128 Use ThreadLocal.remove() instead of set(null)
Signed-off-by: Giheon Do <dgh0001@naver.com>

See gh-46256
2025-07-03 08:49:57 +01:00
Andy Wilkinson 381706fe33 Merge branch '3.5.x'
Closes gh-46255
2025-07-02 20:31:49 +01:00
Andy Wilkinson 3f4c870a13 Merge branch '3.4.x' into 3.5.x
Closes gh-46254
2025-07-02 20:31:39 +01:00
Andy Wilkinson 808d2e58b7 Merge pull request #46252 from PiyalAhmed
* gh-46252:
  Remove unnecessary semicolons from Gradle build scripts

Closes gh-46252
2025-07-02 20:31:32 +01:00
Piyal Ahmed 8fb3010942 Remove unnecessary semicolons from Gradle build scripts
Signed-off-by: Piyal Ahmed <piya.salamence@gmail.com>

See gh-46252
2025-07-02 20:31:01 +01:00
Andy Wilkinson d49b37a6b5 Merge pull request #45310 from blancqua
* gh-45310:
  Polish "Add @ServiceConnection support for MongoDBAtlasLocalContainer"
  Add @ServiceConnection support for MongoDBAtlasLocalContainer

Closes gh-45310
2025-07-02 15:46:47 +01:00
Andy Wilkinson f8dbcef977 Polish "Add @ServiceConnection support for MongoDBAtlasLocalContainer"
See gh-45310
2025-07-02 15:41:38 +01:00
Wouter Blancquaert aa06c0d02a Add @ServiceConnection support for MongoDBAtlasLocalContainer
Signed-off-by: Wouter Blancquaert <wouter@blancquaert.org>

See gh-45310
2025-07-02 15:06:47 +01:00
Andy Wilkinson 887b064de6 Try to stabilize KotlinPluginActionIntegrationTests
See gh-46238
2025-07-02 14:52:07 +01:00
Andy Wilkinson d25132185e Merge pull request #46007 from doumdoum
* gh-46007:
  Polish "Add @MeterTag support to existing @Timed and @Counted support"
  Add @MeterTag support to existing @Timed and @Counted support

Closes gh-46007
2025-07-02 14:44:00 +01:00
Andy Wilkinson 88f4af7577 Polish "Add @MeterTag support to existing @Timed and @Counted support"
See gh-46007
2025-07-02 14:38:55 +01:00
Dominique Villard 8b04ace139 Add @MeterTag support to existing @Timed and @Counted support
Signed-off-by: Dominique Villard <dominique.villard@doctolib.com>

See gh-46007
2025-07-02 13:57:21 +01:00
Andy Wilkinson a59cf66555 Merge pull request #44354 from quaff
* gh-44354:
  Polish "Introduce TestSliceTestContextBootstrapper for test slices"
  Introduce TestSliceTestContextBootstrapper for test slices

Closes gh-44354
2025-07-02 13:49:11 +01:00
Andy Wilkinson 53464f22e7 Polish "Introduce TestSliceTestContextBootstrapper for test slices"
See gh-44354
2025-07-02 13:25:16 +01:00
Yanming Zhou a42ba82fea Introduce TestSliceTestContextBootstrapper for test slices
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

See gh-44354
2025-07-02 13:24:59 +01:00
Andy Wilkinson 8bb5c2704c Merge pull request #46249 from quaff
* gh-46249:
  Polishing Javadoc of QuartzDataSourceScriptDatabaseInitializer

Closes gh-46249
2025-07-02 13:12:48 +01:00
Yanming Zhou 01ffdc8a02 Polishing Javadoc of QuartzDataSourceScriptDatabaseInitializer
Align with other `DataSourceScriptDatabaseInitializer`s

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

See gh-46249
2025-07-02 13:12:16 +01:00
Andy Wilkinson 2b9a60fd2d Merge pull request #46238 from sdeleuze
* gh-46238:
  Upgrade to Kotlin 2.2.0

Closes gh-46238
2025-07-02 13:11:07 +01:00
Sébastien Deleuze a48e5baf2f Upgrade to Kotlin 2.2.0
This commit leverages Kotlin 2.2 which is expected to be the
new baseline for Spring Boot 4.0, so API and language
versions are upgraded to KOTLIN_2_2 as well.

It also enables the -Xannotation-default-target=param-property
compiler flag, mainly for test purpose, in order to avoid the
related warnings and to use what will likely be the default in
an upcoming Kotlin version short term. For more details see
https://youtrack.jetbrains.com/issue/KT-73255.

KotlinPlatformJvmPlugin was a class from an old KMP plugin,
deprecated for a long time and now removed. So its usage in
PluginClasspathGradleBuild has been removed as well.

Signed-off-by: Sébastien Deleuze <sdeleuze@users.noreply.github.com>

See gh-46238
2025-07-02 13:10:32 +01:00
Andy Wilkinson 95ba9812a2 Merge pull request #45302 from nosan
* gh-45302:
  Polish "Add support for multiple TaskDecorator beans"
  Add support for multiple TaskDecorator beans

Closes gh-45302
2025-07-02 12:29:22 +01:00
Andy Wilkinson e61ab7e0cd Polish "Add support for multiple TaskDecorator beans"
See gh-45302
2025-07-02 12:01:07 +01:00
Dmytro Nosan fff816d056 Add support for multiple TaskDecorator beans
Previously, only a single TaskDecorator bean, if unique, was applied
to the auto-configured TaskExecutor or Scheduler. With this change,
if multiple TaskDecorator beans are defined, they will be combined
into a `CompositeTaskDecorator` and applied accordingly.

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>

See gh-45302
2025-07-02 11:55:57 +01:00
Andy Wilkinson ac2656d312 Merge branch '3.5.x'
Closes gh-46248
2025-07-02 11:25:20 +01:00
Andy Wilkinson 1b7244b983 Merge branch '3.4.x' into 3.5.x
Closes gh-46247
2025-07-02 11:22:40 +01:00
Andy Wilkinson d38079cfbb Merge pull request #46228 from benelog
* gh-46228:
  Polish "Fix description of spring.batch.job.enabled"
  Fix description of spring.batch.job.enabled

Closes gh-46228
2025-07-02 11:22:16 +01:00
Andy Wilkinson 7c14ac0bc4 Polish "Fix description of spring.batch.job.enabled"
See gh-46228
2025-07-02 11:21:55 +01:00
Sanghyuk Jung 5a69bfb403 Fix description of spring.batch.job.enabled
Signed-off-by: Sanghyuk Jung <sanghyuk.jung@navercorp.com>

See gh-46228
2025-07-02 11:21:55 +01:00
Andy Wilkinson ce9ffd17fd Make Integration DataSource init back off without s-b-sql
Previously, the DataSource initialization would back off without
spring-boot-jdbc but spring-boot-sql was a required dependency.
Without spring-boot-sql, a failure would occur due to the absence
of OnDatabaseInitializationCondition.

This commit updates the auto-configuration so that spring-boot-sql
is now an optional dependency and DataSource initialization
backs off in its absence.

Closes gh-46244
2025-07-02 10:47:12 +01:00
Andy Wilkinson a52d5538ee Make Quartz DataSource init back off without spring-boot-jdbc
Previously, setting spring.quartz.job-store-type to jdbc assumed that
spring-boot-jdbc was on the classpath. If it was not, the context
would fail to refresh as DataSourceScriptDatabaseInitializer was not
available.

This commit updates the auto-configuration so that the DataSource
initialization will back off when spring-boot-jdbc is absent. This
allows an app to use Quartz without spring-boot-jdbc and
spring-boot-sql. This remains true even when using the JDBC job
store as long as something else has created the DataSource and
initialized its schema to contain the tables that Quartz requires.

Closes gh-46243
2025-07-02 10:47:12 +01:00
Phillip Webb 5db3cacde8 Create spring-boot-autoconfigure-classic module
Closes gh-46233
2025-07-01 12:31:13 +01:00
Phillip Webb 77176c0c60 Provide better configuration properties binding exception message
Update `ConfigurationPropertiesBeanRegistrar` to provide the name
of the bean and the type when failures occur.

Closes gh-46232
2025-07-01 12:31:13 +01:00
Andy Wilkinson 73db54c82b Make BytesEncoder back off without an Encoding bean
Closes gh-46153
2025-07-01 12:31:13 +01:00
Andy Wilkinson e01826035d Order BatchAutoConfiguration after DataSourceAutoConfiguration
Prior to the restructuring, this ordering was in place, but not
directly. BatchAutoConfiguration was ordered after
HibernateJpaAutoConfiguration which, in turn, was ordered after
DataSourceAutoConfiguration. This works as all of the
auto-configuration was in the same module.

Following the restructuring, HibernateJpaAutoConfiguration may not be
on the classpath. When it's absent, it's ordering is also lost which
means that BatchAutoConfiguration won't be ordered after
DataSourceAutoConfiguation with spring-boot-hibernate isn't present.

This commit adds explicit after ordering to BatchAutoConfiguration.
This ensures consistent ordering, with or without the JPA
auto-config.

See gh-46071
2025-07-01 12:31:12 +01:00
Phillip Webb 06917abbcb Align reactive auto-configuration names
Rename a few reactive auto-configuration and related classes for better
consistency.

Closes gh-46156
2025-07-01 12:31:12 +01:00