Commit Graph
267 Commits
Author SHA1 Message Date
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
Andy Wilkinson f477daa78b Merge branch '4.0.x'
Closes gh-48805
2026-01-13 07:28:44 +00:00
Andy Wilkinson 50e7c02986 Correct links to EnvironmentPostProcessor javadoc
Closes gh-48803
2026-01-13 07:28:30 +00:00
Andy Wilkinson 5f5d7af147 Merge branch '4.0.x'
Closes gh-48797
2026-01-12 08:23:30 +00:00
Andy Wilkinson abd0d2903e Update docs to reflect new location of CF actuator support
Closes gh-48675
2026-01-12 08:22:11 +00:00
Andy Wilkinson e16907130f Merge branch '4.0.x'
Closes gh-48771
2026-01-09 10:50:36 +00:00
Andy Wilkinson 7e3cfb2ce0 Polish "Update docs to reflect server.error -> spring.web.error move"
See gh-48767
2026-01-09 10:50:08 +00:00
Philip Bolting 442f9efddd Update docs to reflect server.error -> spring.web.error move
Signed-off-by: Philip Bolting <pb@philipbolting.de>

See gh-48767
2026-01-09 10:50:08 +00:00
Moritz Halbritter 96b029b508 Merge branch '4.0.x'
Closes gh-48770
2026-01-09 11:45:16 +01:00
Moritz Halbritter 7c51650087 Merge branch '3.5.x' into 4.0.x
Closes gh-48769
2026-01-09 11:45:03 +01:00
Andy Wilkinson 03470bfaef Upgrade to Rabbit Stream Client 1.4.0
Exclusions for org.lz4:lz4-java have been added as the Rabbit Stream
Client now depends upon at.yawk.lz4:lz4-java which its replacement.

Closes gh-48761
2026-01-09 09:54:24 +00:00
Andy Wilkinson 3d6671d47a Merge branch '4.0.x'
Closes gh-48701
2026-01-08 12:14:50 +00:00
Andy Wilkinson ef1f4e2fa2 Merge branch '4.0.x'
Closes gh-48700
2026-01-08 12:01:09 +00:00
Andy Wilkinson 0ffffee4bf Upgrade to Nullability Plugin 0.0.9
Closes gh-48638
2026-01-08 11:59:51 +00:00
Andy Wilkinson 9bd1a460a1 Correct packaging of test code
Closes gh-48699
2026-01-08 11:43:43 +00:00
Andy Wilkinson b8b1373f2e Document that jOOQ support requires Java 21
See gh-48619
2026-01-07 08:53:06 +00:00
Andy Wilkinson 56928bbe38 Upgrade to jOOQ 3.20 and require Java 21 to use it
Closes gh-48619
2026-01-06 13:03:11 +00:00
Yanming Zhou d9528fdb0b Fix typo
See gh-48680

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2026-01-05 21:43:06 -08:00
Phillip Webb 21cf377f7e Add 'WAR_SOURCE_DIRECTORY' environment variable support
Add an escape hatch for users that deviate from the standard
`src/main/webbapp` directory structure.

Fixes gh-23829
2026-01-05 16:44:45 -08:00
Stéphane Nicoll 6939fae297 Merge branch '4.0.x'
Closes gh-48671
2026-01-04 17:16:05 +01:00
Stéphane Nicoll 6b019c4ab2 Merge branch '3.5.x' into 4.0.x
Closes gh-48670
2026-01-04 17:15:53 +01:00
Stéphane Nicoll 3e8df5d901 Merge branch '4.0.x'
Closes gh-48660
2026-01-02 14:03:07 +01:00
Stéphane Nicoll cb1596e8c8 Merge branch '3.5.x' into 4.0.x
Closes gh-48659
2026-01-02 14:02:59 +01:00
Stéphane Nicoll 12652a313e Deprecate Derby support since Apache Derby is retired
Closes gh-48567
2025-12-30 17:36:53 +01:00
Stéphane Nicoll ca4a11c672 Merge branch '4.0.x'
Closes gh-48644
2025-12-30 13:25:59 +01:00