Commit Graph
389 Commits
Author SHA1 Message Date
Phillip Webb e4870664f1 Merge branch '4.0.x' into 4.1.x 2026-08-24 19:09:52 -07:00
Phillip Webb 068bb037bf Change code to make Eclipse compiler happy
Extract a local variable to fix compiler error that only seems to
happen in Eclipse.
2026-08-24 19:07:53 -07:00
Andy Wilkinson b1454cd2de Merge branch '4.0.x' into 4.1.x 2026-08-24 15:52:12 +01:00
Andy Wilkinson 6dbc7e9a51 Use method on String to identify Java 27
At the time of writing, https://javaalmanac.io lists
EnumSet.spliterator as being new in Java 27, but that's not the case.

This commit switches to using String.encodedLength(Charset) instead.
This method is new in Java 27 and also aligns with the existing
TWENTY_SIX value that already uses a method on String for version
identification.

See gh-51422
2026-08-24 15:47:34 +01:00
Andy Wilkinson 975c591a97 Merge branch '4.0.x' into 4.1.x 2026-08-24 15:31:45 +01:00
Andy Wilkinson 6e58a6ff8b Polish
See gh-51422
2026-08-24 15:31:30 +01:00
Andy Wilkinson feb66aa843 Merge branch '4.0.x' into 4.1.x
Closes gh-51426
2026-08-24 15:21:55 +01:00
Andy Wilkinson ff153f21d8 Add TWENTY_SEVEN to JavaVersion
Closes gh-51422
2026-08-24 14:51:52 +01:00
Stéphane Nicoll 4ee67a3f6b Merge branch '4.0.x' into 4.1.x
Closes gh-51418
2026-08-24 08:26:06 +02:00
Stéphane Nicoll 43d3cf57eb Close reader in GsonTester
This harmonizes how JSON marshaller testers operate on a stream. Also
added tests that checks the source is closed as expected for all
implementations.

Closes gh-51417
2026-08-24 08:21:51 +02:00
Stéphane Nicoll 515810853f Merge branch '4.0.x' into 4.1.x
Closes gh-51415
2026-08-24 08:08:03 +02:00
Stéphane Nicoll 5402f5b43f Polish "Release file handle when comparing AOT file content"
See gh-51398
2026-08-24 08:05:45 +02:00
dlwldn30 4a1abb9617 Release file handle when comparing AOT file content
RequireNewOrMatchingContentFileHandler reads the already generated file
through content.getInputStream().readAllBytes(). That method does not
close the stream, and the stream is never assigned, so it cannot
be closed at all.

During AOT processing the content is a FileSystemResource, so each
comparison leaks a file handle. FileSystemGeneratedFiles already uses
try-with-resources when it consumes an InputStreamSource.

Read the existing content inside a try-with-resources block.

See gh-51398

Signed-off-by: dlwldn30 <dlwldn30@naver.com>
2026-08-24 08:05:38 +02:00
Stéphane Nicoll dafadea2ab Polish "Reset cached AppendableByteArray before it is reused"
See gh-51156
2026-08-11 17:59:20 +02:00
Sumit Kumar Das fc6acdbc21 Reset cached AppendableByteArray before it is reused
AppendableByteArray.reset() was only called from toByteArray(), so an
encode that failed part-way left its partial output in the thread-local
cached instance. The next value encoded on that thread was then prefixed
with it, which in structured logging corrupted the log event following a
failed one.

Reset the cached instance when it is handed out instead, so the buffer
is clean regardless of how the previous use ended. This also covers the
early return in toByteArray() for empty content, which returns without
resetting.

See gh-51156

Signed-off-by: Sumit Kumar Das <skdas5405@gmail.com>
2026-08-11 17:59:20 +02:00
Stéphane Nicoll 3b92c4e5b0 Merge branch '4.0.x' into 4.1.x
Closes gh-51325
2026-08-10 16:33:17 +02:00
Stéphane Nicoll b7ba1d8521 Revert "Work around Gradle changing line endings during property expansion"
This reverts commit 936998647e.

Closes gh-50905
2026-08-10 16:19:33 +02:00
Stéphane Nicoll 55bb4eb0c6 Merge branch '4.0.x' into 4.1.x
Closes gh-51284
2026-08-05 15:13:25 +02:00
Stéphane Nicoll f40977b642 Allow profiles auto-completion for spring.profiles.group
Closes gh-51273
2026-08-05 15:11:48 +02:00
Stéphane Nicoll bce125b7ec Merge branch '4.0.x' into 4.1.x
Closes gh-51087
2026-07-21 14:51:51 +02:00
Stéphane Nicoll d9ff81ff4a Polish "Adapt to improvements in Nullaway 0.13.8"
See gh-50972
2026-07-21 14:48:46 +02:00
Stéphane Nicoll c80497dac1 Upgrade to Logback 1.5.38
Closes gh-51016
2026-07-20 12:32:14 +02:00
Stéphane Nicoll 6d45e6aa64 Upgrade to Logback 1.5.38
Closes gh-50985
2026-07-20 10:30:27 +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 7a89c31f91 Merge branch '4.0.x'
Closes gh-50950
2026-07-14 18:28:28 +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 e44b486a00 Merge branch '4.0.x' 2026-06-30 10:10:35 +02:00
Stéphane Nicoll 22eef97293 Add missing or outdated copyright headers
See gh-50894
2026-06-30 10:04:39 +02:00
Andy Wilkinson 1d693b1bc4 Merge branch '4.0.x'
Closes gh-50885
2026-06-29 11:11:18 +01:00
Yanming Zhou 9824f25998 Remove unnecessary @Nullables from local array variable declarations
See gh-50881

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2026-06-29 10:28:32 +01:00
Andy Wilkinson c5261cf0eb Merge branch '4.0.x'
Closes gh-50878
2026-06-28 12:14:56 +01:00
Andy Wilkinson ecacc0aa1e Polish "Remove unnecessary @Nullables from local variable declarations"
See gh-50866

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-06-28 12:05:09 +01:00
Andy Wilkinson 525006c163 Merge branch '4.0.x'
Closes gh-50856
2026-06-24 21:12:11 +01:00
Ahmed El amraouiyine 249dab6d6f Handle unresolved validation target types
See gh-50798

Signed-off-by: Ahmed El amraouiyine <amraouiyine@gmail.com>
2026-06-24 21:09:33 +01:00
Andy Wilkinson 9de4f8d0d4 Merge branch '4.0.x'
Closes gh-50853
2026-06-24 19:49:46 +01:00
SJLIM 34ce653f95 Add nested override coverage for @SpringBootTest imports
See gh-50625

Signed-off-by: SJLIM <yyvaca30@gmail.com>
2026-06-24 19:47:35 +01:00
Andy Wilkinson 7a45ee8767 Merge branch '4.0.x'
Closes gh-50851
2026-06-24 19:12:35 +01:00
Yanming Zhou 9d5c98b7e9 Replace isAssignableFrom() with isInstance() where feasible
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

See gh-50750
2026-06-24 19:11:59 +01:00
Andy Wilkinson fa371e852e Merge branch '4.0.x'
Closes gh-50845
2026-06-24 13:21:35 +01:00
Andy Wilkinson 8715efc615 Polish "Address new warnings from NullAway 0.13.6"
See gh-50701
2026-06-24 13:18:32 +01:00
Manu Sridharan 2b7f6f3c69 Address new warnings from NullAway 0.13.6
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-50701
2026-06-24 13:16:07 +01:00
Phillip Webb 12eb46696a Polish 'Bind empty strings to empty maps'
See gh-50773
2026-06-20 19:46:42 -07:00
Ahmed El amraouiyine 485bd7c636 Bind empty strings to empty maps
Align `MapBinder` with `IndexedElementsBinder` to ensure that
empty strings are bound as empty `Map` instances rather than
throwing a `ConverterNotFoundException`.

See gh-50773

Signed-off-by: Ahmed El amraouiyine <ahmed.elamraouiyine@vilavi.fr>
2026-06-20 19:44:29 -07:00
Stéphane Nicoll 905351fe77 Merge branch '4.0.x'
Closes gh-50729
2026-06-09 16:28:25 +02:00
Stéphane Nicoll 58f1a584d3 Merge branch '3.5.x' into 4.0.x
Closes gh-50728
2026-06-09 16:26:28 +02:00
Stéphane Nicoll 5bf2a32b11 Merge branch '4.0.x' 2026-05-30 14:39:57 +02:00
Stéphane Nicoll 98084aab2b Reformat additional-spring-configuration-metadata.json files 2026-05-30 14:28:53 +02:00
Stéphane Nicoll 325b234918 Merge branch '4.0.x'
Closes gh-50618
2026-05-29 12:31:05 +02:00