Commit Graph

54471 Commits

Author SHA1 Message Date
Stéphane Nicoll
b28794e331 Upgrade to Groovy 4.0.26
Closes gh-44538
2025-03-05 12:51:43 +01:00
Moritz Halbritter
0852243fc6 Merge branch '3.4.x'
Closes gh-44537
2025-03-05 11:56:32 +01:00
Moritz Halbritter
d453a59724 Merge branch '3.3.x' into 3.4.x
Closes gh-44536
2025-03-05 11:56:21 +01:00
Moritz Halbritter
5a470c6df2 Merge pull request #44526 from ngocnhan-tran1996
* pr/44526:
  Fix JavaExec javadoc link

Closes gh-44526
2025-03-05 11:55:40 +01:00
Tran Ngoc Nhan
701f73fcd7 Fix JavaExec javadoc link
See gh-44526

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-03-05 11:55:29 +01:00
Andy Wilkinson
a3093a50cb Merge branch '3.4.x'
Closes gh-44531
2025-03-04 18:03:17 +00:00
Andy Wilkinson
d92551f15a Merge branch '3.3.x' into 3.4.x
Closes gh-44530
2025-03-04 18:03:07 +00:00
Andy Wilkinson
dc41feff1f Merge branch '3.4.x'
Closes gh-44529
2025-03-04 18:02:54 +00:00
Andy Wilkinson
3715eb8df2 Merge branch '3.3.x' into 3.4.x
Closes gh-44528
2025-03-04 18:02:23 +00:00
Andy Wilkinson
27779bec0a Remove AutoConfigurationReproTests
Removed in favor of WebServerFactoryCustomizerBeanPostProcessorTests
which, through the expectations that it sets up on the mock bean
factory, already checks that early initialization will not be
triggered.

Closes gh-44511
2025-03-04 17:50:19 +00:00
Andy Wilkinson
c9f3688df9 Remove redundant tests
Closes gh-44520
2025-03-04 17:45:23 +00:00
Stéphane Nicoll
2b31250689 Merge branch '3.4.x'
Closes gh-44524
2025-03-04 15:31:03 +01:00
Stéphane Nicoll
c1f58d1f80 Merge branch '3.3.x' into 3.4.x
Closes gh-44523
2025-03-04 15:30:53 +01:00
Stéphane Nicoll
60c6ca3b8e Merge pull request #44514 from metters
* pr/44514:
  Fix typo

Closes gh-44514
2025-03-04 15:30:42 +01:00
Matthias Streidel
474dafae28 Fix typo
See gh-44514

Signed-off-by: Matthias Streidel <github@metters.slmail.me>
2025-03-04 15:30:27 +01:00
Stéphane Nicoll
013f3b8741 Merge branch '3.4.x'
Closes gh-44522
2025-03-04 15:24:23 +01:00
Stéphane Nicoll
72289e22d9 Merge branch '3.3.x' into 3.4.x
Closes gh-44521
2025-03-04 15:24:10 +01:00
Stéphane Nicoll
2911d1a22a Start building against Spring Framework 6.2.4 snapshots
See gh-44517
2025-03-04 13:05:20 +01:00
Stéphane Nicoll
39bc496a8e Merge branch '3.4.x' 2025-03-04 12:21:51 +01:00
Stéphane Nicoll
d49617063a Adapt to change in Spring Framework
See https://github.com/spring-projects/spring-framework/issues/34513

See gh-44481
2025-03-04 12:18:01 +01:00
Stéphane Nicoll
9b41bbdc5c Polish Spring-WS smoke test
This commit polishes the smoke test for Spring Web Services, namely
clearing unused dependencies and clarify the necessary configuration:

1. No need to extend from `WsConfigurationAdapter` if no advanced
configuration is required
2. Spring Web Services creates a `XsdSchema` bean whose name matches
the name of the file. Added a `@Qualifier("hr")` to make that more
obvious as it would break if an additional schema was to be added.

Closes gh-44515
2025-03-04 11:41:44 +01:00
Moritz Halbritter
28177db548 Merge branch '3.4.x' 2025-03-03 11:46:22 +01:00
Moritz Halbritter
fa621f2d95 Merge branch '3.3.x' into 3.4.x 2025-03-03 11:46:09 +01:00
Moritz Halbritter
05082cef4c Update IntelliJ IDEA code style 2025-03-03 11:45:48 +01:00
Moritz Halbritter
362cfb4f8b Merge pull request #44494 from nosan
* pr/44494:
  Polish "Refine the handling of OpenTelemetry resource attributes"
  Refine the handling of OpenTelemetry resource attributes

Closes gh-44494
2025-03-03 09:36:16 +01:00
Moritz Halbritter
272939e45e Polish "Refine the handling of OpenTelemetry resource attributes"
See gh-44494
2025-03-03 09:35:56 +01:00
Dmytro Nosan
e62d78ab11 Refine the handling of OpenTelemetry resource attributes
See gh-44494

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-03-03 09:28:46 +01:00
Brian Clozel
83f678a8b1 Separate transports in GraphQL auto-configurations
This commit revisits the existing GraphQL configuration properties to
better reflect which ones belong to specific transports.
This also relaxes the Web auto-configurations to only require the
`ExecutionGraphQlService` as a bean. The `GraphQlSource` is now an
optional bean dependency.

Closes gh-44495
2025-02-28 18:12:31 +01:00
Moritz Halbritter
e886785f76 Merge pull request #44394 from nosan
* pr/44394:
  Polish "Add support for OTel-specific environment variables"
  Add support for OTel-specific environment variables

Closes gh-44394
2025-02-28 14:54:04 +01:00
Moritz Halbritter
8f4e0518f3 Polish "Add support for OTel-specific environment variables"
See gh-44394
2025-02-28 14:52:10 +01:00
Dmytro Nosan
bf015bfeb9 Add support for OTel-specific environment variables
This commit introduces the OpenTelementryAttributes class that fetches
OTEL_RESOURCE_ATTRIBUTES and OTEL_SERVICE_NAME environment variables
and merges it with user-defined resource attributes.

Besides that, this commit includes spec-compliant proper handling of
OTEL_RESOURCE_ATTRIBUTES in OtlpMetricsPropertiesConfigAdapter and
OpenTelemetryAutoConfiguration.

See gh-44394

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-28 14:52:10 +01:00
Stéphane Nicoll
79ad6b7c3a Merge branch '3.4.x' 2025-02-28 14:46:07 +01:00
Stéphane Nicoll
e19b5b9165 Merge branch '3.3.x' into 3.4.x 2025-02-28 14:45:56 +01:00
Stéphane Nicoll
e69683769e Start building against Spring Framework 6.1.18 snapshots
See gh-44491
2025-02-28 14:42:46 +01:00
Andy Wilkinson
b22ad76f21 Polish 2025-02-28 13:10:12 +00:00
Moritz Halbritter
8957cafd5e Merge pull request #44489 from izeye
* pr/44489:
  Add Javadoc since for new methods in LoggingSystemProperties

Closes gh-44489
2025-02-28 14:08:54 +01:00
Johnny Lim
3bc8727848 Add Javadoc since for new methods in LoggingSystemProperties
See gh-44489

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-28 14:08:17 +01:00
Moritz Halbritter
81441555d0 Merge pull request #44389 from eddumelendez
* pr/44389:
  Add ServiceConnection support for LLdapContainer (Testcontainers)
  Add ServiceConnection support for lldap/lldap (Compose)

Closes gh-44389
2025-02-28 14:04:20 +01:00
Eddú Meléndez
261ea64e39 Add ServiceConnection support for LLdapContainer (Testcontainers)
See gh-44389

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>
2025-02-28 13:54:55 +01:00
Eddú Meléndez
5fac1011d6 Add ServiceConnection support for lldap/lldap (Compose)
See gh-44389

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>
2025-02-28 13:54:55 +01:00
Andy Wilkinson
f715a3676f Merge branch '3.4.x' 2025-02-28 12:26:04 +00:00
Andy Wilkinson
be6eb5875e Merge branch '3.3.x' into 3.4.x 2025-02-28 12:25:32 +00:00
Andy Wilkinson
7d01c941b9 Use WithPackageResources on shouldUpdateSslWhenReloadingSslBundles
See gh-44397
2025-02-28 12:23:17 +00:00
Moritz Halbritter
9fd52a189b Merge branch '3.4.x'
Closes gh-44487
2025-02-28 11:55:02 +01:00
Moritz Halbritter
2c3585116e Merge branch '3.3.x' into 3.4.x
Closes gh-44486
2025-02-28 11:54:00 +01:00
Moritz Halbritter
00da65cc58 Merge pull request #44432 from dependabot[bot]
* pr/44432:
  Bump solid-js from 1.8.17 to 1.9.5 in /antora

Closes gh-44432
2025-02-28 11:53:37 +01:00
dependabot[bot]
c641b3fd30 Bump solid-js from 1.8.17 to 1.9.5 in /antora
Bumps [solid-js](https://github.com/solidjs/solid) from 1.8.17 to 1.9.5.
- [Release notes](https://github.com/solidjs/solid/releases)
- [Changelog](https://github.com/solidjs/solid/blob/main/CHANGELOG.md)
- [Commits](https://github.com/solidjs/solid/compare/v1.8.17...v1.9.5)

---
updated-dependencies:
- dependency-name: solid-js
  dependency-type: indirect
...

See gh-44432

Signed-off-by: dependabot[bot] <support@github.com>
2025-02-28 11:52:27 +01:00
Moritz Halbritter
d89b679ecd Merge branch '3.4.x'
Closes gh-44485
2025-02-28 11:50:36 +01:00
Moritz Halbritter
39a8958b66 Merge pull request #44469 from ngocnhan-tran1996
* pr/44469:
  Fix typo in javadoc

Closes gh-44469
2025-02-28 11:49:40 +01:00
Tran Ngoc Nhan
0f4e361a95 Fix typo in javadoc
See gh-44469

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-02-28 11:48:47 +01:00