Commit Graph

27738 Commits

Author SHA1 Message Date
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
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 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
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 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 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 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
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
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
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 c22dcedb59 Fix @ConfigurationProperties prefix violation
See gh-43917
2025-01-24 15:18:59 -08:00
Phillip Webb 8ec61b9870 Polish 'Refactor `@ConfigurationProperties` that only use `prefix`'
See gh-43917
2025-01-24 14:59:32 -08:00
Yanming Zhou c1d97ffe16 Refactor `@ConfigurationProperties` that only use `prefix`
See gh-43917

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-24 14:58:36 -08:00
Phillip Webb 585030679a Polish 'Use isXxx() instead of getXxx() for boolean properties'
See gh-43934
2025-01-24 14:28:18 -08:00
Yanming Zhou 964abef6b3 Use isXxx() instead of getXxx() for boolean properties
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

See gh-43934
2025-01-24 14:27:47 -08:00
Phillip Webb 55633a1377 Polish 'Add support for multiple StructuredLoggingJsonMembersCustomizers'
See gh-43368
2025-01-24 14:00:24 -08:00
Yanming Zhou aa5d8ecbea Add support for multiple StructuredLoggingJsonMembersCustomizers
Update `StructuredLoggingJsonProperties` and related class so that
multiple `StructuredLoggingJsonMembersCustomizer` classes can be
used.

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>

See gh-43368
2025-01-24 13:51:20 -08:00
Dmytro Nosan 126233303c Remove the use of a FactoryBean when auto-configuring VirtualThreadMetrics
See gh-43957

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-01-24 14:05:26 +01:00
Yanming Zhou 7391cd876e Rename configuration class for consistency
See gh-43866

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-24 13:49:35 +01:00
Moritz Halbritter 7c6dbbff4b Polish "Remove "java.home" system property when running in a native image"
See gh-43517
2025-01-24 13:36:39 +01:00
dae won 017a71ddc6 Remove "java.home" system property when running in a native image
See gh-43517
2025-01-24 13:35:15 +01:00
Moritz Halbritter d73502708e Add virtual threads metrics to documentation
See gh-43852
2025-01-24 13:30:13 +01:00
Andy Wilkinson d7cf2b3d7e Merge branch '3.4.x'
Closes gh-43959
2025-01-24 11:57:41 +00:00
Andy Wilkinson 7664bab35f Merge branch '3.3.x' into 3.4.x
Closes gh-43958
2025-01-24 11:57:29 +00:00
Andy Wilkinson 178f693118 Polish "Warn about limitations of Quartz's schema scripts"
See gh-43955
2025-01-24 11:53:55 +00:00
Timothée Andres 2600e872e3 Warn about limitations of Quartz's schema scripts
See gh-43955

Signed-off-by: Timothée Andres <andres.timothee@gmail.com>
2025-01-24 11:49:33 +00:00
Dmytro Nosan fc5c285ded Auto-configure VirtualThreadMetrics
See gh-43852

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-01-24 11:37:49 +01:00
Andy Wilkinson 1e43b0003f Merge branch '3.4.x'
Closes gh-43951
2025-01-24 08:54:50 +00:00
Andy Wilkinson c7b54dcbb3 Merge branch '3.3.x' into 3.4.x
Closes gh-43950
2025-01-24 08:53:03 +00:00
Johnny Lim 6c8d41935f Polish
See gh-43879

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-01-24 08:45:41 +00:00
Johnny Lim 4667db619c Change return type for VirtualThreadsInfo.getMounted() to int
See gh-43941

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-01-24 08:11:45 +00:00
Moritz Halbritter 0f4488065c Upgrade to Selenium 4.28.1
Closes gh-43943
2025-01-23 14:58:53 +01:00
Moritz Halbritter 8be6164694 Upgrade to HtmlUnit 4.9.0
Closes gh-43942
2025-01-23 14:58:48 +01:00
Andy Wilkinson 49597e0b55 Polish "Parse Redis database from url if present"
See gh-43813
2025-01-23 11:37:36 +00:00
Yanming Zhou fcc6655c06 Parse Redis database from url if present
See gh-43813

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-23 11:30:31 +00:00
Andy Wilkinson 3272148932 Merge branch '3.4.x'
Closes gh-43930
2025-01-22 14:56:20 +00:00
Andy Wilkinson f184e98b78 Merge branch '3.3.x' into 3.4.x
Closes gh-43929
2025-01-22 14:56:09 +00:00
Andy Wilkinson 390963fe74 Document when defaultValue and description cannot be extracted
Closes gh-43925
2025-01-22 14:54:06 +00:00
Andy Wilkinson c20f6cba8a Polish "Add spring.validation.method.adapt-constraint-violations property"
See gh-43886
2025-01-22 14:36:18 +00:00
Yanming Zhou 0e7d480545 Add spring.validation.method.adapt-constraint-violations property
See gh-43886

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-22 14:35:47 +00:00
Andy Wilkinson 88ce6f6af2 Merge branch '3.4.x'
Closes gh-43927
2025-01-22 11:58:02 +00:00
Andy Wilkinson ef82719ca8 Fix memory comparison in ProcessInfoTests
Closes gh-43926
2025-01-22 11:57:32 +00:00
Andy Wilkinson dd64ea1736 Merge branch '3.4.x'
Closes gh-43921
2025-01-22 08:22:01 +00:00
Andy Wilkinson 1e35a0b82d Correct the type of logging.structured.json.customizer
Closes gh-43916
2025-01-22 08:21:30 +00:00
Andy Wilkinson 0ac3aae879 Upgrade to Spring Pulsar 1.2.2
Closes gh-43764
2025-01-22 08:11:08 +00:00
Andy Wilkinson 96bef8e01c Upgrade to Spring Integration 6.5.0-M1
Closes gh-43767
2025-01-22 08:11:08 +00:00
Andy Wilkinson 24e40e8f82 Upgrade to Spring Pulsar 1.2.2
Closes gh-43752
2025-01-22 08:08:39 +00:00
Andy Wilkinson a3eaafbbea Upgrade to Spring Pulsar 1.1.8
Closes gh-43744
2025-01-22 08:06:47 +00:00
Andy Wilkinson 91da8c56a2 Upgrade to Spring Kafka 3.3.2
Closes gh-43763
2025-01-21 18:28:49 +00:00
Andy Wilkinson 8841fffb1d Upgrade to Spring AMQP 3.2.2
Closes gh-43760
2025-01-21 18:28:48 +00:00
Andy Wilkinson fd666717cc Upgrade to MySQL 9.2.0
Closes gh-43915
2025-01-21 18:28:48 +00:00
Andy Wilkinson 148260ebfb Upgrade to Infinispan 15.1.4.Final
Closes gh-43914
2025-01-21 18:28:44 +00:00
Andy Wilkinson 9d0dd66570 Upgrade to Spring Kafka 3.3.2
Closes gh-43751
2025-01-21 18:25:55 +00:00
Andy Wilkinson b21d1a9893 Upgrade to Spring AMQP 3.2.2
Closes gh-43748
2025-01-21 18:25:54 +00:00
Andy Wilkinson 7d34e6df07 Revert "Merge pull request #43813 from quaff"
This reverts commit 4478bd5209, reversing
changes made to c032e1f872.
2025-01-21 17:27:09 +00:00
Yanming Zhou 24d1b3ca94 Parse redis database from url if present
See gh-43813

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-21 17:02:25 +00:00
Andy Wilkinson c032e1f872 Merge branch '3.4.x'
Closes gh-43913
2025-01-21 16:55:16 +00:00
Andy Wilkinson 33528375e1 Merge pull request #43862 from nosan
* gh-43862:
  Fix binding of structured logging properties in a native image

Closes gh-43862
2025-01-21 16:55:09 +00:00
Dmytro Nosan 0a83bcd9dd Fix binding of structured logging properties in a native image
Add RuntimeHints for GraylogExtendedLogFormatProperties,
StructuredLoggingJsonProperties and ElasticCommonSchemaProperties
properties.

Add BeanFactoryInitializationAotProcessor to register RuntimeHints
for a custom StructuredLoggingJsonMembersCustomizer.

See gh-43862

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-01-21 16:29:20 +00:00
Andy Wilkinson b1ad70711e Upgrade to Pulsar 3.3.4
Closes gh-43912
2025-01-21 16:25:16 +00:00
Andy Wilkinson d80b97d351 Upgrade to Infinispan 15.0.12.Final
Closes gh-43911
2025-01-21 16:25:11 +00:00
Andy Wilkinson b6646f383c Upgrade to Hibernate 6.6.5.Final
Closes gh-43910
2025-01-21 16:25:07 +00:00
Andy Wilkinson 449897defa Upgrade to Infinispan 15.0.12.Final
Closes gh-43909
2025-01-21 16:22:59 +00:00
Andy Wilkinson 766c17fcdd Polish "Replace @ConditionalOnProperty with …BooleanProperty where feasible"
See gh-43868
2025-01-21 15:13:44 +00:00
Yanming Zhou 960c8825e0 Replace @ConditionalOnProperty with …BooleanProperty where feasible
See gh-43868

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-21 15:08:26 +00:00
Andy Wilkinson 88eb74884a Merge branch '3.4.x'
Closes gh-43906
2025-01-21 14:36:55 +00:00
Andy Wilkinson eea9491c46 Merge branch '3.3.x' into 3.4.x
Closes gh-43905
2025-01-21 14:36:44 +00:00
Johnny Lim 15a6c9affb Fix description of management.metrics.graphql.autotime.enabled
See gh-43904

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-01-21 14:36:20 +00:00
Andy Wilkinson d391cc1348 Upgrade to Spring Security 6.5.0-M1
Closes gh-43766
2025-01-21 13:34:47 +00:00
Andy Wilkinson 6f0257139a Upgrade to Spring LDAP 3.3.0-M1
Closes gh-43765
2025-01-21 13:34:47 +00:00
Andy Wilkinson 0a0176e85a Upgrade to Selenium 4.28.0
Closes gh-43898
2025-01-21 13:34:47 +00:00
Andy Wilkinson bf5b244053 Upgrade to Pulsar 3.3.4
Closes gh-43897
2025-01-21 13:34:47 +00:00
Andy Wilkinson 0f5eb465c9 Upgrade to Liquibase 4.31.0
Closes gh-43896
2025-01-21 13:34:47 +00:00
Andy Wilkinson 8159674484 Upgrade to Hibernate 6.6.5.Final
Closes gh-43895
2025-01-21 12:23:27 +00:00
Andy Wilkinson a4a18baa13 Upgrade to Flyway 11.2.0
Closes gh-43894
2025-01-21 12:23:23 +00:00
Andy Wilkinson b236b61be2 Upgrade to Caffeine 3.2.0
Closes gh-43893
2025-01-21 12:23:17 +00:00
Andy Wilkinson 77fd91ee94 Upgrade to Byte Buddy 1.16.1
Closes gh-43892
2025-01-21 12:23:13 +00:00
Andy Wilkinson 4296376930 Document that clean on validation error has been removed in Flyway 11
Closes gh-43890
2025-01-21 12:17:19 +00:00
Andy Wilkinson 049fe3eadd Merge branch '3.4.x'
Closes gh-43891
2025-01-21 12:10:35 +00:00
Andy Wilkinson 00f88b9e05 Remove overly specific casts from SslConnectorCustomizer
Closes gh-43849
2025-01-21 12:09:46 +00:00
Brian Clozel 2dabd11211 GraphQL should not back off when GrapQlSource is present
Prior to this commit, the GraphQL auto-configuration that defines the
infrastructure beans for base support would only be active when:

* GraphQL schema files are detected in the configured locations
* or if GraphQlSourceBuilderCustomizer beans are present

This would allow some "code first" approaches, but not situations where
developers contribute their own `GraphQlSource`. This commit ensures
that the auto-configuration is processed even if the application only
contributes a custom `GraphQlSource` bean.

Closes gh-33096
2025-01-20 08:04:27 +01:00
Stéphane Nicoll 44f5fb2a4f Merge branch '3.4.x'
Closes gh-43880
2025-01-19 08:46:19 +01:00
Stéphane Nicoll 7c52938168 Polish "Fix potential NPE in GraylogExtendedLogFormatProperties"
See gh-43863
2025-01-19 08:29:45 +01:00
Dmytro Nosan 9de517281e Fix potential NPE in GraylogExtendedLogFormatProperties
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>

See gh-43863
2025-01-19 08:06:40 +01:00
Stéphane Nicoll af29ff56a8 Merge branch '3.4.x'
Closes gh-43878
2025-01-19 08:05:02 +01:00