Commit Graph
291 Commits
Author SHA1 Message Date
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 4b45f6f91e Merge branch '4.0.x'
Closes gh-49430
2026-03-05 16:15:54 +01:00
Stéphane Nicoll dd75c09277 Merge branch '3.5.x' into 4.0.x
Closes gh-49429
2026-03-05 16:15:38 +01:00
Stéphane Nicoll c6ca9fbe25 Merge branch '4.0.x'
Closes gh-49393
2026-03-04 08:49:39 +01:00
Stéphane Nicoll bad9c3c903 Merge branch '3.5.x' into 4.0.x
Closes gh-49392
2026-03-04 08:49:31 +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
Stéphane Nicoll 27cf8e90eb Merge branch '4.0.x'
Closes gh-49363
2026-03-02 09:39:36 +01:00
Stéphane Nicoll 49d2296c8e Merge branch '3.5.x' into 4.0.x
Closes gh-49362
2026-03-02 09:39:24 +01:00
Andy Wilkinson ac290cdb43 Polish
See gh-48971
2026-02-26 15:18:08 +00:00
Brian Clozel 8018829ff5 Deprecate LiveReload support for removal
Closes gh-48971
2026-02-26 14:22:02 +01:00
Andy Wilkinson d11f64a7af Merge branch '4.0.x'
Closes gh-49328
2026-02-26 09:38:21 +00:00
Andy Wilkinson 6c8cd183bd Merge branch '3.5.x' into 4.0.x
Closes gh-49327
2026-02-26 09:38:10 +00:00
Andy Wilkinson 89d6faae1a Merge branch '4.0.x'
Closes gh-49313
2026-02-24 15:37:47 +00:00
giyeon95 9ab01f61bd Remove extraneous semicolon from read-timeout value
Signed-off-by: giyeon95 <giyeon15@gmail.com>

See gh-49306
2026-02-24 15:36:55 +00:00
Stéphane Nicoll f0a66e7865 Merge branch '4.0.x' 2026-02-23 12:14:14 +01:00
Stéphane Nicoll f092971c7c Fix link to INSTALL.txt 2026-02-23 12:13:30 +01:00
Stéphane Nicoll 2fb9eb49d6 Merge branch '4.0.x'
Closes gh-49288
2026-02-22 17:23:57 +01:00
Stéphane Nicoll eff9ca0af2 Merge branch '3.5.x' into 4.0.x
Closes gh-49287
2026-02-22 17:23:48 +01:00
Andy Wilkinson 918e59b817 Add customizer and property support for configuring Jackson factories
Closes gh-34709
2026-02-13 11:31:17 +00:00
Andy Wilkinson 6c820776b5 Merge branch '4.0.x'
Closes gh-49213
2026-02-13 09:15:01 +00:00
Andy Wilkinson 6f303032e2 Merge branch '3.5.x' into 4.0.x
Closes gh-49212
2026-02-13 09:14:36 +00:00
Andy Wilkinson be750eb306 Adapt to deprecation of support for Dynatrace V1 API
See gh-49111
2026-02-10 09:06:57 +00:00
Andy Wilkinson 12c6292708 Support RabbitMQ Streams with Docker Compose
Closes gh-49162
2026-02-09 17:23:09 +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 e2f53ee9ee Upgrade to Artemis 2.50.0
Closes gh-49123
2026-02-05 17:46:48 +00:00
Stéphane Nicoll 9406bdbb0b Merge branch '4.0.x'
Closes gh-49110
2026-02-05 13:53:53 +01:00
Stéphane Nicoll 92ae4d442e Merge branch '3.5.x' into 4.0.x
Closes gh-49109
2026-02-05 13:53:41 +01:00
Moritz Halbritter 3d960bc6d0 Add support for specifying encoding when loading files with spring.config.import
In the brackets we can now specify the encoding of the file instead of
only the file extension:

spring.config.import=classpath:import.properties[encoding=utf-8]

The old format

spring.config.import=classpath:import[.properties]

is still supported and is a shorthand for:

spring.config.import=classpath:import[extension=.properties]

Attributes can be combined, too:

spring.config.import=classpath:import[extension=.properties][encoding=utf-8]

Closes gh-28663
2026-02-03 16:30:03 +01:00
Stéphane Nicoll 4c6febf3d7 Merge branch '4.0.x'
Closes gh-49018
2026-01-29 11:29:18 +01:00
Stéphane Nicoll 8f4f13f484 Merge branch '3.5.x' into 4.0.x
Closes gh-49017
2026-01-29 11:29:04 +01:00
Moritz Halbritter a3c5f61567 Polish "Add customizers for OtlpHttpLogRecordExporterBuilder and OtlpGrpcLogRecordExporterBuilder"
See gh-49002
2026-01-28 13:31:04 +01:00
Andy Wilkinson a8fc38f565 Polish "Provide support for adding to the mime types that are compressed"
See gh-48930
2026-01-23 09:26:09 +00:00
Andy Wilkinson d8dddc9a15 Merge branch '4.0.x'
Closes gh-48947
2026-01-23 09:10:34 +00:00
Andy Wilkinson f1eef0ecbc Merge branch '3.5.x' into 4.0.x
Closes gh-48946
2026-01-23 09:10:24 +00:00
Phillip Webb 0463b4d0bc Add @AutoConfigureWebServer test annotation
Introduce `@AutoConfigureWebServer` test annotation to support
`@SpringBootTest` with specific classes and a random port.

Closes gh-48815
2026-01-21 19:32:43 -08:00
Phillip Webb 8c3174299c Merge branch '4.0.x' 2026-01-21 10:06:17 -08:00
Phillip Webb abec26e504 Polish 2026-01-21 10:06:02 -08:00
Moritz Halbritter 9f3720a171 Automatically configure Spring AMQP's observation convention beans
This automatically registers RabbitListenerObservationConvention,
RabbitTemplateObservationConvention, RabbitStreamListenerObservationConvention
and RabbitStreamTemplateObservationConvention beans.

Closes gh-48922
2026-01-21 09:42:45 +01:00
Andy Wilkinson 186d2619cc Merge branch '4.0.x'
Closes gh-48919
2026-01-20 18:55:57 +00:00
Shaun c04e910198 Fix typo in REST client documentation
See gh-48907

Signed-off-by: Shaun <shaun.haldane@gmail.com>
2026-01-20 18:55:30 +00:00
Moritz Halbritter d65eb69647 Automatically configure Spring Kafka's observation convention beans
This automatically registers KafkaListenerObservationConvention on the
container factory, and KafkaTemplateObservationConvention on the
Kafka template.

Closes gh-48914
2026-01-20 17:29:35 +01:00
Andy Wilkinson 60bad35a1c Merge branch '4.0.x'
See gh-48633
2026-01-20 09:55:01 +00:00
Andy Wilkinson 85f3f3856d Revert "Allow a custom JsonFactory to be used with JsonMapper.Builder"
This reverts commit 22d6f6a7de.

See gh-48594
2026-01-20 09:34:39 +00:00
Moritz Halbritter c9be84af6e Delete web server's temporary directories when the context is closed
Closes gh-9983
2026-01-20 10:16:54 +01:00
Stéphane Nicoll abce0cac5c Merge branch '4.0.x'
Closes gh-48877
2026-01-17 20:19:28 +01:00
Tran Ngoc Nhan 7c03d3ad07 Remove duplicate word
See gh-48874

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2026-01-17 20:10:28 +01:00
Andy Wilkinson 4262d077be Merge branch '4.0.x' 2026-01-14 14:10:26 +00:00
Andy Wilkinson 5332ed4321 Correct reference to Cloud Foundry starter
See gh-48675
2026-01-14 14:10:04 +00:00
Moritz Halbritter c757ec304d Merge branch '4.0.x'
Closes gh-48807
2026-01-13 09:13:27 +01:00
Moritz Halbritter 08082aa4c8 Merge branch '3.5.x' into 4.0.x
Closes gh-48806
2026-01-13 09:10:43 +01:00