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
Phillip Webb
6c81a602ab
Merge branch '4.1.x'
2026-08-24 19:10:29 -07:00
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
59ec1f0de7
Merge branch '4.1.x'
2026-08-24 15:52:25 +01: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
5289c755f5
Merge branch '4.1.x'
2026-08-24 15:31:53 +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
5b5363ff44
Merge branch '4.1.x'
...
Closes gh-51427
2026-08-24 15:22:24 +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
8588f4b2ea
Merge branch '4.1.x'
...
Closes gh-51419
2026-08-24 08:26:53 +02: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
958dee93d2
Merge branch '4.1.x'
...
Closes gh-51416
2026-08-24 08:08:10 +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