Commit Graph

58380 Commits

Author SHA1 Message Date
Andy Wilkinson 62649ae3ed Start building against Micrometer Tracing 1.6.0-M3 snapshots
See gh-46997
2025-08-29 17:16:52 +01:00
Andy Wilkinson 05ae5837e7 Start building against Micrometer 1.16.0-M3 snapshots
See gh-46996
2025-08-29 17:16:52 +01:00
Moritz Halbritter dc03e3749b Merge pull request #46409 from ppkarwasz
* pr/46409:
  Polish "Improve Log4j core configuration file detection for Log4j 3"
  Improve Log4j core configuration file detection for Log4j 3

Closes gh-46409
2025-08-29 11:15:38 +02:00
Moritz Halbritter ff11e21d73 Polish "Improve Log4j core configuration file detection for Log4j 3"
See gh-46409
2025-08-29 11:09:23 +02:00
Piotr P. Karwasz 16439ad6e3 Improve Log4j core configuration file detection for Log4j 3
Log4j Core 3 has undergone significant modularization and no longer uses
optional parser dependencies. This change requires updates to
Spring Boot's configuration file detection logic to properly support
both Log4j Core 2 and 3.

**Updated configuration file detection**
  Spring Boot now detects configuration formats based on the presence of
   ConfigurationFactory implementations, instead of relying on optional
   parser dependencies (as was the case in Log4j Core 2).

**Improved classloader usage for reflection**
  Reflection logic now uses the classloader that loaded Log4j Core,
  rather than the one associated with the Spring Boot context,
  ensuring greater compatibility in modular environments.

* **Adjusted configuration file lookup order**
  The lookup now prioritizes configuration files specified via
  properties over automatically discovered ones, improving consistency
  with Log4j Core.

**Support for contextual configuration files**
  Files named in the form `log4j2<contextName>.<extension>` are now also
  supported.

These changes ensure compatibility with Log4j Core 3 while preserving
support for Log4j Core 2, improving Spring Boot's flexibility in
detecting and loading user-defined logging configurations.

See gh-46409

Signed-off-by: Piotr P. Karwasz <piotr@github.copernik.eu>
2025-08-29 11:06:49 +02:00
Moritz Halbritter f3082e7802 Merge branch '3.5.x'
Closes gh-46991
2025-08-28 17:09:31 +02:00
Moritz Halbritter 89c7a681c0 Merge branch '3.4.x' into 3.5.x
Closes gh-46990
2025-08-28 17:08:23 +02:00
Moritz Halbritter 86bb1b4e57 Bump jfrog/setup-jfrog-cli from 4.5.13 to 4.6.0
Closes gh-46962
2025-08-28 17:08:06 +02:00
Moritz Halbritter bf0998fe54 Merge branch '3.5.x'
Closes gh-46989
2025-08-28 17:06:26 +02:00
Moritz Halbritter efa806e3b5 Merge branch '3.4.x' into 3.5.x
Closes gh-46988
2025-08-28 17:06:18 +02:00
Moritz Halbritter 75f9138a1a Merge pull request #46976 from Chanwon-Seo
* pr/46976:
  Fix links to Flyway reference documentation

Closes gh-46976
2025-08-28 17:05:45 +02:00
Chanwon-Seo 4d499c3e46 Fix links to Flyway reference documentation
See gh-46976

Signed-off-by: Chanwon-Seo <scwonn60@gmail.com>
2025-08-28 17:04:33 +02:00
Moritz Halbritter da2365b8cb Merge branch '3.5.x'
Closes gh-46987
2025-08-28 16:58:28 +02:00
Moritz Halbritter 4716cb3713 Merge branch '3.4.x' into 3.5.x
Closes gh-46986
2025-08-28 16:58:19 +02:00
Moritz Halbritter 1eaa54759a Merge pull request #46973 from quaff
* pr/46973:
  Fix typo

Closes gh-46973
2025-08-28 16:57:56 +02:00
Yanming Zhou f547bc27a5 Fix typo
See gh-46973

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-08-28 16:56:46 +02:00
Moritz Halbritter db5680a79c Merge branch '3.5.x' 2025-08-28 14:04:26 +02:00
Moritz Halbritter 6adddb4c09 Merge branch '3.4.x' into 3.5.x 2025-08-28 14:03:16 +02:00
Moritz Halbritter 24a23c4f72 Disable tests which use Bitnami images
See gh-46983
2025-08-28 13:41:15 +02:00
Moritz Halbritter a3343797f4 Merge branch '3.5.x'
Closes gh-46981
2025-08-28 11:58:16 +02:00
Moritz Halbritter 98ce1d736e Merge branch '3.4.x' into 3.5.x
Closes gh-46980
2025-08-28 11:57:34 +02:00
Moritz Halbritter e1e8914de2 Bump actions/setup-java from 4 to 5
Closes gh-46961
2025-08-28 11:57:24 +02:00
Moritz Halbritter 5656c13f31 Protect against null key insertion in MapConfigurationPropertySource
See gh-46926
2025-08-28 10:10:56 +02:00
Moritz Halbritter 6723cfd809 Improve null-safety of core/spring-boot
See gh-46926
2025-08-28 09:59:08 +02:00
Moritz Halbritter 12bf4507d8 Remove suppressions for module/spring-boot-graphql
See gh-46926
2025-08-28 09:44:25 +02:00
Moritz Halbritter 3dba915c01 Improve null-safety of module/spring-boot-webflux
See gh-46926
2025-08-28 09:40:23 +02:00
Moritz Halbritter 89c64ef443 Only apply properties to GroovyMarkupConfigurer which are not null 2025-08-27 15:29:15 +02:00
Moritz Halbritter 011d42cb2a Improve null-safety of module/spring-boot-hibernate
See gh-46926
2025-08-27 15:18:29 +02:00
Moritz Halbritter f272fb6659 Improve null-safety of module/spring-boot-webclient
See gh-46926
2025-08-27 14:20:11 +02:00
Moritz Halbritter bab9cdb47f Improve null-safety of module/spring-boot-restclient
See gh-46926
2025-08-27 14:20:11 +02:00
Moritz Halbritter 3c01fdfeaa Improve null-safety of module/spring-boot-flyway
See gh-46926
2025-08-27 14:20:11 +02:00
Moritz Halbritter 303d4910bd Improve null-safety of module/spring-boot-webmvc
See gh-46926
2025-08-26 14:22:57 +02:00
Moritz Halbritter 74320454c9 Improve null-safety of module/spring-boot-graphql
See gh-46926
2025-08-26 14:22:57 +02:00
Moritz Halbritter 0d192347fd Improve null-safety of module/spring-boot-webflux
See gh-46926
2025-08-26 14:22:56 +02:00
Moritz Halbritter 76157c77fa Improve null-safety of module/spring-boot-web-server
See gh-46926
2025-08-26 14:22:56 +02:00
Moritz Halbritter 007720d28d Improve null-safety of module/spring-boot-tomcat
See gh-46926
2025-08-26 14:22:56 +02:00
Moritz Halbritter dcd25abcce Improve null-safety of module/spring-boot-security
See gh-46926
2025-08-26 14:22:56 +02:00
Moritz Halbritter 99629d0d32 Improve null-safety of module/spring-boot-security-oauth2-resource-server
See gh-46926
2025-08-26 14:22:56 +02:00
Moritz Halbritter 72e6ddd919 Improve null-safety of module/spring-boot-rsocket
See gh-46926
2025-08-26 14:22:56 +02:00
Moritz Halbritter 26a35c9012 Improve null-safety of module/spring-boot-reactor-netty
See gh-46926
2025-08-26 14:22:56 +02:00
Moritz Halbritter 6c288c9def Improve null-safety of module/spring-boot-r2dbc
See gh-46926
2025-08-26 14:22:56 +02:00
Moritz Halbritter 1157a30d06 Improve null-safety of module/spring-boot-pulsar
See gh-46926
2025-08-26 14:22:56 +02:00
Moritz Halbritter d744d8c497 Improve null-safety of module/spring-boot-observation
See gh-46926
2025-08-26 14:22:55 +02:00
Moritz Halbritter 55443f7c44 Improve null-safety of module/spring-boot-mustache
See gh-46926
2025-08-26 14:22:55 +02:00
Moritz Halbritter eb14624047 Improve null-safety of module/spring-boot-mongodb
See gh-46926
2025-08-26 14:22:55 +02:00
Moritz Halbritter 49d3bd32c4 Improve null-safety of module/spring-boot-metrics
See gh-46926
2025-08-26 14:22:55 +02:00
Moritz Halbritter f1ed5098a3 Improve null-safety of module/spring-boot-liquibase
See gh-46926
2025-08-26 14:22:55 +02:00
Moritz Halbritter 3fa7c3a521 Improve null-safety of module/spring-boot-ldap
See gh-46926
2025-08-26 14:22:55 +02:00
Moritz Halbritter 369b1e92f9 Improve null-safety of module/spring-boot-kafka
See gh-46926
2025-08-26 14:22:55 +02:00
Moritz Halbritter 9d1b4897f1 Improve null-safety of module/spring-boot-jdbc
See gh-46926
2025-08-26 14:22:55 +02:00