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
Moritz Halbritter
43075bc0b5
Merge pull request #44477 from nosan
...
* pr/44477:
Update LogbackLoggingSystemTests to use Console.charset() when available
Closes gh-44477
2025-02-28 11:44:52 +01:00
Dmytro Nosan
b140fd1c4c
Update LogbackLoggingSystemTests to use Console.charset() when available
...
See gh-44477
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-28 11:44:23 +01:00
Moritz Halbritter
f01199341b
Merge branch '3.4.x'
...
Closes gh-44484
2025-02-28 11:28:47 +01:00
Moritz Halbritter
f6f1a9ffac
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44483
2025-02-28 11:20:37 +01:00
Moritz Halbritter
278c7a5cdc
Merge pull request #44460 from bekoenig
...
* pr/44460:
Remove obsolete hints for Flyway Teams features
Closes gh-44460
2025-02-28 11:19:06 +01:00
Benjamin König
23fd79f425
Remove obsolete hints for Flyway Teams features
...
See gh-44460
Signed-off-by: Benjamin König <koenig87@googlemail.com>
2025-02-28 11:18:41 +01:00
Stéphane Nicoll
77d8b8e2b0
Merge branch '3.4.x'
...
Closes gh-44482
2025-02-28 11:10:39 +01:00
Stéphane Nicoll
d03847c2c7
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44481
2025-02-28 11:10:31 +01:00
Stéphane Nicoll
e1f45c50ee
Generate reflection hints for main methods
...
This commit makes sure to register the necessary hints to invoke the
main method of any bean available in the context. This is necessary
for tests that use the UseMainMethod feature.
This generates more hints than strictly necessary as there isn't a
way to contribute hints based on a ContextLoader, see
https://github.com/spring-projects/spring-framework/issues/34513 for
more details.
Closes gh-44461
2025-02-28 11:08:23 +01:00
Moritz Halbritter
6be65fd918
Merge branch '3.4.x'
2025-02-28 11:00:51 +01:00
Moritz Halbritter
849ca4cc02
Merge branch '3.3.x' into 3.4.x
2025-02-28 11:00:44 +01:00
Moritz Halbritter
c91c8e202a
Fix tests
2025-02-28 10:53:54 +01:00
Moritz Halbritter
98e60b5607
Merge branch '3.4.x'
...
Closes gh-44479
2025-02-28 10:36:57 +01:00
Moritz Halbritter
d2d8978170
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44478
2025-02-28 10:36:39 +01:00
Moritz Halbritter
c86d47f1ec
Merge pull request #44463 from dmitrysulman
...
* pr/44463:
Update version of Neo4j test container image
Closes gh-44463
2025-02-28 10:36:31 +01:00
Dmitry Sulman
7276be825a
Update version of Neo4j test container image
...
See gh-44463
Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
2025-02-28 10:35:55 +01:00
Moritz Halbritter
b9bf4a557e
Merge branch '3.4.x'
...
Closes gh-44476
2025-02-28 10:32:48 +01:00
Moritz Halbritter
da361efd3f
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44475
2025-02-28 10:32:20 +01:00
Moritz Halbritter
8c035ce46a
Merge pull request #44459 from dmitrysulman
...
* pr/44459:
Update version of Elasticsearch test container image
Closes gh-44459
2025-02-28 10:32:14 +01:00
Dmitry Sulman
c98f9ac126
Update version of Elasticsearch test container image
...
See gh-44459
Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
2025-02-28 10:31:07 +01:00
Moritz Halbritter
19ba2ec0e9
Merge pull request #44467 from nosan
...
* pr/44467:
Close InputStream when loading Log4j2 Configuration from a Resource
Closes gh-44467
2025-02-28 10:30:57 +01:00
Moritz Halbritter
92e18df7f0
Merge branch '3.4.x'
...
Closes gh-44474
2025-02-28 10:23:00 +01:00
Moritz Halbritter
589bf2cafc
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44473
2025-02-28 10:13:59 +01:00
Moritz Halbritter
825ca76c36
Merge pull request #44467 from nosan
...
* pr/44467:
Close InputStream when loading Log4j2 Configuration from a Resource
Closes gh-44467
2025-02-28 10:01:35 +01:00
Dmytro Nosan
be7e952e91
Close InputStream when loading Log4j2 Configuration from a Resource
...
See gh-44467
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-28 09:57:09 +01:00
Moritz Halbritter
278c37d6e1
Merge pull request #44353 from nosan
...
* pr/44353:
Polish "Use Console charset for console logging when available"
Use Console charset for console logging when available
Closes gh-44353
2025-02-28 09:26:31 +01:00
Moritz Halbritter
b2d7a13b9d
Polish "Use Console charset for console logging when available"
...
See gh-44353
2025-02-28 09:26:23 +01:00
Dmytro Nosan
a250bbb7e4
Use Console charset for console logging when available
...
Prior to this commit, LogbackLoggingSystemProperties
doesn't respect Console.charset(). It used Charset.getDefaultCharset()
for logback and UTF-8 for log42j as defaults.
This commit changes the behaviour of LogbackLoggingSystemProperties to use
Console.charset() when available. If no console is present, the default
charset is used instead.
These changes bring consistency across logging implementations.
See gh-43118
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-28 08:27:40 +01:00
Andy Wilkinson
93648792b1
Switch to management.opentelemetry.resource-attributes in tests
...
See gh-44468
2025-02-27 20:21:47 +00:00
Andy Wilkinson
51885c9d38
Remove deprecated management.otlp.metrics.export.resource-attributes
...
It was deprecated in 3.2 and should have been removed in 3.4 so its
removal is overdue.
Closes gh-44468
2025-02-27 19:01:10 +00:00
Andy Wilkinson
8eb8d3f281
Merge branch '3.4.x'
...
See gh-44449
2025-02-27 10:51:06 +00:00
Andy Wilkinson
cbf9cb04b4
Merge branch '3.3.x' into 3.4.x
...
See gh-44448
2025-02-27 10:50:42 +00:00
Andy Wilkinson
21a5319362
Revert "Use Framework's default class loader as default in ImportCandidates"
...
This reverts commit 56c955158d
.
See gh-44401
2025-02-27 10:50:17 +00:00
Stéphane Nicoll
96d91aad7e
Merge branch '3.4.x'
2025-02-27 09:42:27 +01:00
Stéphane Nicoll
facda3dca9
Adapt to change in exception hierarchy
...
See gh-44442
2025-02-27 09:38:26 +01:00
Stéphane Nicoll
1618ad1aa7
Merge branch '3.4.x'
2025-02-27 09:06:59 +01:00
Stéphane Nicoll
a9615f9b0d
Reapply "Start building against Spring Framework 6.2.4 snapshots"
...
This reverts commit 4d99e4a69f
.
2025-02-27 08:40:59 +01:00
Andy Wilkinson
a0ff9f6e33
Upgrade to Gradle 8.13
2025-02-26 19:26:45 +00:00
Andy Wilkinson
f45a3d7180
Merge branch '3.4.x'
...
Closes gh-44457
2025-02-26 18:47:19 +00:00
Andy Wilkinson
608b6c4852
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44456
2025-02-26 18:29:37 +00:00