Commit Graph

52653 Commits

Author SHA1 Message Date
Moritz Halbritter
58cc3a0d3d Deprecate SignalFX support
Closes gh-43962
2025-01-29 10:41:24 +01:00
Phillip Webb
a13fe0b565 Make @ConditionalOn[Boolean]Property @Repeatable
Update `ConditionalOnProperty`, `ConditionalOnBooleanProperty`
and `OnPropertyCondition` to support `@Repeatable`.

Closes gh-2541
2025-01-28 21:13:53 -08:00
Phillip Webb
f32b29e166 Don't use mocks for SystemStatusListenerTests
See gh-44012
2025-01-28 21:13:18 -08:00
Phillip Webb
eeee7d9d7c Merge pull request #44013 from izeye
* pr/44013:
  Remove duplicate test

Closes gh-44013
2025-01-28 20:20:32 -08:00
Johnny Lim
36eeb3564e Remove duplicate test
Remove shouldNotRegisterStructuredLoggingJsonMembersCustomizer...
RuntimeHints since it duplicates shouldNotRegisterStructuredLogging...
JsonMembersCustomizerRuntimeHintsWhenCustomizerIsNotSet

See gh-44013

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-01-28 20:19:18 -08:00
Phillip Webb
3fe4c5a692 Merge pull request #44012 from nosan
* pr/44012:
  Add more tests for SystemStatusListener and LogbackLoggingSystem

Closes gh-44012
2025-01-28 20:16:56 -08:00
Dmytro Nosan
213b2ea9bc Add more tests for SystemStatusListener and LogbackLoggingSystem
See gh-44012

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-01-28 20:16:38 -08:00
Phillip Webb
b722430efe Merge pull request #29500 from VladislavSevruk
* pr/29500:
  Polish @ConditionalOnBean and @ConditionalOnMissingBean tests
  Add ConditionalOnBean support for generic @Bean return types

Closes gh-29500
2025-01-28 20:14:38 -08:00
Phillip Webb
3911ca7c8e Polish @ConditionalOnBean and @ConditionalOnMissingBean tests
Combine generic and regular tests and apply some polish.

See gh-29500
2025-01-28 20:14:16 -08:00
Uladzislau Seuruk
aa7864ea38 Add ConditionalOnBean support for generic @Bean return types
Update `ConditionalOnBean` so support generics when resolving the
`@Bean` method.

See gh-29500

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2025-01-28 20:14:08 -08:00
Phillip Webb
fcad1fa12a Merge pull request #43931 from nosan
* pr/43931:
  Polish SystemStatusListener

Closes gh-43931
2025-01-28 12:03:24 -08:00
Dmytro Nosan
4878fc2a28 Polish SystemStatusListener
See gh-43931

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-01-28 12:03:11 -08:00
Phillip Webb
8e15317e89 Merge pull request #43931 from nosan
* pr/43931:
  Refine `SystemStatusListener` superfluous output fix
  Fix SystemStatusListener to prevent superfluous output

Closes gh-43931
2025-01-28 11:17:53 -08:00
Phillip Webb
c884529561 Refine SystemStatusListener superfluous output fix
Change `SystemStatusListener` to a `OnConsoleStatusListener` to
ensure that it cannot be added twice from different threads.

Also add a local `retrospectivePrint()` that is used for non-debug
output that will print ERROR and WARN status, but not INFO.

See gh-43931
2025-01-28 11:16:00 -08:00
Dmytro Nosan
6ba8e9b089 Fix SystemStatusListener to prevent superfluous output
Fix `SystemStatusListener` so that superfluous output is not
printed when starting an application. This change ensures that
the `SystemStatusListener` is not added twice, and that
retrospective logging only occurs when `debug` is true.

See gh-43931

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-01-28 11:15:55 -08:00
Brian Clozel
fc01b011d5 Merge branch '3.4.x' 2025-01-28 17:14:23 +01:00
Brian Clozel
e01a23b1fe Merge branch '3.3.x' into 3.4.x
Closes gh-
2025-01-28 17:13:47 +01:00
Brian Clozel
817f466c12 Fix SSL file watcher for relative symlinks
Prior to this commit, a change in gh-43586 unlocked the support for
symlinks: instead of watching the link itself which might never change,
this would watch the target file which is likely to change.

This could break with an `IllegalStateException` in case the symlink is
using a path relative to the link itself.

This commit ensures that the target is resolved against the current
link path to avoid incorrect watch operations.

Fixes gh-43966
2025-01-28 16:35:09 +01:00
Moritz Halbritter
6fcbf14fc0 Add factory methods to create an SslManagerBundle from trust managers
Add two methods to create an SslManagerBundle from a given
TrustManagerFactory or from a single or multiple TrustManagers.

Both those methods use the default KeyManagerFactory.

Closes gh-43064
2025-01-28 13:37:16 +01:00
Moritz Halbritter
f24ba9935c Add ability to ignore configuration properties
Properties which should be ignored can be specified in the
additional-spring-configuration-metadata.json file. The ignored
properties section is copied into the final
spring-configuration-metadata.json file, and the ignored properties are
removed from the properties element in the final file.

Closes gh-2421
2025-01-28 11:09:26 +01:00
Phillip Webb
08e9c16f33 Merge pull request #43931 from nosan
* pr/43931:
  Polish Logback StatusListener code
  Register Logback StatusListener when using custom Logback file

Closes gh-43931
2025-01-27 22:31:06 -08:00
Phillip Webb
8536950826 Polish Logback StatusListener code
Introduce a `SystemStatusListener` class to simplify Logback
status listener registration for both debug and regular output.

See gh-43931
2025-01-27 22:28:31 -08:00
Dmytro Nosan
258eb29978 Register Logback StatusListener when using custom Logback file
Update `LogbackLoggingSystem` so that the `OnErrorConsoleStatusListener`
is also registered when loading a custom Logback configuration file.

See gh-43931

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-01-27 22:26:53 -08:00
Phillip Webb
b9f3d522cf Merge branch '3.4.x'
Closes gh-43984
2025-01-27 17:41:29 -08:00
Phillip Webb
11672ca619 Merge branch '3.3.x' into 3.4.x
Closes gh-43983
2025-01-27 17:41:23 -08:00
Phillip Webb
2fe9de53a0 Upgrade to asciidoctor-extensions 1.0.0-alpha.15
Closes gh-43982
2025-01-27 17:41:16 -08:00
Phillip Webb
c9bf0e37e2 Merge branch '3.4.x' 2025-01-27 17:41:06 -08:00
Phillip Webb
237fa56aeb Merge branch '3.3.x' into 3.4.x 2025-01-27 17:40:57 -08:00
Phillip Webb
9ddd9a9b33 Backport 'Patch gulp-vinyl-zip to improve error messages'
Update Antora `package.json` to patch `@vscode+gulp-vinyl-zip` in order
to provide better error messages.

See gh-42392
2025-01-27 17:39:13 -08:00
Phillip Webb
7545bed284 Polish 2025-01-27 15:29:16 -08:00
Moritz Halbritter
cce509c7df Add configuration property to specify jOOQ settings file
The property is named 'spring.jooq.config' and is of type Resource,
so that it supports classpath: and all the other common prefixes.

The config is loaded through JAXB. If JAXB is not on the classpath,
an exception is thrown. Also adds a failure analyzer for this exception.

Closes gh-38778
2025-01-27 14:21:12 +01:00
Moritz Halbritter
b9bab7a98b Merge branch '3.4.x'
Closes gh-43976
2025-01-27 13:10:20 +01:00
Moritz Halbritter
8059c24e6a Merge branch '3.3.x' into 3.4.x
Closes gh-43975
2025-01-27 13:10:03 +01:00
Moritz Halbritter
5808a050d9 Merge pull request #43965 from Ru311
* pr/43965:
  Correct the location of MyApplication.java in the docs

Closes gh-43965
2025-01-27 13:09:51 +01:00
Rucha Vaikar
c699779593 Correct the location of MyApplication.java in the docs
See gh-43965

Signed-off-by: Rucha Vaikar <70310911+Ru311@users.noreply.github.com>
2025-01-27 13:05:43 +01:00
Moritz Halbritter
1bab11f28d Merge branch '3.4.x'
Closes gh-43972
2025-01-27 11:43:30 +01:00
Moritz Halbritter
dd7708190c Merge branch '3.3.x' into 3.4.x
Closes gh-43971
2025-01-27 11:43:18 +01:00
Moritz Halbritter
f39fc87134 Merge pull request #43961 from ngocnhan-tran1996
* pr/43961:
  Add links to Jackson JavaDoc

Closes gh-43961
2025-01-27 11:43:00 +01:00
Tran Ngoc Nhan
bee3dafc86 Add links to Jackson JavaDoc
See gh-43961

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-01-27 11:42:06 +01:00
Moritz Halbritter
f56578f42e Merge branch '3.4.x'
Closes gh-43970
2025-01-27 10:26:03 +01:00
Moritz Halbritter
7491990e44 Merge branch '3.3.x' into 3.4.x
Closes gh-43969
2025-01-27 10:25:44 +01:00
Moritz Halbritter
eb8f1c9b0a Upgrade to Gradle 8.12.1
Closes gh-43968
2025-01-27 09:49:43 +01:00
Phillip Webb
3ff6e0b5a9 Merge branch '3.4.x' 2025-01-24 19:24:42 -08:00
Phillip Webb
3b29085ac8 Merge branch '3.3.x' into 3.4.x 2025-01-24 19:24:10 -08:00
Phillip Webb
66c224b74a Update copyright year of changed files 2025-01-24 19:23:41 -08:00
Phillip Webb
6b654f4cb8 Merge branch '3.4.x' 2025-01-24 19:23:27 -08:00
Phillip Webb
67a585e8a3 Merge branch '3.3.x' into 3.4.x 2025-01-24 19:22:54 -08:00
Phillip Webb
4b26a08206 Polish 2025-01-24 19:21:48 -08:00
Phillip Webb
680c1682e7 Merge branch '3.4.x' 2025-01-24 19:14:00 -08:00
Phillip Webb
3f00b08577 Merge branch '3.3.x' into 3.4.x 2025-01-24 18:39:14 -08:00