Commit Graph

53244 Commits

Author SHA1 Message Date
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
Andy Wilkinson
3de189a1df Minimize test resources and move remainder to appropriate packages
Closes gh-44397
2025-02-26 15:49:42 +00:00
Andy Wilkinson
2dac97a8bc Merge branch '3.4.x'
Closes gh-44455
2025-02-26 15:46:01 +00:00
Andy Wilkinson
4d137d4456 Merge branch '3.3.x' into 3.4.x
Closes gh-44454
2025-02-26 15:45:47 +00:00
Andy Wilkinson
8577718b22 Close InputStream when loading PEM content from a resource
Fixes gh-44443
2025-02-26 15:45:24 +00:00
Andy Wilkinson
3d81a8d848 Merge branch '3.4.x'
Closes gh-44453
2025-02-26 15:44:16 +00:00
Andy Wilkinson
9c189a0550 Merge branch '3.3.x' into 3.4.x
Closes gh-44452
2025-02-26 15:44:03 +00:00
Andy Wilkinson
88745820d3 Close InputStream after reading banner resource
Fixes gh-44441
2025-02-26 15:43:42 +00:00
Andy Wilkinson
4ffb29a924 Merge branch '3.4.x'
Closes gh-44451
2025-02-26 15:42:58 +00:00
Andy Wilkinson
0e066ac9b4 Merge branch '3.3.x' into 3.4.x
Closes gh-44450
2025-02-26 15:42:46 +00:00
Andy Wilkinson
5be5eaf7f2 Use ClassLoader from ResourceLoader to load PropertySourceLoaders
Fixes gh-44427
2025-02-26 15:42:12 +00:00
Andy Wilkinson
65dbff1729 Merge branch '3.4.x'
Closes gh-44449
2025-02-26 15:39:57 +00:00
Andy Wilkinson
4f0dd516b4 Merge branch '3.3.x' into 3.4.x
Closes gh-44448
2025-02-26 15:39:26 +00:00
Andy Wilkinson
56c955158d Use Framework's default class loader as default in ImportCandidates
Closes gh-44401
2025-02-26 15:32:50 +00:00
Andy Wilkinson
a5ff2a94f0 Merge branch '3.4.x'
Closes gh-44446
2025-02-26 15:31:17 +00:00
Andy Wilkinson
23b89c8cb3 Merge branch '3.3.x' into 3.4.x
Closes gh-44445
2025-02-26 15:31:04 +00:00
Andy Wilkinson
3acea583ad Add support for working with resources in tests
Closes gh-44444
2025-02-26 15:29:20 +00:00
Stéphane Nicoll
026c0b2a64 Merge branch '3.4.x' 2025-02-26 15:27:15 +01:00
Stéphane Nicoll
d04620d5b3 Polish test
Include at least a bean declaration to make sure the cglib proxy is
created
2025-02-26 15:15:30 +01:00
Stéphane Nicoll
d80993e439 Merge branch '3.4.x' 2025-02-26 14:35:18 +01:00
Stéphane Nicoll
4d99e4a69f Revert "Start building against Spring Framework 6.2.4 snapshots"
This reverts commit a5f8642127.
2025-02-26 14:35:04 +01:00
Stéphane Nicoll
4c37267921 Merge branch '3.4.x' 2025-02-26 14:03:08 +01:00
Stéphane Nicoll
a5f8642127 Start building against Spring Framework 6.2.4 snapshots
See gh-44442
2025-02-26 13:52:28 +01:00
Moritz Halbritter
79ec0ea182 Merge branch '3.4.x'
Closes gh-44440
2025-02-26 11:50:57 +01:00
Moritz Halbritter
8705ed0ecc Merge branch '3.3.x' into 3.4.x
Closes gh-44436
2025-02-26 11:49:59 +01:00
Moritz Halbritter
abf320d273 Register reflection hints for SslBundleSslEngineFactory
Closes gh-44435
2025-02-26 11:46:55 +01:00
Moritz Halbritter
e7d9f195d2 Merge branch '3.4.x'
Closes gh-44438
2025-02-26 11:35:08 +01:00
Moritz Halbritter
ea25734599 Merge branch '3.3.x' into 3.4.x
Closes gh-44437
2025-02-26 11:28:49 +01:00
Moritz Halbritter
453002b77b Add class of SslBundleSslEngineFactory to Kafka config map
Closes gh-44414
2025-02-26 10:46:12 +01:00
Moritz Halbritter
2ec99a7591 Merge pull request #44398 from typat
* pr/44398:
  Ensure StandardStackTracePrinter respects stacktrace.root configuration property

Closes gh-44398
2025-02-25 14:38:33 +01:00
Tyler Gregory
9199fecae3 Ensure StandardStackTracePrinter respects stacktrace.root configuration property
See gh-44398

Signed-off-by: Tyler Gregory <tyler.w.gregory@gmail.com>
2025-02-25 14:27:28 +01:00
Moritz Halbritter
bde4fb0b38 Merge pull request #44366 from nosan
* pr/44366:
  Add spring.data.mongodb.protocol property

Closes gh-44366
2025-02-25 14:03:22 +01:00
Dmytro Nosan
35db02bf48 Add spring.data.mongodb.protocol property
This commit allows configuring the MongoDB connection
protocol using the 'spring.data.mongodb.protocol' property.

See gh-44366

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-25 14:02:29 +01:00
Moritz Halbritter
2b854c7ed8 Merge pull request #44412 from nosan
* pr/44412:
  Polish "Improve logging in DockerApi"
  Improve logging in DockerApi

Closes gh-44412
2025-02-25 13:40:56 +01:00
Moritz Halbritter
3be5e6cc3e Polish "Improve logging in DockerApi"
See gh-44412
2025-02-25 13:14:38 +01:00
Dmytro Nosan
9a940702bc Improve logging in DockerApi
This commit introduces a new constructor in `DockerApi`
that accepts `DockerLogger` as a parameter.

The `DockerLogger` is a pretty simple callback interface used to
provide DockerApi output logging.

See gh-44412

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-25 13:07:23 +01:00
Stéphane Nicoll
91e7d499b9 Merge branch '3.4.x'
Closes gh-44430
2025-02-25 09:18:51 +01:00
Stéphane Nicoll
b4336b2d89 Merge branch '3.3.x' into 3.4.x
Closes gh-44429
2025-02-25 09:18:45 +01:00