Commit Graph

28148 Commits

Author SHA1 Message Date
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
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 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
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
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
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 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 facda3dca9 Adapt to change in exception hierarchy
See gh-44442
2025-02-27 09:38:26 +01: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
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