Commit Graph

27716 Commits

Author SHA1 Message Date
Andy Wilkinson 885fcdbffc Merge branch '3.3.x' into 3.4.x
Closes gh-44255
2025-02-13 10:33:25 +00:00
Andy Wilkinson 874ee9936a Improve handling of default values when printing the banner
Previously, default values for the following properties did not work:

- application.title
- application.formatted-version
- application.version
- spring-boot.formatted-version
- spring-boot.version

Instead of the default value, an empty string was used instead. For
example, ${application.title:Title} would be replaced with "" rather
than "Title" when the application title was unavailable.

This commit improves the ResourceBanner so that a placeholder's
default value is used. An empty string will still be used when no
default value is provided. For example, ${application.title} will
be replaced with "". As before, custom properties that are not
well-known will not be replaced at all. For example
${custom.property} will remain as-is in the printed banner when
the custom.property has not been set.

Fixes gh-44137
2025-02-13 10:13:12 +00:00
Andy Wilkinson 4cb9d816b9 Include non-default candidates in metrics and health
Previously, when Actuator expected to find multiple beans of the same
type, it used Map<String, Type> to inject them. Unfortunately, this
does not include beans that are not default candidates and there's
no way to request that autowiring includes such beans with Map-based
injection.

This commit switches from Map-based injection to querying the bean
factory for the desired beans. This is done using
SimpleAutowireCandidateResolver's new helper method,
resolveAutowireCandidates, that returns a Map<String, Type> of
beans including those that are not default candidates but excluding
those that are not autowire candidates.

Closes gh-43481
2025-02-12 21:44:41 +00:00
Stéphane Nicoll f6f0daa47d Merge branch '3.3.x' into 3.4.x
Closes gh-44245
2025-02-12 20:25:20 +01:00
Stéphane Nicoll a57fd8002f Update copyright year of changed file
See gh-44240
2025-02-12 20:22:48 +01:00
zhoudong 6177010b11 Polish variable name in ServletWebServerApplicationContext.selfInitialize()
See gh-44240

Signed-off-by: zhoudong <jearton1024@gmail.com>
2025-02-12 20:22:14 +01:00
Stéphane Nicoll 69c23e86d8 Merge branch '3.3.x' into 3.4.x
Closes gh-44222
2025-02-11 15:11:44 +01:00
Stéphane Nicoll 6e33bd9fbb Prevent upgrade to Tomcat 10.1.35
Closes gh-44219
2025-02-11 15:11:15 +01:00
Stéphane Nicoll 16b7ac948f Upgrade to Reactor Bom 2024.0.3
Closes gh-44117
2025-02-11 13:52:45 +01:00
Stéphane Nicoll 486825415e Upgrade to Netty 4.1.118.Final
Closes gh-44221
2025-02-11 13:52:44 +01:00
Stéphane Nicoll 020dfb64c1 Upgrade to Micrometer Tracing 1.4.3
Closes gh-44116
2025-02-11 13:52:40 +01:00
Stéphane Nicoll 6bce2b4736 Upgrade to Micrometer 1.14.4
Closes gh-44115
2025-02-11 13:52:39 +01:00
Stéphane Nicoll 812bc4e09b Upgrade to Hibernate 6.6.7.Final
Closes gh-44220
2025-02-11 13:52:39 +01:00
Stéphane Nicoll c5779b2f8b Upgrade to Reactor Bom 2023.0.15
Closes gh-44104
2025-02-11 13:51:35 +01:00
Stéphane Nicoll 2ee5e23a47 Upgrade to Netty 4.1.118.Final
Closes gh-44218
2025-02-11 13:51:35 +01:00
Stéphane Nicoll 18c64524a8 Upgrade to Micrometer Tracing 1.3.9
Closes gh-44103
2025-02-11 13:51:31 +01:00
Stéphane Nicoll 6fe757f72e Upgrade to Micrometer 1.13.11
Closes gh-44102
2025-02-11 13:51:30 +01:00
Andy Wilkinson 18db70533d Merge branch '3.3.x' into 3.4.x
Closes gh-44215
2025-02-11 12:31:07 +00:00
Andy Wilkinson 3e5929a446 Remove duplicate dispatcher servlet auto-config tests
Closes gh-44207
2025-02-11 12:19:45 +00:00
Andy Wilkinson 30d7af4e38 Add CI with Java 24
Closes gh-44205
2025-02-11 11:34:43 +00:00
Andy Wilkinson c5d21e0e63 Add TWENTY_FOUR to JavaVersion enum
Closes gh-44209
2025-02-11 11:03:02 +00:00
Andy Wilkinson 5502e1443e Upgrade to Neo4j Java Driver 5.28.1
Closes gh-44195
2025-02-10 12:25:43 +00:00
Andy Wilkinson 167dfd6bc9 Merge branch '3.3.x' into 3.4.x
Closes gh-44193
2025-02-10 11:09:12 +00:00
Andy Wilkinson ea76e46faa Apply charset to Mustache's content type
Fixes gh-44053
2025-02-10 11:07:49 +00:00
Andy Wilkinson c3c7ed4c2e Fix class cast during additional path matching with health probes
Previously, when health probes were enabled, the post-processor of
AutoConfiguredHealthEndpointGroups resulted in the bean no longer
implementing AdditionalPathMapper. This then caused a
ClassCastException when working with AdditionalPathMapper beans
in EndpointRequest's additional path mapping support.

This commit updates the type returned by the post-processor to
implement both HealthEndpointGroups and AdditionalPathMapper, as
AutoConfiguredHealthEndpointGroups does. Its implementation of
getAdditionalPaths produces a result that combines both the
additional paths of the original HealthEndpointGroups bean and its
own additional paths for the probes.

Fixes gh-44052
2025-02-10 10:01:19 +00:00
Andy Wilkinson 1c0253b380 Align reactive EndpointRequest with servlet equivalent
Closes gh-44189
2025-02-10 09:28:28 +00:00
Andy Wilkinson 3603cb4ad9 Fix matching against context with implicit server namespace
Closes gh-44188
2025-02-10 09:18:46 +00:00
Stéphane Nicoll fafcfb41c8 Upgrade to Testcontainers Redis Module 2.2.3
Closes gh-44182
2025-02-08 15:48:44 +01:00
Stéphane Nicoll c1cda666e7 Upgrade to RSocket 1.1.5
Closes gh-44181
2025-02-08 15:48:44 +01:00
Stéphane Nicoll e91705a04d Upgrade to R2DBC MySQL 1.3.2
Closes gh-44180
2025-02-08 15:47:58 +01:00
Stéphane Nicoll ff6168cde7 Upgrade to Native Build Tools Plugin 0.10.5
Closes gh-44179
2025-02-08 15:47:58 +01:00
Stéphane Nicoll 08e5578157 Upgrade to Infinispan 15.0.13.Final
Closes gh-44178
2025-02-08 15:45:06 +01:00
Stéphane Nicoll 15099d0755 Upgrade to HttpCore5 5.3.3
Closes gh-44177
2025-02-08 15:45:02 +01:00
Stéphane Nicoll 75c06f224c Upgrade to HttpClient5 5.4.2
Closes gh-44176
2025-02-08 15:44:58 +01:00
Stéphane Nicoll 54a11aba6e Upgrade to Hibernate 6.6.6.Final
Closes gh-44175
2025-02-08 15:44:54 +01:00
Stéphane Nicoll f3de1a121f Upgrade to Groovy 4.0.25
Closes gh-44174
2025-02-08 15:44:50 +01:00
Stéphane Nicoll 16467c4f90 Upgrade to Commons Pool2 2.12.1
Closes gh-44173
2025-02-08 15:44:46 +01:00
Andy Wilkinson cc5414826a Merge branch '3.3.x' into 3.4.x
Closes gh-44170
2025-02-08 10:08:43 +00:00
Tran Ngoc Nhan b5fa849563 Link to JarLauncher's javadoc
See gh-44168

Signed-off-by: Tran Ngoc Nhan <ngocnhan.tran1996@gmail.com>
2025-02-08 10:08:05 +00:00
Moritz Halbritter 4fbbc3eda1 Clean up duplicate JsonView entry 2025-02-06 15:40:05 +01:00
Moritz Halbritter 8552bc0d78 Merge branch '3.3.x' into 3.4.x 2025-02-06 14:27:06 +01:00
Moritz Halbritter 461e30f668 Add JsonView to PluginClasspathGradleBuild 2025-02-06 14:26:51 +01:00
Moritz Halbritter 1b494cc61d Merge branch '3.3.x' into 3.4.x
Closes gh-44145
2025-02-06 12:21:58 +01:00
Moritz Halbritter baf596d10e Document double observations when using @Timed etc.
Closes gh-44037
2025-02-06 12:21:31 +01:00
Stéphane Nicoll dbc61d39f0 Upgrade to RSocket 1.1.5
Closes gh-44041
2025-02-05 14:57:50 +01:00
Stéphane Nicoll b46698774d Upgrade to Native Build Tools Plugin 0.10.5
Closes gh-44141
2025-02-05 14:57:50 +01:00
Stéphane Nicoll fcd33e8b30 Upgrade to Infinispan 15.0.13.Final
Closes gh-44140
2025-02-05 12:28:16 +01:00
Stéphane Nicoll 3e4a799bb9 Upgrade to Groovy 4.0.25
Closes gh-44139
2025-02-05 12:28:12 +01:00
Stéphane Nicoll c80c08d7bd Upgrade to Commons Pool2 2.12.1
Closes gh-44138
2025-02-05 12:28:08 +01:00
Stéphane Nicoll 2834367cb8 Start building against Spring Session 3.4.2 snapshots
See gh-44127
2025-02-05 10:05:15 +01:00
Stéphane Nicoll 5999cd7109 Start building against Spring Security 6.4.3 snapshots
See gh-44126
2025-02-05 10:05:15 +01:00
Stéphane Nicoll ce47bbc2ee Start building against Spring Pulsar 1.2.3 snapshots
See gh-44125
2025-02-05 10:05:14 +01:00
Stéphane Nicoll e9c36ccf38 Start building against Spring LDAP 3.2.11 snapshots
See gh-44124
2025-02-05 10:05:14 +01:00
Stéphane Nicoll 1d85aa42a9 Start building against Spring Kafka 3.3.3 snapshots
See gh-44123
2025-02-05 10:05:14 +01:00
Stéphane Nicoll 38f55c3080 Start building against Spring Integration 6.4.2 snapshots
See gh-44122
2025-02-05 10:05:14 +01:00
Stéphane Nicoll ac9571a033 Start building against Spring GraphQL 1.3.4 snapshots
See gh-44121
2025-02-05 10:05:14 +01:00
Stéphane Nicoll 9feb2de604 Start building against Spring Data Bom 2024.1.3 snapshots
See gh-44119
2025-02-05 10:05:14 +01:00
Stéphane Nicoll bec776e024 Start building against Spring Authorization Server 1.4.2 snapshots
See gh-44118
2025-02-05 10:05:14 +01:00
Stéphane Nicoll d02895d6ac Start building against Reactor Bom 2024.0.3 snapshots
See gh-44117
2025-02-05 10:05:14 +01:00
Stéphane Nicoll 6c89096082 Start building against Micrometer Tracing 1.4.3 snapshots
See gh-44116
2025-02-05 10:05:14 +01:00
Stéphane Nicoll f0c7a5bec6 Start building against Micrometer 1.14.4 snapshots
See gh-44115
2025-02-05 10:05:14 +01:00
Stéphane Nicoll 785dc18cd5 Start building against Spring Session 3.3.6 snapshots
See gh-44114
2025-02-05 10:05:06 +01:00
Stéphane Nicoll da8b5897c2 Start building against Spring Security 6.3.7 snapshots
See gh-44113
2025-02-05 10:05:06 +01:00
Stéphane Nicoll fedb086edd Start building against Spring Pulsar 1.1.9 snapshots
See gh-44112
2025-02-05 10:05:06 +01:00
Stéphane Nicoll ff56e7c2f6 Start building against Spring LDAP 3.2.11 snapshots
See gh-44111
2025-02-05 10:05:06 +01:00
Stéphane Nicoll 548eaf642b Start building against Spring Kafka 3.2.7 snapshots
See gh-44110
2025-02-05 10:05:06 +01:00
Stéphane Nicoll f32dc305fc Start building against Spring Integration 6.3.8 snapshots
See gh-44109
2025-02-05 10:05:06 +01:00
Stéphane Nicoll fb25bf6cfa Start building against Spring GraphQL 1.3.4 snapshots
See gh-44108
2025-02-05 10:05:06 +01:00
Stéphane Nicoll adc92e958a Start building against Spring Data Bom 2024.0.9 snapshots
See gh-44106
2025-02-05 10:05:06 +01:00
Stéphane Nicoll dd4049fcd5 Start building against Spring Authorization Server 1.3.5 snapshots
See gh-44105
2025-02-05 10:05:06 +01:00
Stéphane Nicoll d4d08a19e8 Start building against Reactor Bom 2023.0.15 snapshots
See gh-44104
2025-02-05 10:05:06 +01:00
Stéphane Nicoll 921d9867b3 Start building against Micrometer Tracing 1.3.9 snapshots
See gh-44103
2025-02-05 10:05:06 +01:00
Stéphane Nicoll baede48c09 Start building against Micrometer 1.13.11 snapshots
See gh-44102
2025-02-05 10:05:05 +01:00
Andy Wilkinson e6678b6d16 Merge branch '3.3.x' into 3.4.x
Closes gh-44130
2025-02-05 08:48:38 +00:00
Andy Wilkinson 4b8d5f22de Remove Java 8-specific build configuration that will never apply
With our Java 17 baseline, the build configuration that is only
applicable when building with Java 8 will never be used. This commit
removes it.

Closes gh-44129
2025-02-05 08:47:29 +00:00
Phillip Webb 0ec15c8f9b Merge branch '3.3.x' into 3.4.x
Closes gh-44055
2025-02-03 19:44:33 -08:00
Phillip Webb 80e8ab8779 Support commercial repositories in effective BOM and Ivy
Update `BomExtension` to resolve '{spring.mavenRepositories}' and add
credentials to `ivysettings.xml` and `settings.xml`.

Closes gh-44050
2025-02-03 18:22:53 -08:00
Stéphane Nicoll dc9aa6d168 Polish
See gh-44034
2025-01-31 17:04:33 +01:00
Stéphane Nicoll a3f997d5d5 Merge branch '3.3.x' into 3.4.x
Closes gh-44035
2025-01-31 13:46:21 +01:00
Ashish Kumar e41d697040 Fix typo in Running Your Application
See gh-44032

Signed-off-by: Ashish Kumar <34642693+ashishkujoy@users.noreply.github.com>
2025-01-31 13:45:37 +01:00
Phillip Webb 965e587de3 Polish 2025-01-30 20:17:39 -08:00
Phillip Webb 1c3cbb411c Fix missing javadoc reference 2025-01-30 18:38:29 -08:00
Andy Wilkinson df32e21078 Merge branch '3.3.x' into 3.4.x
Closes gh-44025
2025-01-30 12:10:50 +00:00
Andy Wilkinson 01ec0c4fe0 Polish "Update SpringBootJoranConfigurator to use proper GraalVM format"
See gh-44021
2025-01-30 12:02:20 +00:00
Dmytro Nosan d9f441d620 Update SpringBootJoranConfigurator to use proper GraalVM format
Before this commit, the generated name for the inner class had the
wrong format <package>.<parent>.<child> (canonical name).
GraalVM expects $ to separate the parent from the inner class.

This commit updates SpringBootJoranConfigurator to generate
an appropriate format for a class name. Specifically, an inner class
should be separated by a dollar sign, not a dot.

See gh-44021

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-01-30 12:00:33 +00:00
Moritz Halbritter dcd4b7cb57 Merge branch '3.3.x' into 3.4.x
Closes gh-44022
2025-01-30 10:25:02 +01:00
Moritz Halbritter 7f9b4c6ff6 Document Kubernetes' preStop sleep
Closes gh-43830
2025-01-30 10:22:25 +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 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 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 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
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
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
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 ef82719ca8 Fix memory comparison in ProcessInfoTests
Closes gh-43926
2025-01-22 11:57:32 +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 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 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 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 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 00f88b9e05 Remove overly specific casts from SslConnectorCustomizer
Closes gh-43849
2025-01-21 12:09:46 +00: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
Johnny Lim 1e39af27d4 Fix Javadoc since for GsonProperties.Strictness
See gh-43877

Signed-off-by: Johnny Lim <izeye@naver.com>
2025-01-19 08:04:35 +01:00
Andy Wilkinson 86818b0e45 Ensure that junit-platform-launcher is on classpath
When testing with Gradle 7.6, junit-platform-launcher won't be
on the test runtime classpath unless it's declared as a dependency.
When testing with Gradle 8.x the dependency is added implicitly but
starting with Gradle 8.3 relying on this will result in a warning.

When junit-platform-launcher is absent, a failure occurs when testing
with Gradle as the class loader structure is such that JUnit tries
to load any test execution listeners, finds the listener declared in
spring-boot-actuator-autoconfigure but cannot then load the
implemented TestExecutionListener interface.

This problem is addressed by augmenting the component metadata for
spring-boot-starter-test to add a dependency on
junit-platform-launcher. This addresses the problem with
spring-boot-actuator-autoconfigure while also addressing a warning
with Gradle 8.3+.

Closes gh-43340
2025-01-17 16:01:41 +00:00
Stéphane Nicoll 9a05521c0f Upgrade to Spring Data Bom 2024.1.2
Closes gh-43749
2025-01-17 14:37:25 +01:00
Stéphane Nicoll 03dfc1ad22 Upgrade to Spring Data Bom 2024.0.8
Closes gh-43743
2025-01-17 14:37:12 +01:00
Stéphane Nicoll 55cb112120 Merge branch '3.3.x' into 3.4.x 2025-01-16 09:58:42 +01:00
Stéphane Nicoll 89ffe1a1fd Polish "Document 'base64:' prefix support"
Resolution of base64 encoded data to arbitrary resources has been
introduced in Spring Boot 3.4. This commit adapts the documentation to
restrict this support to SSL only.

This commit also polishes the phrasing a bit.

See gh-43809
2025-01-16 09:53:49 +01:00
Stéphane Nicoll 6601329eed Upgrade to Postgresql 42.7.5
Closes gh-43846
2025-01-15 20:38:42 +01:00
Stéphane Nicoll 8f45623fd4 Upgrade to Netty 4.1.117.Final
Closes gh-43845
2025-01-15 20:38:17 +01:00
Stéphane Nicoll d6bd9a52bf Upgrade to jOOQ 3.19.18
Closes gh-43844
2025-01-15 20:38:11 +01:00
Stéphane Nicoll d32943490f Upgrade to Couchbase Client 3.7.7
Closes gh-43843
2025-01-15 20:38:04 +01:00
Stéphane Nicoll 1b0a1d7261 Upgrade to Postgresql 42.7.5
Closes gh-43842
2025-01-15 20:35:04 +01:00
Stéphane Nicoll f307982014 Upgrade to Netty 4.1.117.Final
Closes gh-43841
2025-01-15 20:34:59 +01:00
Stéphane Nicoll 8755dbf008 Upgrade to jOOQ 3.19.18
Closes gh-43840
2025-01-15 20:34:49 +01:00
Stéphane Nicoll bb7abf886f Merge branch '3.3.x' into 3.4.x
Closes gh-43835
2025-01-15 17:37:04 +01:00
Stéphane Nicoll faf40f38cf Document 'base64:' prefix support
Closes gh-43809
2025-01-15 17:36:42 +01:00
Yanming Zhou 54c4716972 Improve ConditionalOnSingleCandidate's Javadoc
See gh-43826

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-15 13:41:03 +01:00
Andy Wilkinson 1de3b5624f Merge branch '3.3.x' into 3.4.x
Closes gh-43832
2025-01-15 12:15:19 +00:00
Andy Wilkinson 0f94530e15 Polish "Polish PropertiesRedisConnectionDetails"
See gh-43825
2025-01-15 12:00:18 +00:00
Yanming Zhou a18c2f8f7e Polish PropertiesRedisConnectionDetails
See gh-43825

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-01-15 11:55:48 +00:00
He Zean ab8d2ebc8a Make handling of ALLOW_EMPTY_PASSWORD consistent
See gh-43790

Signed-off-by: He Zean <realhezean@gmail.com>
2025-01-15 10:57:42 +00:00
Andy Wilkinson 1a99ade66c Merge branch '3.3.x' into 3.4.x
Closes gh-43823
2025-01-14 20:13:57 +00:00
Andy Wilkinson d4f497d90d Polish "Fix handling of env vars in Bitnami's Postgres image"
See gh-43783
2025-01-14 19:53:30 +00:00
He Zean c8f2fb0d94 Fix handling of env vars in Bitnami's Postgres image
See gh-43783

Signed-off-by: He Zean <realhezean@gmail.com>
2025-01-14 17:49:59 +00:00
Stéphane Nicoll f0188b8fdd Upgrade to Reactor Bom 2024.0.2
Closes gh-43747
2025-01-14 18:06:55 +01:00
Stéphane Nicoll b8f911a615 Upgrade to Micrometer Tracing 1.4.2
Closes gh-43746
2025-01-14 18:06:54 +01:00
Stéphane Nicoll 42ecda25cc Upgrade to Reactor Bom 2023.0.14
Closes gh-43742
2025-01-14 18:04:14 +01:00
Stéphane Nicoll 93bff0f396 Upgrade to Micrometer Tracing 1.3.8
Closes gh-43741
2025-01-14 18:04:14 +01:00
Andy Wilkinson d4c7013c8d Tolerate Gson 2.10 and earlier
Closes gh-43442
2025-01-14 17:00:25 +00:00
Stéphane Nicoll 01640806b2 Upgrade to Micrometer 1.13.10
Closes gh-43740
2025-01-13 14:09:01 +01:00
Stéphane Nicoll 0c0c105b64 Upgrade to jOOQ 3.19.17
Closes gh-43802
2025-01-13 14:09:01 +01:00
Stéphane Nicoll 4e44ed7dd9 Upgrade to Jersey 3.1.10
Closes gh-43800
2025-01-13 14:08:57 +01:00
Stéphane Nicoll 71fa030eda Upgrade to ActiveMQ 6.1.5
Closes gh-43799
2025-01-13 14:08:52 +01:00
Stéphane Nicoll fce428624d Upgrade to Micrometer 1.14.3
Closes gh-43745
2025-01-13 14:06:19 +01:00
Stéphane Nicoll 0abedb5e15 Upgrade to jOOQ 3.19.17
Closes gh-43794
2025-01-13 14:06:18 +01:00
Stéphane Nicoll 3b77d550a5 Upgrade to Jersey 3.1.10
Closes gh-43793
2025-01-13 14:06:14 +01:00
Stéphane Nicoll e3c36522f9 Upgrade to HttpCore5 5.3.2
Closes gh-43792
2025-01-13 14:06:10 +01:00
Stéphane Nicoll 4b496a6274 Upgrade to ActiveMQ 6.1.5
Closes gh-43791
2025-01-13 14:06:06 +01:00
Phillip Webb 8c3e8605c2 Merge branch '3.3.x' into 3.4.x 2025-01-11 10:25:57 -08:00
Phillip Webb b9efd591e5 Polish "Prevent redis pool to initialize in unit test"
See gh-43774
2025-01-11 10:25:46 -08:00
Stéphane Nicoll e061bb4777 Merge branch '3.3.x' into 3.4.x
Closes gh-43775
2025-01-11 12:53:03 +01:00
Stéphane Nicoll 7b04cddf1d Polish "Prevent redis pool to initialize in unit test"
See gh-43774
2025-01-11 12:51:21 +01:00
He Zean 911a9a14ea Prevent redis pool to initialize in unit test
See gh-43774

Signed-off-by: He Zean <realhezean@gmail.com>
2025-01-11 12:50:46 +01:00
Stéphane Nicoll aa6daffba4 Start building against Spring Pulsar 1.2.2 snapshots
See gh-43752
2025-01-09 11:04:45 +01:00
Stéphane Nicoll 942ac966d1 Start building against Spring Kafka 3.3.2 snapshots
See gh-43751
2025-01-09 11:04:41 +01:00
Stéphane Nicoll 0e1cd29b5e Start building against Spring Data Bom 2024.1.2 snapshots
See gh-43749
2025-01-09 11:04:32 +01:00
Stéphane Nicoll 5ee1248c4c Start building against Spring AMQP 3.2.2 snapshots
See gh-43748
2025-01-09 11:04:28 +01:00
Stéphane Nicoll ca92989fd9 Start building against Reactor Bom 2024.0.2 snapshots
See gh-43747
2025-01-09 11:04:24 +01:00
Stéphane Nicoll c5547bf7ad Start building against Micrometer Tracing 1.4.2 snapshots
See gh-43746
2025-01-09 11:04:20 +01:00
Stéphane Nicoll 4ec7c4c696 Start building against Micrometer 1.14.3 snapshots
See gh-43745
2025-01-09 11:04:16 +01:00
Stéphane Nicoll 15b63faec5 Start building against Spring Pulsar 1.1.8 snapshots
See gh-43744
2025-01-09 10:57:34 +01:00
Stéphane Nicoll 8c49a199aa Start building against Spring Data Bom 2024.0.8 snapshots
See gh-43743
2025-01-09 10:57:30 +01:00
Stéphane Nicoll 27f00e2689 Start building against Reactor Bom 2023.0.14 snapshots
See gh-43742
2025-01-09 10:57:26 +01:00
Stéphane Nicoll 48b7724f3a Start building against Micrometer Tracing 1.3.8 snapshots
See gh-43741
2025-01-09 10:57:22 +01:00
Stéphane Nicoll db94388e63 Start building against Micrometer 1.13.10 snapshots
See gh-43740
2025-01-09 10:57:18 +01:00
Phillip Webb d44f4b56d3 Merge branch '3.3.x' into 3.4.x 2025-01-08 15:45:54 -08:00
Phillip Webb c2d8218f6d Update copyright year of changed files 2025-01-08 15:45:34 -08:00
Stéphane Nicoll 474c93f2e1 Merge branch '3.3.x' into 3.4.x
Closes gh-43732
2025-01-08 11:17:38 +01:00
Stéphane Nicoll 5b8ee86091 Add missing reference to C3P0
Closes gh-43724
2025-01-08 11:12:42 +01:00
Andy Wilkinson ca3fbb26a2 Mention system libraries as a reason not to use tiny builder
Closes gh-43716
2025-01-08 10:07:05 +00:00
Andy Wilkinson e1e84874eb Merge branch '3.3.x' into 3.4.x
Closes gh-43729
2025-01-08 09:54:06 +00:00
Andy Wilkinson 7754b2e450 Refer to OTLP instead of OpenTelemetry
Closes gh-43727
2025-01-08 09:53:15 +00:00
Andy Wilkinson f3c70a7af4 Consistently document the minimum supported versions of Gradle
Closes gh-43725
2025-01-08 09:09:36 +00:00
Stéphane Nicoll 3a340b1785 Upgrade to SQLite JDBC 3.47.2.0
Closes gh-43723
2025-01-08 09:14:24 +01:00
Stéphane Nicoll dea6b9ed2c Upgrade to R2DBC MySQL 1.3.1
Closes gh-43722
2025-01-08 09:14:20 +01:00
Stéphane Nicoll 216a98700d Upgrade to FreeMarker 2.3.34
Closes gh-43721
2025-01-08 09:14:16 +01:00
Stéphane Nicoll 91c0e23c64 Upgrade to FreeMarker 2.3.34
Closes gh-43719
2025-01-08 09:10:33 +01:00
Phillip Webb d998720f75 Merge branch '3.3.x' into 3.4.x
Closes gh-43717
2025-01-07 19:22:22 -08:00
Phillip Webb 962514601f Restore support for docker compose versions earlier than 2.24
Fixes gh-43710
2025-01-07 19:13:58 -08:00
Stéphane Nicoll b631b0657d Merge branch '3.3.x' into 3.4.x
Closes gh-43715
2025-01-07 17:00:29 +01:00
Stéphane Nicoll 9dea1e1736 Upgrade to Logback 1.5.16
Closes gh-43568
2025-01-07 16:54:09 +01:00
Andy Wilkinson b2a271ca9e Merge branch '3.3.x' into 3.4.x
Closes gh-43713
2025-01-07 14:46:37 +00:00
Andy Wilkinson c7ef3e3e3c Simplify test for Throwable from LoggingSystem initialization
Closes gh-43709
2025-01-07 14:44:28 +00:00
Stéphane Nicoll 8502c80edb Merge branch '3.3.x' into 3.4.x 2025-01-07 10:30:15 +01:00
Stéphane Nicoll 6290b7545b Make skipSslValidation() test more robust
This commit updates the assertion of a test that relies on
https://self-signed.badssl.com to only fail if a SSLException is thrown.

This is a temporary measure until we run the test against a local
instance we control.

See gh-43708
2025-01-07 10:29:46 +01:00
Dmytro Nosan b6b9237f2c Reset StatusLogger fallback listener stream on initialization
Update `Log4J2LoggingSystem` so that the `StatusLogger` fallback
listener has its print stream reset on each initialization. This
allows output capture to work with the status listener.

Fixes gh-43578

Co-authored-by: Phillip Webb <phil.webb@broadcom.com>
2025-01-06 17:58:21 -08:00
Stéphane Nicoll 383f1964e6 Merge branch '3.3.x'
Closes gh-43662
2025-01-05 08:03:56 +01:00
Tran Ngoc Nhan 290ea77374 Fix jakarta messaging javadoc
See gh-43661
2025-01-05 08:03:20 +01:00
Andy Wilkinson 51d15c7c78 Merge branch '3.3.x'
Closes gh-43649 in 3.4.x
Closes gh-43651
2025-01-02 12:22:59 +00:00
Andy Wilkinson d8a9ebd14b Upgrade to Gradle 8.12
Closes gh-43649
2025-01-02 12:05:14 +00:00
Andy Wilkinson 734040abe2 Update Gradle test scripts to avoid warnings with 8.12
Closes gh-43496
2025-01-02 12:05:14 +00:00
Stéphane Nicoll c1a7331308 Upgrade to Lettuce 6.4.2.RELEASE
Closes gh-43609
2024-12-30 12:40:24 +01:00