Commit Graph

52205 Commits

Author SHA1 Message Date
Dmytro Nosan
993fbb3a0d Retain existing modules in JacksonAutoConfiguration
Previously, the default Jackson2ObjectMapperBuilderCustomizer
implementation did set the list of modules to use. This had the effect
of removing any modules that were registered programmatically by a
customizer with higher precedence.

This commit uses the variant of modulesToInstall that retain any
existing modules. It also adds a note in the documentation as this
behavior can be easily missed.

See gh-42836
2025-01-07 11:56:20 +01:00
Stéphane Nicoll
ff6c7c7fdf Merge branch '3.4.x' 2025-01-07 10:30:41 +01:00
Stéphane Nicoll
8502c80edb Merge branch '3.3.x' into 3.4.x 2025-01-07 10:30:15 +01:00
Stéphane Nicoll
6290b7545b Make skipSslValidation() test more robust
This commit updates the assertion of a test that relies on
https://self-signed.badssl.com to only fail if a SSLException is thrown.

This is a temporary measure until we run the test against a local
instance we control.

See gh-43708
2025-01-07 10:29:46 +01:00
Phillip Webb
32393425d6 Merge branch '3.4.x'
Closes gh-43707
2025-01-06 21:32:25 -08:00
Dmytro Nosan
b6b9237f2c Reset StatusLogger fallback listener stream on initialization
Update `Log4J2LoggingSystem` so that the `StatusLogger` fallback
listener has its print stream reset on each initialization. This
allows output capture to work with the status listener.

Fixes gh-43578

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2025-01-06 17:58:21 -08:00
Phillip Webb
170ff4eb23 Update copyright year of changed files 2025-01-06 17:40:24 -08:00
Phillip Webb
a8f3afc6b7 Fix incorrect imports
Fix accidentally committed imports.

See gh-43703
2025-01-06 14:42:28 -08:00
Phillip Webb
4c307d6fda Switch away from using @ConditionalOnProperty prefix
Merge `prefix` into `name` attribute and simplify annotations
where possible.

Closes gh-43703
2025-01-06 14:37:18 -08:00
Phillip Webb
29e9ce17ac Polish variables
Extract a few more variables to make the format command easier to
follow.
2025-01-06 10:15:39 -08:00
Andy Wilkinson
8575ec0e35 Merge branch '3.4.x' 2025-01-06 15:30:11 +00:00
Andy Wilkinson
ec75474abf Prepare 3.4.x branch 2025-01-06 15:29:59 +00:00
Andy Wilkinson
214e0281a9 Start work on Spring Boot 3.5 2025-01-06 15:29:25 +00:00
Stéphane Nicoll
383f1964e6 Merge branch '3.3.x'
Closes gh-43662
2025-01-05 08:03:56 +01:00
Stéphane Nicoll
4578ae5858 Merge pull request #43661 from ngocnhan-tran1996
* pr/43661:
  Fix jakarta messaging javadoc

Closes gh-43661
2025-01-05 08:03:44 +01:00
Tran Ngoc Nhan
290ea77374 Fix jakarta messaging javadoc
See gh-43661
2025-01-05 08:03:20 +01:00
Andy Wilkinson
425876e95e Merge branch '3.3.x' 2025-01-02 15:36:39 +00:00
Andy Wilkinson
b4d8a9f64d Address system tests' deprecation warnings with Gradle 8.12
See gh-43496
2025-01-02 15:35:41 +00:00
Andy Wilkinson
51d15c7c78 Merge branch '3.3.x'
Closes gh-43649 in 3.4.x
Closes gh-43651
2025-01-02 12:22:59 +00:00
Andy Wilkinson
d8a9ebd14b Upgrade to Gradle 8.12
Closes gh-43649
2025-01-02 12:05:14 +00:00
Andy Wilkinson
734040abe2 Update Gradle test scripts to avoid warnings with 8.12
Closes gh-43496
2025-01-02 12:05:14 +00:00
Stéphane Nicoll
530a26e9f9 Merge branch '3.3.x'
Closes gh-43646
2025-01-02 06:36:48 +01:00
Stéphane Nicoll
3117d60ce0 Merge pull request #43644 from dreis2211
* pr/43644:
  Update copyright year to 2025

Closes gh-43644
2025-01-02 06:36:41 +01:00
Christoph Dreis
22c68f9539 Update copyright year to 2025
See gh-43644
2025-01-02 06:36:23 +01:00
Stéphane Nicoll
c1a7331308 Upgrade to Lettuce 6.4.2.RELEASE
Closes gh-43609
2024-12-30 12:40:24 +01:00
Stéphane Nicoll
9f8a6bba63 Merge branch '3.3.x'
Closes gh-43626
2024-12-29 10:30:30 +01:00
Stéphane Nicoll
ed554c5a68 Merge pull request #43625 from izeye
* pr/43625:
  Remove MavenBuildOutputTimestampTests.shouldParseIso8601WithSeconds()

Closes gh-43625
2024-12-29 10:30:24 +01:00
Johnny Lim
b8abfb8c9b Remove MavenBuildOutputTimestampTests.shouldParseIso8601WithSeconds()
See gh-43625
2024-12-29 10:30:09 +01:00
Stéphane Nicoll
a2cd1f0040 Merge branch '3.3.x' 2024-12-28 10:27:12 +01:00
Stéphane Nicoll
8fbd14b4dd Polish 2024-12-28 10:27:01 +01:00
Stéphane Nicoll
61bdc91d8f Merge branch '3.3.x'
Closes gh-43623
2024-12-28 10:26:03 +01:00
Stéphane Nicoll
45813cb29c Merge pull request #43622 from ngocnhan-tran1996
* pr/43622:
  Polish "Handle <p> in Maven Plugin Reference documentation"
  Handle <p> in Maven Plugin Reference documentation

Closes gh-43622
2024-12-28 10:25:30 +01:00
Stéphane Nicoll
1b6b160105 Polish "Handle <p> in Maven Plugin Reference documentation"
See gh-43622
2024-12-28 10:25:02 +01:00
Tran Ngoc Nhan
334cd36b0a Handle <p> in Maven Plugin Reference documentation
See gh-43622
2024-12-28 10:24:49 +01:00
Stéphane Nicoll
3e39b0256d Merge branch '3.3.x'
Closes gh-43617
2024-12-26 16:08:26 +01:00
Stéphane Nicoll
12e753c197 Merge pull request #43612 from gavarava
* pr/43612:
  Polish "Preserve milliseconds in build info timestamp"
  Preserve milliseconds in build info timestamp

Closes gh-43612
2024-12-26 16:08:20 +01:00
Stéphane Nicoll
7e9fda8216 Polish "Preserve milliseconds in build info timestamp"
See gh-43612
2024-12-26 15:58:09 +01:00
Gaurav
0944b07c90 Preserve milliseconds in build info timestamp
See gh-43612
2024-12-26 15:52:08 +01:00
Stéphane Nicoll
682d6e5596 Merge branch '3.3.x'
Closes gh-43607
2024-12-24 10:38:15 +01:00
Tran Ngoc Nhan
b5893133cf Fix Javadoc link for jakarta.xml.bind
Closes gh-43606
2024-12-24 10:37:48 +01:00
Stéphane Nicoll
8af1778ca8 Merge branch '3.3.x'
Closes gh-43605
2024-12-24 10:35:32 +01:00
Stéphane Nicoll
8e3ce14057 Merge pull request #43601 from ngocnhan-tran1996
* pr/43601:
  Polish "Remove reference to 'layertools' in reference doc"
  Remove reference to 'layertools' in reference doc

Closes gh-43601
2024-12-24 10:35:27 +01:00
Stéphane Nicoll
4bd6ad9c93 Polish "Remove reference to 'layertools' in reference doc"
See gh-43601
2024-12-24 10:34:39 +01:00
Tran Ngoc Nhan
01cd8969e2 Remove reference to 'layertools' in reference doc
See gh-43601
2024-12-24 10:34:31 +01:00
Stéphane Nicoll
97f9589404 Merge branch '3.3.x'
Closes gh-43604
2024-12-24 10:29:21 +01:00
Stéphane Nicoll
a5b917f9aa Merge pull request #43586 from tmaciejewski
* pr/43586:
  Polish "Add support for symlinks in FileWatcher"
  Add support for symlinks in FileWatcher

Closes gh-43586
2024-12-24 10:29:11 +01:00
Stéphane Nicoll
916705538e Polish "Add support for symlinks in FileWatcher"
See gh-43586
2024-12-24 10:22:52 +01:00
Tomasz Maciejewski
26ca3790b2 Add support for symlinks in FileWatcher
This commit allows using symlinks for SSL certificate hot reloading.

See gh-43586
2024-12-24 09:59:59 +01:00
Stéphane Nicoll
d782e763a6 Merge branch '3.3.x'
Closes gh-43600
2024-12-23 16:17:46 +01:00
Stéphane Nicoll
0035569882 Prevent incomplete types to stop AOT processing
Previously, if a type to bind had a property whose type could not be
loaded, this would fail the whole build. This commit makes sure that
such failure does not stop AOT processing: rather we ignore the
incomplete type and carry on.

Closes gh-43598
2024-12-23 16:14:50 +01:00