Commit Graph
285 Commits
Author SHA1 Message Date
Phillip Webb da3fd5cf53 Merge branch '4.0.x'
Closes gh-49732
2026-03-24 13:43:06 -07:00
Phillip Webb 4694f6fa6a Merge branch '3.5.x' into 4.0.x
Closes gh-49731
2026-03-24 13:38:12 -07:00
Stéphane Nicoll 3a38f0039b Merge branch '4.0.x'
Closes gh-49728
2026-03-24 10:29:45 +01:00
Stéphane Nicoll a96bfd6a0b Merge branch '3.5.x' into 4.0.x
Closes gh-49727
2026-03-24 10:29:30 +01:00
Phillip Webb eff95e98a5 Merge branch '4.0.x'
Closes gh-49698
2026-03-21 14:23:13 -07:00
Phillip Webb e464348fa4 Merge branch '3.5.x' into 4.0.x
Closes gh-49697
2026-03-21 14:22:46 -07:00
Andy Wilkinson b2631fbe42 Merge branch '4.0.x'
Closes gh-49669
2026-03-19 18:33:16 +00:00
Andy Wilkinson 01170c3273 Merge branch '3.5.x' into 4.0.x
Closes gh-49668
2026-03-19 18:30:47 +00:00
Yanming Zhou 4418c451f3 Fix typo
See gh-49635

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2026-03-18 08:24:53 +01:00
Phillip Webb 79261acd30 Support empty property defaults binding without parameters
Refine empty property default binding support to include no-arg
constructors.

See gh-48920
2026-03-17 19:59:07 -07:00
Phillip Webb 55eba139ec Support binding of default properties when an empty property is defined
Update the `Binder` so that empty properties are treated as an indicator
that default value binding should be attempted. This update allow bound
objects to differentiate between a completely missing property vs one
that is present but doesn't have any values.

For example, given the following value object:

	@ConfigurationProperties("my")
	public record My(Name name, int age) {

		public record Name(String first, String last) {
		}

	}

The following binding scenarios are supported:

1) Full binding

	my.name.first=Spring
	my.name.last=Boot
	my.age=4

Binds to `new My(new Name("Spring", "Boot"), 4)`
(works the same as Spring Boot 4.0)

2) Missing Properties

	my.age=4

Binds to `new My(null, 4)`
(works the same as Spring Boot 4.0)

3) Default Properties

	my.name=
	my.age=4

Binds to `new My(new Name(null, null), 4)`
(previously would throw a converter exception)

Closes gh-48920
2026-03-17 11:37:51 -07:00
Andy Wilkinson 29e4938971 Polish "Add more styling support to the Logback and Log4j2 color converters"
See gh-49285
2026-03-12 09:27:04 +00:00
mvirole 2e12df8e4f Add more styling support to the Logback and Log4j2 color converters
- Add REVERSE (ANSI code 7) to AnsiStyle enum
- Expand ColorConverter ELEMENTS map to include all AnsiStyle values
  (bold, italic, underline, normal, faint, reverse) and all AnsiBackground
  colors with the bg_ prefix (bg_red, bg_bright_green, etc.)
- Update tests for both logback and log4j2 converters

See gh-49285

Signed-off-by: mvirole <virolemayank@gmail.com>
2026-03-11 16:11:38 +00:00
Phillip Webb cc1578aecb Allow empty objects to be loaded from YAML
Update `OriginTrackedYamlLoader` so that empty objects are retained
in the resulting `PropertySource`.

Closes gh-48958
2026-03-09 20:03:05 -07:00
Andy Wilkinson 9d4500fea6 Merge branch '4.0.x'
Closes gh-49536
2026-03-09 17:27:26 +00:00
Andy Wilkinson af774d681f Merge branch '3.5.x' into 4.0.x
Closes gh-49535
2026-03-09 17:27:16 +00:00
Andy Wilkinson f90ebbdd0a Merge branch '4.0.x'
Closes gh-49534
2026-03-09 17:22:14 +00:00
Andy Wilkinson ace172f8e0 Merge branch '3.5.x' into 4.0.x
Closes gh-49533
2026-03-09 17:22:03 +00:00
Andy Wilkinson 0ede2b0e60 Merge branch '4.0.x'
Closes gh-49517
2026-03-09 08:58:28 +00:00
Andy Wilkinson a249315be3 Merge branch '3.5.x' into 4.0.x
Closes gh-49516
2026-03-09 08:58:18 +00:00
Phillip Webb 481d87e120 Merge branch '4.0.x'
Closes gh-49483
2026-03-06 22:27:45 -05:00
Phillip Webb 2cecb37efd Merge branch '3.5.x' into 4.0.x
Closes gh-49482
2026-03-06 22:27:12 -05:00
Brian Clozel 9ddced4591 Merge branch '4.0.x'
Closes Closes gh-49480
2026-03-06 18:05:31 +01:00
Brian Clozel 7291a1ef58 Merge branch '3.5.x' into 4.0.x
Closes gh-49479
2026-03-06 18:04:42 +01:00
Andy Wilkinson 24683045d1 Improve diagnostics for @DockerComposeTest failures
Closes gh-49477
2026-03-06 15:35:01 +00:00
Stéphane Nicoll 494e86b56e Start building against Spring Framework 7.0.6 snapshots
See gh-49441
2026-03-06 09:53:35 +01:00
Stéphane Nicoll 9c93ff4b78 Start building against Spring Framework 7.0.6 snapshots
See gh-49418
2026-03-06 09:29:09 +01:00
Andy Wilkinson ad0538f6d9 Log Docker Compose logs when up or start fails
Closes gh-49423
2026-03-05 11:01:30 +00:00
Andy Wilkinson e6ba227e53 Merge branch '4.0.x'
Closes gh-49427
2026-03-05 11:01:19 +00:00
Andy Wilkinson 9e2d446dfe Merge branch '3.5.x' into 4.0.x
Closes gh-49426
2026-03-05 11:00:44 +00:00
Andy Wilkinson 785e5bb23d Merge branch '4.0.x' 2026-03-04 15:06:21 +00:00
Andy Wilkinson d5f088a61b Allow more time for Docker Compose-managed containers to be healthy
When running with Elasticsearch 9, the recently added test that
checks connectivity using SSL is flaky on CI. When the test fails,
it does so because Docker Compose reports that the container is
unhealthy when running docker compose up. One possibility is that
this is due to the container taking too long to reach a healthy
state. This commit attempts to confirm that theory and hopefully
address the problem by configuring a wait timeout of 120 seconds
for the up command.

See gh-49385
2026-03-04 15:02:15 +00:00
Andy Wilkinson 3334f54efe Merge branch '4.0.x'
Closes gh-49384
2026-03-03 11:24:20 +00:00
Andy Wilkinson 0dd7f6d78d Polish "Allow Log4j2 logging system to be forced by system property"
See gh-49343
2026-03-03 11:20:42 +00:00
Fabrice Bibonne 9cf13004d7 Allow Log4j2 logging system to be forced by system property
Signed-off-by: Fabrice Bibonne <fabrice.bibonne@courriel.eco>

See gh-49343
2026-03-03 11:20:32 +00:00
Stéphane Nicoll 3f48dd1db9 Merge branch '4.0.x' 2026-03-03 10:45:14 +01:00
Stéphane Nicoll c2cb4f2bb1 Fix broken test setup 2026-03-03 10:44:00 +01:00
Stéphane Nicoll 0cf947cc9e Merge branch '4.0.x'
Closes gh-49380
2026-03-03 10:41:35 +01:00
Stéphane Nicoll 2a80a3cac6 Polish "Restore error page support in WAR deployments"
See gh-49176
2026-03-03 10:41:17 +01:00
Jay Choi 1a42b5c282 Restore error page support in WAR deployments
See gh-49176

Signed-off-by: Jay Choi <jayyoungchoi22@gmail.com>
2026-03-03 10:41:16 +01:00
Stéphane Nicoll fae95ee334 Polish "Add support for Log4j2 rolling policy configuration"
See gh-47260
2026-03-02 14:38:11 +01:00
hojooo d865935652 Add support for Log4j2 rolling policy configuration
See gh-47260

Signed-off-by: hojooo <ghwn5833@gmail.com>
2026-03-02 11:01:02 +01:00
Phillip Webb 2182339bb1 Add FailureAnalyzedException support
Add `FailureAnalyzedException` to reduce the number of internal
`FailureAnalizers` required when only a simple "description" and
"action" are required.

Closes gh-49320
2026-02-24 22:39:00 -08:00
Stéphane Nicoll 6bf72956fd Merge branch '4.0.x'
Closes gh-49301
2026-02-23 16:47:29 +01:00
Stéphane Nicoll 5c9dbd4a4d Merge branch '3.5.x' into 4.0.x
Closes gh-49300
2026-02-23 16:47:20 +01:00
Phillip Webb d102bb69b3 Create reusable default TaskScheduler configuration
Create a `DefaultTaskSchedulerConfiguration` for use when standard
task scheduler beans are required.

Closes gh-49280
2026-02-20 16:28:36 -08:00
Andy Wilkinson 4780d5dc81 Merge branch '4.0.x'
Closes gh-49194
2026-02-11 13:57:06 +00:00
Andy Wilkinson c414ec241d Add TWENTY_SIX to JavaVersion enum
Closes gh-49193
2026-02-11 13:56:39 +00:00
Andy Wilkinson 8df13b4709 Polish "Add RabbitMQ Stream service connection from RabbitMQContainer"
See gh-42443
2026-02-09 14:11:32 +00:00
Andy Wilkinson 5f797f7af3 Polish "Add time, locale, and work dir data to ProcessInfo"
See gh-48959
2026-02-09 14:03:41 +00:00