Commit Graph
55204 Commits
Author SHA1 Message Date
Stéphane Nicoll 8a9ce28b98 Merge branch '3.4.x' into 3.5.x 2025-07-09 09:16:00 +02:00
Stéphane Nicoll 6839e52455 Start building against Spring Kafka 3.3.8 snapshots
See gh-46363
2025-07-09 08:29:37 +02:00
Stéphane Nicoll 208c5bf8d0 Start building against Spring WS 4.1.1 snapshots
See gh-46362
2025-07-09 08:29:36 +02:00
Stéphane Nicoll b9044fded7 Start building against Spring Integration 6.4.6 snapshots
See gh-46361
2025-07-09 08:29:33 +02:00
Stéphane Nicoll 4be9dda24e Start building against Spring Kafka 3.3.8 snapshots
See gh-46360
2025-07-09 08:29:32 +02:00
Stéphane Nicoll c3c94a5373 Start building against Spring Integration 6.5.1 snapshots
See gh-46359
2025-07-09 08:29:28 +02:00
Stéphane Nicoll 35bdbdd1ed Start building against Spring Pulsar 1.2.8 snapshots
See gh-46286
2025-07-09 08:26:22 +02:00
Stéphane Nicoll e869bd272d Start building against Spring LDAP 3.3.2 snapshots
See gh-46285
2025-07-09 08:26:22 +02:00
Stéphane Nicoll 4fd0afd47c Upgrade to Neo4j Java Driver 5.28.7
Closes gh-46288
2025-07-09 08:26:22 +02:00
Stéphane Nicoll 8f2018eb95 Start building against Spring Data Bom 2025.0.2 snapshots
See gh-46284
2025-07-09 08:26:22 +02:00
Stéphane Nicoll c970299445 Start building against Spring AMQP 3.2.6 snapshots
See gh-46283
2025-07-09 08:26:22 +02:00
Stéphane Nicoll 300fdf2160 Start building against Reactor Bom 2024.0.8 snapshots
See gh-46282
2025-07-09 08:26:22 +02:00
Stéphane Nicoll db615aa129 Start building against Micrometer Tracing 1.5.2 snapshots
See gh-46281
2025-07-09 08:26:22 +02:00
Stéphane Nicoll 33348f4902 Start building against Micrometer 1.15.2 snapshots
See gh-46280
2025-07-09 08:26:22 +02:00
Stéphane Nicoll 29cddcab34 Start building against Spring Pulsar 1.2.8 snapshots
See gh-46279
2025-07-09 08:25:36 +02:00
Stéphane Nicoll 27b85d5f22 Start building against Spring Framework 6.2.9 snapshots
See gh-46278
2025-07-09 08:25:35 +02:00
Stéphane Nicoll a1fe893b03 Upgrade to Neo4j Java Driver 5.28.7
Closes gh-46287
2025-07-09 08:25:35 +02:00
Stéphane Nicoll 2de03ee02e Start building against Spring Data Bom 2024.1.8 snapshots
See gh-46277
2025-07-09 08:25:35 +02:00
Stéphane Nicoll 1a7e155f78 Start building against Spring AMQP 3.2.6 snapshots
See gh-46276
2025-07-09 08:25:35 +02:00
Stéphane Nicoll 4666d30e39 Start building against Reactor Bom 2024.0.8 snapshots
See gh-46275
2025-07-09 08:25:35 +02:00
Stéphane Nicoll 6881ea1adb Start building against Micrometer Tracing 1.4.8 snapshots
See gh-46274
2025-07-09 08:25:35 +02:00
Stéphane Nicoll 6cbd25a2de Start building against Micrometer 1.14.9 snapshots
See gh-46273
2025-07-09 08:25:35 +02:00
Phillip Webb 6cb9d47773 Merge branch '3.4.x' into 3.5.x
Closes gh-46353
2025-07-08 13:18:16 -07:00
Phillip Webb 1ed1757ba3 Ensure eclipse classpath excludes binary output folders
Update `EclipseConventions` so that classpath `whenMerged` changes
are applied via `JavaBasePlugin`. Without this change, the `whenMerged`
item is added, but then`EclipsePlugin.configureEclipseClasspath` is
called from a `project.getPlugins().withType(JavaBasePlugin.class, ...`
call. Using a nested call appears to fix the issue, probably because
it now runs after `configureEclipseClasspath`.

Closes gh-46319
2025-07-08 13:09:56 -07:00
Andy Wilkinson c9fa96d832 Merge branch '3.4.x' into 3.5.x
Closes gh-46315
2025-07-07 12:48:04 +01:00
Andy Wilkinson 92d6c5426e Merge pull request #45880 from quaff
* gh-45880:
  Polish usage of `@ConditionalOnWebApplication` for consistency

Closes gh-45880
2025-07-07 11:44:04 +01:00
Yanming Zhou af8558a84a Polish usage of @ConditionalOnWebApplication for consistency
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

See gh-45880
2025-07-07 11:29:58 +01:00
Andy Wilkinson efca113f07 Do not wrap known-safe MessageSourceResolvables
In Spring Boot 3.5, support was added for including the errors from
a  MethodValidationResult in the standard error response. It was
requested in gh-42013 and implemented in gh-43330. With hindsight,
the implementation went too far as it changed how all errors are
serialized to JSON.

This commit reworks the wrapping so that ObjectErrors are not
wrapped, restoring Spring Boot 3.4's behavior. This is considered
safe as the contents of an ObjectError are fairly limited and should
serialize to JSON without problems. Other MessageSourceResolvable
implementations are still wrapped as there are no limits on their
contents and we cannot predict how suitable they are for JSON
serialization.

Closes gh-46260
2025-07-07 10:38:51 +01:00
Andy Wilkinson 12310d36c2 Merge branch '3.4.x' into 3.5.x
Closes gh-46305
2025-07-07 09:47:34 +01:00
Andy Wilkinson 803a29c656 Merge pull request #46291 from PiyalAhmed
* gh-46291:
  Polish

Closes gh-46291
2025-07-07 09:47:25 +01:00
Piyal Ahmed b9589203dc Polish
Signed-off-by: Piyal Ahmed <piya.salamence@gmail.com>

See gh-46291
2025-07-07 09:31:43 +01:00
Andy Wilkinson a05bf0154e Merge branch '3.4.x' into 3.5.x
Closes gh-46301
2025-07-07 07:53:31 +01:00
Andy Wilkinson 8c261ce2fc Test Gradle plugin against Gradle 7.6.6
Closes gh-46300
2025-07-07 07:52:21 +01:00
Andy Wilkinson 8008ec810d Merge branch '3.4.x' into 3.5.x
Closes gh-46298
2025-07-07 07:49:37 +01:00
Andy Wilkinson 41fb4678de Upgrade to Gradle 8.14.3
Closes gh-46297
2025-07-07 07:48:48 +01: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 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 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 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 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 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