Commit Graph
458 Commits
Author SHA1 Message Date
Phillip Webb c96f146f2c Merge branch '4.1.x' 2026-09-15 20:44:43 -07:00
Phillip Webb e45e629145 Merge branch '4.0.x' into 4.1.x 2026-09-15 20:44:24 -07:00
Phillip Webb 9fd0762b3c Fix javadoc empty <p> tag warnings 2026-09-15 20:33:44 -07:00
Andy Wilkinson bc72f228c3 Merge branch '4.1.x'
Closes gh-51764
2026-09-15 13:03:19 +01:00
Andy Wilkinson 7612f4a222 Merge branch '4.0.x' into 4.1.x
Closes gh-51763
2026-09-15 13:03:03 +01:00
Hyunwoo Jung ed63da9f5d Fix duplicated tests
Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51722
2026-09-15 12:48:22 +01:00
Stéphane Nicoll 4bf6557076 Start building against Spring Framework 7.1.0-M2 snapshots
See gh-51712
2026-09-12 18:19:41 +02:00
Wan bin yu 57f1c947d1 Resolve property placeholders in constructor binding default values
Resolve each annotated default using the binder placeholder resolver
before conversion.

Signed-off-by: Wan bin yu <3431359639@qq.com>

See gh-51661
2026-09-11 16:56:09 +01:00
Stéphane Nicoll 03d367bb07 Merge branch '4.1.x'
Closes gh-51629
2026-09-08 17:29:34 +02:00
Stéphane Nicoll 18292d400c Merge branch '4.0.x' into 4.1.x
Closes gh-51628
2026-09-08 16:57:00 +02:00
Stéphane Nicoll b1e91c942e Add support for creating a container from a TestImage value
This commit improves TestImage so that an explicit image can trigger
the creation of the container, with optional additional setup. This
removes the need of creating additional container types for images that
have multiple flavors, and to please the static method that can only
create a container based on a single match.

Closes gh-51082
2026-09-08 16:46:48 +02:00
Andy Wilkinson 85535ce81f Merge branch '4.1.x'
Closes gh-51607
2026-09-07 12:20:42 +01:00
Andy Wilkinson 50350d0c83 Merge branch '4.0.x' into 4.1.x
Closes gh-51606
2026-09-07 12:20:30 +01:00
Hyunwoo Jung 528c8bd1ea Fix typos
Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>

See gh-51590
2026-09-07 11:53:30 +01:00
Andy Wilkinson 57b44b0594 Merge branch '4.1.x'
Closes gh-51600
2026-09-07 08:27:14 +01:00
Andy Wilkinson ea613dc511 Merge branch '4.0.x' into 4.1.x
Closes gh-51599
2026-09-07 08:26:42 +01:00
Manu Sridharan 25a3f8feb9 Remove unnecessary NullAway suppressions
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-51591
2026-09-07 08:18:11 +01:00
Andy Wilkinson 5884541384 Merge branch '4.1.x'
Closes gh-51586
2026-09-04 14:54:05 +01:00
JaeHyunAn 87cadf2c9c Fix corruption of supplementary characters in AppendableByteArray
A high surrogate left unconsumed by the encoder was dropped between
append calls, so surrogate pairs written a character at a time by
JsonValueWriter were replaced with `?`.

See gh-51464

Signed-off-by: JaeHyunAn <98042706+yyuneu@users.noreply.github.com>
2026-09-04 13:43:50 +01:00
Andy Wilkinson d305cc0ddc Merge branch '4.1.x'
Closes gh-51585
2026-09-04 12:58:46 +01:00
Andy Wilkinson 61a62d56d8 Merge branch '4.0.x' into 4.1.x
Closes gh-51584
2026-09-04 12:58:36 +01:00
Manu Sridharan 1c50b1cb7c Fix new warnings from NullAway 0.14.1
Signed-off-by: Manu Sridharan <msridhar@gmail.com>

See gh-51507
2026-09-04 12:56:34 +01:00
Andy Wilkinson a8f73986f6 Align JSON null and empty handling with that of YAML
Closes gh-51583
2026-09-04 12:35:34 +01:00
Andy Wilkinson 682816229a Merge branch '4.1.x'
Closes gh-51577
2026-09-04 10:07:51 +01:00
Andy Wilkinson c38c15b3b7 Merge branch '4.0.x' into 4.1.x
Closes gh-51576
2026-09-04 09:53:28 +01:00
Vladimir Sitnikov ff3086700b Fix unrecognized JSpecify nullable annotations
Signed-off-by: Vladimir Sitnikov <sitnikov.vladimir@gmail.com>

See gh-51555
2026-09-04 09:40:47 +01:00
Andy Wilkinson e2bcbdf0af Merge branch '4.1.x'
Closes gh-51575
2026-09-04 09:35:41 +01:00
Andy Wilkinson 4c5ed7e087 Merge branch '4.0.x' into 4.1.x
Closes gh-51574
2026-09-04 09:35:30 +01:00
kdomo 3d037f9df6 Correct Assert messages that name the wrong parameter
Three Assert messages named a parameter that does not exist on the
method. In each case the correct name is already used by neighbouring
code in the same class.

Signed-off-by: kdomo <dongho5088@naver.com>

See gh-51568
2026-09-04 09:10:05 +01:00
Andy Wilkinson bc46876bee Remove dependency management for Janino
Closes gh-51567
2026-09-04 09:03:05 +01:00
Andy Wilkinson 73d3795662 Merge branch '4.1.x'
Closes gh-51573
2026-09-04 08:43:32 +01:00
Andy Wilkinson 8350f147ff Merge branch '4.0.x' into 4.1.x
Closes gh-51572
2026-09-04 08:43:15 +01:00
Andy Wilkinson 10190c7cc7 Fix race condition in ProcessRunnerTests
There's a race between destruction of the process completing and the
test checking that the process has been destroyed. When the test
wins the race, it fails.

This commit removes the race condition by updating the test to wait
until the process has been destroyed.

Closes gh-51571
2026-09-04 08:40:35 +01:00
henriquejsza 626d5fdf3c Add ResourceBasedMessageSourceConfigurer
Signed-off-by: henriquejsza <henriquejsza@gmail.com>

See gh-51484
2026-09-02 14:53:00 +01:00
Andy Wilkinson 2772023050 Merge branch '4.1.x'
Closes gh-51545
2026-09-02 14:24:39 +01:00
Andy Wilkinson 8e7128730f Merge branch '4.0.x' into 4.1.x
Closes gh-51544
2026-09-02 14:18:14 +01:00
Andy Wilkinson d6c2e687b0 Polish "Use constructor injection in classes that partipate in @Import"
See gh-51490

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-02 14:16:07 +01:00
Andy Wilkinson 7e41b2b678 Merge branch '4.1.x'
Closes gh-51539
2026-09-02 09:13:09 +01:00
Andy Wilkinson 94ca058844 Merge branch '4.0.x' into 4.1.x
Closes gh-51538
2026-09-02 09:12:54 +01:00
Andy Wilkinson bf8731693b Polish "Improve Docker Compose ProcessRunner's handling of failure cases"
See gh-50963

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-02 09:11:53 +01:00
Sebastien Tardif 27e96308ed Improve Docker Compose ProcessRunner's handling of failure cases
Release the output reader latch in a finally block so a failing stream
read or output consumer cannot leave ProcessRunner.run blocked on
CountDownLatch.await after the child process has exited.

Destroy the child process when waitFor is interrupted so Docker Compose
commands are not left running as orphans.

Signed-off-by: Sebastien Tardif <sebtardif@ncf.ca>

See gh-50963
2026-09-02 09:02:00 +01:00
Phillip Webb ef4f1404a1 Merge branch '4.1.x'
Closes gh-51455
2026-08-25 14:19:47 -07:00
Phillip Webb 914f39384c Merge branch '4.0.x' into 4.1.x
Closes gh-51454
2026-08-25 14:07:23 -07:00
Phillip Webb 5a21e0d698 Upgrade to spring-javaformat 0.0.48
Closes gh-51452
2026-08-25 13:58:58 -07:00
Phillip Webb 64dd438bb8 Merge branch '4.1.x'
Closes gh-51449
2026-08-25 12:39:52 -07:00
Phillip Webb 40c527aeb0 Merge branch '4.0.x' into 4.1.x
Closes gh-51448
2026-08-25 12:39:46 -07:00
Manu Sridharan 23fc7dd183 Fix warning from NullAway 0.14.0 related to override
See gh-51409

Signed-off-by: Manu Sridharan <msridhar@gmail.com>
2026-08-25 12:29:02 -07:00
Phillip Webb 42f06537c1 Merge branch '4.1.x'
Closes gh-51446
2026-08-25 12:08:57 -07:00
Phillip Webb 299c7d9125 Merge branch '4.0.x' into 4.1.x
Closes gh-51445
2026-08-25 12:08:53 -07:00
chisanw 857d1b7a8a Fix typos in service connection documentation
See gh-51431

Signed-off-by: chisanw <keuye06380618@gmail.com>
2026-08-25 12:07:13 -07:00