Commit Graph
62526 Commits
Author SHA1 Message Date
Phillip Webb dfbda6fd13 Polish 2026-08-24 19:09:56 -07:00
Phillip Webb e4870664f1 Merge branch '4.0.x' into 4.1.x 2026-08-24 19:09:52 -07:00
Phillip Webb 068bb037bf Change code to make Eclipse compiler happy
Extract a local variable to fix compiler error that only seems to
happen in Eclipse.
2026-08-24 19:07:53 -07:00
Andy Wilkinson 59ec1f0de7 Merge branch '4.1.x' 2026-08-24 15:52:25 +01:00
Andy Wilkinson b1454cd2de Merge branch '4.0.x' into 4.1.x 2026-08-24 15:52:12 +01:00
Andy Wilkinson 6dbc7e9a51 Use method on String to identify Java 27
At the time of writing, https://javaalmanac.io lists
EnumSet.spliterator as being new in Java 27, but that's not the case.

This commit switches to using String.encodedLength(Charset) instead.
This method is new in Java 27 and also aligns with the existing
TWENTY_SIX value that already uses a method on String for version
identification.

See gh-51422
2026-08-24 15:47:34 +01:00
Andy Wilkinson 5289c755f5 Merge branch '4.1.x' 2026-08-24 15:31:53 +01:00
Andy Wilkinson 975c591a97 Merge branch '4.0.x' into 4.1.x 2026-08-24 15:31:45 +01:00
Andy Wilkinson 6e58a6ff8b Polish
See gh-51422
2026-08-24 15:31:30 +01:00
Andy Wilkinson 87430a4c5f Merge branch '4.1.x'
Closes gh-51429
2026-08-24 15:25:19 +01:00
Andy Wilkinson ec28f8b530 Merge branch '4.0.x' into 4.1.x
Closes gh-51428
2026-08-24 15:24:59 +01:00
Andy Wilkinson 5b5363ff44 Merge branch '4.1.x'
Closes gh-51427
2026-08-24 15:22:24 +01:00
Andy Wilkinson feb66aa843 Merge branch '4.0.x' into 4.1.x
Closes gh-51426
2026-08-24 15:21:55 +01:00
Andy Wilkinson ee059ae3ca Add CI for Java 27
Closes gh-51423
2026-08-24 14:52:36 +01:00
Andy Wilkinson ff153f21d8 Add TWENTY_SEVEN to JavaVersion
Closes gh-51422
2026-08-24 14:51:52 +01:00
Moritz Halbritter 32a390e369 Add documentation for common OTLP properties
See gh-50461
2026-08-24 15:07:47 +02:00
Moritz Halbritter d6940b260b Merge pull request #50461 from somiljain2006
Closes gh-50461

* pr/50461:
  Polish "Align OTLP signal-specific properties with common fallback configuration"
  Align OTLP signal-specific properties with common fallback configuration
2026-08-24 14:59:47 +02:00
Moritz Halbritter 6af1fb5c26 Polish "Align OTLP signal-specific properties with common fallback configuration"
Allow `management.opentelemetry.otlp.compression` to act as a common
default for OTLP compression, mirroring the existing endpoint/headers
fallback. Tracing, logging and metrics exporters now fall back to it
when their own signal-specific compression property is unset.

See gh-50461
2026-08-24 14:51:43 +02:00
somiljain2006 faf93946cd Align OTLP signal-specific properties with common fallback configuration
See gh-50461

Signed-off-by: somiljain2006 <somil16022006@gmail.com>
2026-08-24 14:09:52 +02:00
Stéphane Nicoll 2051b60a1a Merge branch '4.1.x'
Closes gh-51420
2026-08-24 10:50:15 +02:00
Stéphane Nicoll cbaaa0fe45 Merge pull request #51410 from jjh75607
Closes gh-51410

* fix/unwrap-root-honours-wrapper-unwrap-41x:
  Polish "Honor a wrapper's unwrap when resolving the root DataSource"
  Honor a wrapper's unwrap when resolving the root DataSource
2026-08-24 10:50:04 +02:00
Stéphane Nicoll d5cec292dc Polish "Honor a wrapper's unwrap when resolving the root DataSource"
See gh-51410
2026-08-24 10:41:17 +02:00
jjh75607 5eb30621db Honor a wrapper's unwrap when resolving the root DataSource
See gh-51410

Signed-off-by: jjh75607 <jjh7560734@gmail.com>
2026-08-24 10:38:51 +02:00
Stéphane Nicoll 8588f4b2ea Merge branch '4.1.x'
Closes gh-51419
2026-08-24 08:26:53 +02:00
Stéphane Nicoll 4ee67a3f6b Merge branch '4.0.x' into 4.1.x
Closes gh-51418
2026-08-24 08:26:06 +02:00
Stéphane Nicoll 43d3cf57eb Close reader in GsonTester
This harmonizes how JSON marshaller testers operate on a stream. Also
added tests that checks the source is closed as expected for all
implementations.

Closes gh-51417
2026-08-24 08:21:51 +02:00
Stéphane Nicoll 958dee93d2 Merge branch '4.1.x'
Closes gh-51416
2026-08-24 08:08:10 +02:00
Stéphane Nicoll 515810853f Merge branch '4.0.x' into 4.1.x
Closes gh-51415
2026-08-24 08:08:03 +02:00
Stéphane Nicoll d3547de07b Merge pull request #51398 from dlwldn30
Closes gh-51398

* close-aot-file-content-stream:
  Polish "Release file handle when comparing AOT file content"
  Release file handle when comparing AOT file content
2026-08-24 08:07:49 +02:00
Stéphane Nicoll 5402f5b43f Polish "Release file handle when comparing AOT file content"
See gh-51398
2026-08-24 08:05:45 +02:00
dlwldn30 4a1abb9617 Release file handle when comparing AOT file content
RequireNewOrMatchingContentFileHandler reads the already generated file
through content.getInputStream().readAllBytes(). That method does not
close the stream, and the stream is never assigned, so it cannot
be closed at all.

During AOT processing the content is a FileSystemResource, so each
comparison leaks a file handle. FileSystemGeneratedFiles already uses
try-with-resources when it consumes an InputStreamSource.

Read the existing content inside a try-with-resources block.

See gh-51398

Signed-off-by: dlwldn30 <dlwldn30@naver.com>
2026-08-24 08:05:38 +02:00
Stéphane Nicoll 9ae9480c47 Merge branch '4.1.x'
Closes gh-51414
2026-08-24 08:03:39 +02:00
Stéphane Nicoll 43a9d265b7 Merge branch '4.0.x' into 4.1.x
Closes gh-51413
2026-08-24 08:03:19 +02:00
Stéphane Nicoll 01267a3c6f Merge pull request #51411 from MacAlsandair
Closes gh-51411

* docs-remove-springbootwebsecurityconfiguration-reference-4.0.x:
  Polish
  Remove reference to SpringBootWebSecurityConfiguration
2026-08-24 08:03:12 +02:00
Stéphane Nicoll 083b4d3f0e Polish
See gh-51411
2026-08-24 08:01:15 +02:00
Alexander Makarov 13389a27e7 Remove reference to SpringBootWebSecurityConfiguration
Servlet web security moved to ServletWebSecurityAutoConfiguration, but
the MVC Security section still describes SecurityAutoConfiguration
importing SpringBootWebSecurityConfiguration, which no longer exists.

See gh-51411

Signed-off-by: Alexander Makarov <alexander.makarov@nightsong.li>
2026-08-24 07:57:21 +02:00
Stéphane Nicoll c329ffa25d Merge branch '4.1.x'
Closes gh-51407
2026-08-21 11:01:40 +02:00
Stéphane Nicoll c1bfdf0522 Merge branch '4.0.x' into 4.1.x
Closes gh-51406
2026-08-21 11:01:34 +02:00
Stéphane Nicoll 08b21900c4 Merge pull request #51393 from dependabot[bot]
Closes gh-51393

* dependabot/npm_and_yarn/antora/antora/cli-3.2.0-rc.3:
  Bump @antora/cli from 3.2.0-rc.2 to 3.2.0-rc.3 in /antora
2026-08-21 11:01:31 +02:00
dependabot[bot] 19431312b6 Bump @antora/cli from 3.2.0-rc.2 to 3.2.0-rc.3 in /antora
Bumps [@antora/cli](https://gitlab.com/antora/antora) from 3.2.0-rc.2 to 3.2.0-rc.3.
- [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc)
- [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-rc.2...v3.2.0-rc.3)

---
updated-dependencies:
- dependency-name: "@antora/cli"
  dependency-version: 3.2.0-rc.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

See gh-51393

Signed-off-by: dependabot[bot] <support@github.com>
2026-08-21 10:58:33 +02:00
Stéphane Nicoll 10a406db21 Merge branch '4.1.x'
Closes gh-51405
2026-08-21 10:54:53 +02:00
Stéphane Nicoll c516d6c3fe Merge branch '4.0.x' into 4.1.x
Closes gh-51404
2026-08-21 10:54:47 +02:00
Stéphane Nicoll 14989917a3 Merge pull request #51392 from dependabot[bot]
Closes gh-51392

* dependabot/npm_and_yarn/antora/antora/site-generator-3.2.0-rc.3:
  Bump @antora/site-generator from 3.2.0-rc.2 to 3.2.0-rc.3 in /antora
2026-08-21 10:54:44 +02:00
dependabot[bot] a4f6585607 Bump @antora/site-generator from 3.2.0-rc.2 to 3.2.0-rc.3 in /antora
Bumps [@antora/site-generator](https://gitlab.com/antora/antora) from 3.2.0-rc.2 to 3.2.0-rc.3.
- [Changelog](https://gitlab.com/antora/antora/blob/main/CHANGELOG.adoc)
- [Commits](https://gitlab.com/antora/antora/compare/v3.2.0-rc.2...v3.2.0-rc.3)

---
updated-dependencies:
- dependency-name: "@antora/site-generator"
  dependency-version: 3.2.0-rc.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

See gh-51392

Signed-off-by: dependabot[bot] <support@github.com>
2026-08-21 10:54:34 +02:00
Stéphane Nicoll 59815c0e6a Merge branch '4.1.x'
Closes gh-51403
2026-08-21 10:54:14 +02:00
Stéphane Nicoll 88a877030e Merge branch '4.0.x' into 4.1.x
Closes gh-51402
2026-08-21 10:54:08 +02:00
Stéphane Nicoll 76073b109f Merge pull request #51391 from dependabot[bot]
Closes gh-51391

* dependabot/github_actions/Homebrew/actions/setup-homebrew-2026.08.14.1:
  Bump Homebrew/actions/setup-homebrew from 2026.08.10.1 to 2026.08.14.1
2026-08-21 10:54:04 +02:00
dependabot[bot] 9bff138a78 Bump Homebrew/actions/setup-homebrew from 2026.08.10.1 to 2026.08.14.1
Bumps [Homebrew/actions/setup-homebrew](https://github.com/homebrew/actions) from 2026.08.10.1 to 2026.08.14.1.
- [Release notes](https://github.com/homebrew/actions/releases)
- [Changelog](https://github.com/Homebrew/actions/blob/main/release.test.mts)
- [Commits](https://github.com/homebrew/actions/compare/c8707045ccae42888fe98e86f2ee8938bc7cc193...8f3d1ec8a696b3b9d9a6c3696b6c73033cab69e4)

---
updated-dependencies:
- dependency-name: Homebrew/actions/setup-homebrew
  dependency-version: 2026.08.14.1
  dependency-type: direct:production
...

See gh-51391

Signed-off-by: dependabot[bot] <support@github.com>
2026-08-21 10:53:50 +02:00
Stéphane Nicoll 0bcf6836d0 Merge branch '4.1.x'
Closes gh-51401
2026-08-21 10:51:20 +02:00
Stéphane Nicoll 61d7198ecc Merge branch '4.0.x' into 4.1.x
Closes gh-51400
2026-08-21 10:51:10 +02:00