Commit Graph
484 Commits
Author SHA1 Message Date
Stéphane Nicoll 9be97e6b81 Merge branch '4.1.x'
Closes gh-52091
2026-10-07 16:54:34 +02:00
Stéphane Nicoll f825d04234 Merge branch '4.0.x' into 4.1.x
Closes gh-52090
2026-10-07 16:54:25 +02:00
Tim te Beek a5e6f1bf7b Fix assertions whose result was ignored
Several tests called AssertJ's assertThat without chaining an assertion,
or chained withFailMessage after the assertion had already run, so they
verified nothing. Found with OpenRewrite's FindIgnoredCheckReturnValue.

See gh-52045

Signed-off-by: Tim te Beek <tim@moderne.io>
2026-10-07 16:47:12 +02:00
Stéphane Nicoll 993362e934 Merge branch '4.1.x'
Closes gh-52089
2026-10-07 16:44:02 +02:00
Stéphane Nicoll 9bcbd38528 Merge branch '4.0.x' into 4.1.x
Closes gh-52088
2026-10-07 16:34:54 +02:00
Stéphane Nicoll 5d720a2138 Polish "Prevent pausing of the logging system"
See gh-51959
2026-10-07 16:27:32 +02:00
Raphael Vullriede 0c365319ef Prevent pausing of the logging system
When the test context framework pauses a cached context, the logging
lifecycle's stop() cleans up the logging system. With Logback this
uninstalls the JUL bridge handler for the whole JVM and nothing
reinstalls it when the context is restarted, so JUL output is lost
in later tests that reuse the context.

This commit makes the lifecycle non-pauseable so that cleanup only
happens on close, as it already does for the web server lifecycles.

See gh-51959

Signed-off-by: Raphael Vullriede <raphael@osslabz.net>
2026-10-07 16:09:03 +02:00
Stéphane Nicoll 99582d0bd2 Upgrade to SLF4J 2.0.20
Closes gh-52079
2026-10-07 14:22:34 +02:00
Stéphane Nicoll 980b7b4ce9 Upgrade to SLF4J 2.0.20
Closes gh-52030
2026-10-06 15:09:55 +02:00
Stéphane Nicoll ddb4fb7244 Upgrade to SLF4J 2.0.20
Closes gh-52001
2026-10-06 15:05:16 +02:00
Andy Wilkinson e3d0afe294 Merge branch '4.1.x'
Closes gh-51909
2026-10-01 09:53:02 +01:00
Andy Wilkinson 616e64b4ae Merge branch '4.0.x' into 4.1.x
Closes gh-51908
2026-10-01 09:52:47 +01:00
Andy Wilkinson f6aa92821d Fix BasicJsonParser's escape handling in nested elements
BasicJsonParser tokenizes JSON into map entries (key-value pairs)
and list entries (values). As part of this, any escaped characters
are unescaped. When the values are themselves maps or lists, they
are tokenized again. This multi-pass approach with every pass
performing unescaping causes the escaped characters to be handled
incorrectly.

This commit updates BasicJsonParser to leave escape characters in
place when its parsing characters nested within a list or map. The
escaping is now only considered when parsing a scalar value. This
ensures that unescaping is only performed once.

Fixes gh-51907
2026-10-01 09:08:42 +01:00
Phillip Webb 875efab7d5 Polish 'Improve auto-configuration sorting performance'
See gh-51867
2026-09-28 15:35:29 -07:00
aalsanie a0c3aecc1a Improve auto-configuration sorting performance
Update `AutoConfigurationSorter` to improve performance by  building
reverse `@AutoConfigureBefore` relationships while the
auto-configuration graph is created and using stable sort ranks during
traversal.

See gh-51867

Signed-off-by: aalsanie <ahmad.alsanie@hotmail.com>
2026-09-28 15:33:17 -07:00
Phillip Webb a39d2a0700 Merge branch '4.1.x'
Closes gh-51895
2026-09-28 09:18:28 -07:00
Phillip Webb 80a2d49953 Merge branch '4.0.x' into 4.1.x
Closes gh-51894
2026-09-28 09:18:06 -07:00
Phillip Webb d9df34b827 Polish 'Fix formatting a zero period with a weeks unit'
See gh-51892
2026-09-28 07:54:19 -07:00
Yingzi Zhang b21366db6d Fix formatting a zero period with a weeks unit
See gh-51892

Signed-off-by: Yingzi Zhang <yingzizhang1205@gmail.com>
2026-09-28 07:53:16 -07:00
Stéphane Nicoll 593344ccc1 Merge branch '4.1.x'
Closes gh-51885
2026-09-28 11:07:19 +02:00
Stéphane Nicoll dda41fef36 Merge branch '4.0.x' into 4.1.x
Closes gh-51884
2026-09-28 11:07:14 +02:00
Tran Ngoc Nhan 3fe8d42485 Remove unnecessary cast to null
See gh-51850

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2026-09-28 10:54:13 +02:00
Phillip Webb 602a7e73e9 Polish 'Allow properties migrator to fail application startup'
See gh-51855
2026-09-25 20:24:40 -07:00
Hyunwoo Jung a86aa43303 Allow properties migrator to fail application startup
Add a new configuration property to prevent the application from
starting when configuration keys that need to be migrated are
found.

With `on-error`, the application fails when keys that are no longer
supported are found. With `on-warning`, it also fails when keys that
have been renamed are found. The default, `never`, keeps the current
behavior of only logging the report.

See gh-51855

Signed-off-by: Hyunwoo Jung <hyunwoojung@kakao.com>
2026-09-25 20:23:53 -07:00
Andy Wilkinson fafa1c4375 Polish "Pick up all @TypeExcludeFilters annotations on test classes"
See gh-51489

Signed-off-by: Andy Wilkinson <andy.wilkinson@broadcom.com>
2026-09-17 12:11:52 +01:00
Dmytro Nosan e78471699c Pick up all @TypeExcludeFilters annotations on test classes
Previously, TypeExcludeFiltersContextCustomizerFactory
only discovered the first @TypeExcludeFilters annotation.

This commit updates it to discover all @TypeExcludeFilters
annotations instead of stopping at the first.

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

See gh-51489
2026-09-17 12:04:36 +01:00
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