Commit Graph

52245 Commits

Author SHA1 Message Date
Andy Wilkinson dc00342384 Improve handling of environment variables in failure analysis
Prior to this change, the failure analysis for an invalid
configuration property value filtered out the configuration property
sources property source. This property source contains a "duplicate"
of all of the environment's other property sources but with
configuration property support (such as relaxed/fuzzy matching of
environment variables). This was done to prevent the reporting of
duplicates when a property was found in both the configuration
property sources property source and the "normal" property sources.
An unwanted side-effect of this was that fuzzy matching of
environment variables was lost so the origin of
com.example.some-property would be found in the environment variable
was COM_EXAMPLE_SOME_PROPERTY but would not be found if it was
COM_EXAMPLE_SOMEPROPERTY.

This commit addresses this side-effect by no longer filtering out
the configuration property sources property source. To then
prevent duplicates from being reported in the analysis, it instead
deduplicates things based on the origin of each property that's
found in the environment's property sources.

Fixes gh-43380
2024-12-12 09:06:15 +00:00
Phillip Webb 15f5811f3d Merge pull request #43441 from minwoo1999
* pr/43441:
  Polish 'Add test for nullSafeValue with mapper transformation'
  Add test for nullSafeValue with mapper transformation

Closes gh-43441
2024-12-11 15:14:25 -08:00
Phillip Webb d5d7152e5d Polish 'Add test for nullSafeValue with mapper transformation'
See gh-43441
2024-12-11 15:14:14 -08:00
KIM MIN WOO 22f527af6a Add test for nullSafeValue with mapper transformation
See gh-43441
2024-12-11 15:13:31 -08:00
Stéphane Nicoll dac747d8c6 Merge branch '3.3.x' 2024-12-11 17:37:23 +01:00
Stéphane Nicoll e3b0fcf9b6 Start building against Spring Retry 2.0.11 snapshots
See gh-43486
2024-12-11 16:16:21 +01:00
Stéphane Nicoll 42821f30bb Start building against Spring Retry 2.0.11 snapshots
See gh-43485
2024-12-11 16:16:18 +01:00
Moritz Halbritter 61bab92231 Merge branch '3.3.x'
Closes gh-43484
2024-12-11 14:25:44 +01:00
Moritz Halbritter 3968a49c1c Merge pull request #43483 from quaff
* pr/43483:
  Polish variable name for consistency

Closes gh-43483
2024-12-11 14:25:36 +01:00
Yanming Zhou a964bbd8cb Polish variable name for consistency
See gh-43483
2024-12-11 14:25:19 +01:00
Phillip Webb e72546d2a6 Add customizer variant of `requestFactorySettings`
Add `requestFactorySettings` that accepts a `UnaryOperator` so that
the existing `requestFactorySettings` can be customized rather than
replaced.

Closes gh-43258
2024-12-10 14:54:33 -08:00
Phillip Webb 52992fb510 Merge branch '3.3.x'
Closes gh-43480
2024-12-10 13:21:33 -08:00
Phillip Webb 709b9bb149 Allow Jackson to escape new line chars when BOMR adds issues
Remove the escaping logic when building the issue body so that Jackson
can perform the actual escaping. Prior to this commit, the message
body was double escaped.

Closes gh-43479
2024-12-10 13:19:53 -08:00
Phillip Webb 123502b8d7 Restore use of fixed version when calling docker APIs
Update `DockerApi` so that calls are made using a fixed version. For
most calls this will be `v1.24`, however, for calls with a platform
we must use the `v1.41`.

When possible, we check that the Docker version in use meets the
required minimum, however, if we can't detect the running version
we now proceed and let the actual API call fail. This is due to the
fact that the `/_ping` endpoint may not always be available. For
example, it is restricted when building from a BitBucket CI pipeline.

Fixes gh-43452
2024-12-10 13:14:20 -08:00
Phillip Webb 5ea9c741c8 Don't duplicate lines when issue has release notes link 2024-12-10 13:00:57 -08:00
Phillip Webb 48d51bda1d Start building against Spring HATEOAS 2.4.1 snapshots
See gh-43478
2024-12-10 09:42:18 -08:00
Phillip Webb d815009aca Start building against Spring Batch 5.2.1 snapshots
See gh-43477
2024-12-10 09:42:14 -08:00
Phillip Webb 11bcbe3261 Merge branch '3.3.x' 2024-12-10 09:40:32 -08:00
Phillip Webb 6344c4767f Start building against Spring Session 3.3.5 snapshots
See gh-43397
2024-12-10 09:38:21 -08:00
Phillip Webb 8ab03e0495 Start building against Spring Integration 6.3.7 snapshots
See gh-43476
2024-12-10 09:38:21 -08:00
Phillip Webb 60217e0894 Start building against Spring HATEOAS 2.3.4 snapshots
See gh-43475
2024-12-10 09:38:16 -08:00
Phillip Webb 8dfde8625c Start building against Spring Batch 5.1.3 snapshots
See gh-43474
2024-12-10 09:38:12 -08:00
Stéphane Nicoll f65336ca56 Fix compilation failure on merge 2024-12-10 16:28:34 +01:00
Stéphane Nicoll bd8474f713 Merge branch '3.3.x' 2024-12-10 15:45:54 +01:00
Stéphane Nicoll 3b2f0dfc69 Upgrade to Tomcat 10.1.34
Closes gh-43471
2024-12-10 15:45:51 +01:00
Stéphane Nicoll f17ba516fa Upgrade to Thymeleaf Extras SpringSecurity 3.1.3.RELEASE
Closes gh-43470
2024-12-10 15:45:51 +01:00
Stéphane Nicoll 922ff4f252 Upgrade to Thymeleaf 3.1.3.RELEASE
Closes gh-43469
2024-12-10 15:45:51 +01:00
Stéphane Nicoll 7e94839c7c Upgrade to Reactor Bom 2024.0.1
Closes gh-43410
2024-12-10 15:45:51 +01:00
Stéphane Nicoll 1a9fc9b06c Upgrade to Micrometer Tracing 1.4.1
Closes gh-43409
2024-12-10 15:45:50 +01:00
Stéphane Nicoll 4fa33183ba Upgrade to Micrometer 1.14.2
Closes gh-43408
2024-12-10 15:45:50 +01:00
Stéphane Nicoll bd53ba3846 Upgrade to jOOQ 3.19.16
Closes gh-43468
2024-12-10 15:45:50 +01:00
Stéphane Nicoll a59937b8b8 Upgrade to Zipkin Reporter 3.4.3
Closes gh-43467
2024-12-10 15:45:50 +01:00
Stéphane Nicoll 6d74fc3253 Upgrade to Tomcat 10.1.34
Closes gh-43466
2024-12-10 15:45:43 +01:00
Stéphane Nicoll df94a86924 Upgrade to Thymeleaf Extras SpringSecurity 3.1.3.RELEASE
Closes gh-43465
2024-12-10 15:45:43 +01:00
Stéphane Nicoll 65cedf6bc5 Upgrade to Thymeleaf 3.1.3.RELEASE
Closes gh-43464
2024-12-10 15:45:43 +01:00
Stéphane Nicoll 6a68faaf9c Upgrade to Reactor Bom 2023.0.13
Closes gh-43390
2024-12-10 15:45:43 +01:00
Stéphane Nicoll 8a473a4098 Upgrade to Micrometer Tracing 1.3.7
Closes gh-43389
2024-12-10 15:45:43 +01:00
Stéphane Nicoll dcf8b31eda Upgrade to Micrometer 1.13.9
Closes gh-43388
2024-12-10 15:45:42 +01:00
Stéphane Nicoll 7486c27cdd Upgrade to jOOQ 3.19.16
Closes gh-43463
2024-12-10 15:45:42 +01:00
Stéphane Nicoll bed68daa13 Upgrade to Zipkin Reporter 3.4.3
Closes gh-43462
2024-12-10 15:45:42 +01:00
Moritz Halbritter ce9878a7d0 Merge branch '3.3.x'
Closes gh-43472
2024-12-10 15:43:46 +01:00
Moritz Halbritter e2cf9e105c Respect profiles when listing running Docker Compose containers
Closes gh-40139
2024-12-10 14:24:44 +01:00
Stéphane Nicoll f1a3e056bb Merge branch '3.3.x'
Closes gh-43456
2024-12-10 07:36:27 +01:00
Stéphane Nicoll 68b5b956d1 Merge pull request #43439 from ngocnhan-tran1996
* pr/43439:
  Fix logback javadoc

Closes gh-43439
2024-12-10 07:36:14 +01:00
Tran Ngoc Nhan a96b91fa3e Fix logback javadoc
See gh-43439
2024-12-10 07:35:58 +01:00
Stéphane Nicoll 54d129b729 Merge branch '3.3.x'
Closes gh-43455
2024-12-10 07:35:03 +01:00
Stéphane Nicoll 4ffb1857ef Merge pull request #43451 from dependabot[bot]
* pr/43451:
  Polish "Bump jfrog/setup-jfrog-cli from 4.4.3 to 4.5.0"
  Bump jfrog/setup-jfrog-cli from 4.4.3 to 4.5.0

Closes gh-43451
2024-12-10 07:34:22 +01:00
Stéphane Nicoll 8171f04113 Polish "Bump jfrog/setup-jfrog-cli from 4.4.3 to 4.5.0"
See gh-43451
2024-12-10 07:33:03 +01:00
dependabot[bot] fe9c9358cd Bump jfrog/setup-jfrog-cli from 4.4.3 to 4.5.0
Bumps [jfrog/setup-jfrog-cli](https://github.com/jfrog/setup-jfrog-cli) from 4.4.3 to 4.5.0.
- [Release notes](https://github.com/jfrog/setup-jfrog-cli/releases)
- [Commits](e7cc33a01b...040913fd7a)

---
updated-dependencies:
- dependency-name: jfrog/setup-jfrog-cli
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

See gh-43451
2024-12-10 07:32:19 +01:00
Stéphane Nicoll 9020d30206 Merge branch '3.3.x'
Closes gh-43454
2024-12-10 07:30:17 +01:00