Stéphane Nicoll
3ea9c56ea0
Merge branch '3.4.x'
...
Closes gh-44685
2025-03-12 08:59:27 +01:00
Stéphane Nicoll
322191f288
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44684
2025-03-12 08:58:58 +01:00
Johnny Lim
3a5e059387
Polish
...
See gh-44447
Signed-off-by: Johnny Lim <izeye@naver.com>
2025-03-12 08:49:26 +01:00
Andy Wilkinson
b6bccc1378
Support DataSource auto-configuration without spring-jdbc
...
Prior to these changes, auto-configured a DataSource required
spring-jdbc to be on the classpath even if the app made no use of any
of its features.
The changes largely remove the use of spring-jdbc during DataSoruce
auto-configure or disable some support (configuring an unpooled,
embedded database) in its absense. The extra unwrapping in
DataSourceBuilder has been removed as it appears to be redundant.
The existing test for deriving from an embedded database continues
to work without it.
Closes gh-43786
2025-03-10 17:54:34 +00:00
Stéphane Nicoll
0e09a2d25f
Polish "Add additional configuration properties for JdbcTemplate"
...
See gh-44470
2025-03-07 10:33:59 +01:00
Yanming Zhou
baa89c5ce8
Add additional configuration properties for JdbcTemplate.
...
This commit adds configuration properties for additional settings of
the auto-configured JdbcTemplate:
* ignore-warnings
* skip-results-processing
* skip-undeclared-results
* results-map-case-insensitive
See gh-44470
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-03-07 10:33:59 +01:00
Stéphane Nicoll
0a84ebf9f1
Merge branch '3.4.x'
...
Closes gh-44626
2025-03-06 15:34:11 +01:00
Stéphane Nicoll
e06244d007
Adapt EntityManagerFactoryBuilder to work with multiple data sources
...
This commit allows EntityManagerFactoryBuilder to provide the JPA
properties to use according to the DataSource used to build the
EntityManagerFactory. Previously the JPA properties were computed only
once based on the primary data source, which was a problem since its
default DDL setting may be different.
EntityManagerFactoryBuilder takes a function that provides the JPA
properties based on a data source, rather than the properties
themselves. Constructors with the previous variant have been deprecated
as a result.
Closes gh-44516
2025-03-06 15:33:53 +01:00
Andy Wilkinson
3fff2c8072
Merge branch '3.4.x'
2025-03-06 13:25:33 +00:00
Andy Wilkinson
d097870de5
Update CouchbaseAutoConfigurationsTests to use own resources
...
See gh-44576
2025-03-06 13:24:39 +00:00
Andy Wilkinson
00b2fe7d95
Merge branch '3.4.x'
2025-03-06 11:22:52 +00:00
Andy Wilkinson
272c905510
Merge branch '3.3.x' into 3.4.x
2025-03-06 11:22:39 +00:00
Andy Wilkinson
c849cafc1b
Further improve independence of core auto-configuration tests
...
See gh-44513
2025-03-06 11:12:49 +00:00
Stéphane Nicoll
af8defde54
Merge branch '3.4.x'
...
Closes gh-44586
2025-03-06 08:56:52 +01:00
Stéphane Nicoll
6fb44d83b4
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44585
2025-03-06 08:56:39 +01:00
Stéphane Nicoll
6cf81e2f1b
Deprecate setObservationRegistry
...
This commit deprecates setObservationRegistry on
DefaultJmsListenerContainerFactoryConfigurer as it should not have been
made public in the first place. We want to make sure users don't
accidentally use it, and move it back to a package private method once
the deprecation period has run its course.
Closes gh-44466
2025-03-06 08:56:12 +01:00
Andy Wilkinson
2f73406dff
Merge branch '3.4.x'
2025-03-05 20:08:09 +00:00
Andy Wilkinson
e7bc267ef8
Merge branch '3.3.x' into 3.4.x
2025-03-05 20:08:02 +00:00
Andy Wilkinson
60624e8a56
Avoid problems with platform-specific line endings
...
See gh-44512
2025-03-05 20:07:43 +00:00
Andy Wilkinson
46b4d45983
Merge branch '3.4.x'
...
Closes gh-44580
2025-03-05 18:06:23 +00:00
Andy Wilkinson
dafcef3d7a
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44579
2025-03-05 17:22:27 +00:00
Andy Wilkinson
55c410abec
Improve autoconfigure's use of test resources
...
Closes gh-44512
2025-03-05 16:40:26 +00:00
Andy Wilkinson
921b704963
Merge branch '3.4.x'
2025-03-05 14:51:57 +00:00
Andy Wilkinson
4043286f59
Merge branch '3.3.x' into 3.4.x
2025-03-05 14:51:50 +00:00
Andy Wilkinson
8e49a4e49a
Increase independence of core auto-configuration tests
...
Remove some more references to Thymeleaf and FreeMarker
auto-configuration that were missed in 85ffbbc
.
See gh-44513
2025-03-05 14:49:58 +00:00
Andy Wilkinson
8cf5584257
Merge branch '3.4.x'
...
Closes gh-44577
2025-03-05 14:35:06 +00:00
Andy Wilkinson
0fb1d2bed7
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44576
2025-03-05 14:34:50 +00:00
Andy Wilkinson
85ffbbc384
Make core auto-configuration tests more independent
...
Closes gh-44513
2025-03-05 14:33:57 +00:00
Andy Wilkinson
a3093a50cb
Merge branch '3.4.x'
...
Closes gh-44531
2025-03-04 18:03:17 +00:00
Andy Wilkinson
d92551f15a
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44530
2025-03-04 18:03:07 +00:00
Andy Wilkinson
dc41feff1f
Merge branch '3.4.x'
...
Closes gh-44529
2025-03-04 18:02:54 +00:00
Andy Wilkinson
3715eb8df2
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44528
2025-03-04 18:02:23 +00:00
Andy Wilkinson
27779bec0a
Remove AutoConfigurationReproTests
...
Removed in favor of WebServerFactoryCustomizerBeanPostProcessorTests
which, through the expectations that it sets up on the mock bean
factory, already checks that early initialization will not be
triggered.
Closes gh-44511
2025-03-04 17:50:19 +00:00
Andy Wilkinson
c9f3688df9
Remove redundant tests
...
Closes gh-44520
2025-03-04 17:45:23 +00:00
Brian Clozel
83f678a8b1
Separate transports in GraphQL auto-configurations
...
This commit revisits the existing GraphQL configuration properties to
better reflect which ones belong to specific transports.
This also relaxes the Web auto-configurations to only require the
`ExecutionGraphQlService` as a bean. The `GraphQlSource` is now an
optional bean dependency.
Closes gh-44495
2025-02-28 18:12:31 +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
Moritz Halbritter
c91c8e202a
Fix tests
2025-02-28 10:53:54 +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
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
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
Stéphane Nicoll
ed5ec225a7
Merge branch '3.4.x'
...
Closes gh-44417
2025-02-24 08:04:36 +01:00
Stéphane Nicoll
f235d7e9ff
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44416
2025-02-24 08:01:46 +01:00
Stéphane Nicoll
bf1dc09c86
Update copyright of changed files
...
See gh-44323
2025-02-24 07:52:35 +01:00
Johnny Lim
332ad7bb70
Polish
...
See gh-44323
Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-24 07:46:25 +01:00
Stéphane Nicoll
be0e6722b8
Merge branch '3.4.x'
...
Closes gh-44406
2025-02-22 18:48:39 +01:00
Stéphane Nicoll
56bd551ce9
Update copyright year of changed file
...
See gh-44393
2025-02-22 18:43:30 +01:00
Johnny Lim
133ecab3cf
Replace unconventional Optional usages
...
See gh-44393
Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-22 18:40:47 +01:00
Stéphane Nicoll
7ac438547f
Merge branch '3.4.x'
...
Closes gh-44405
2025-02-22 18:38:18 +01:00
Stéphane Nicoll
f7b23f548d
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44404
2025-02-22 18:38:10 +01:00
Stéphane Nicoll
7fd19556b2
Polish contribution
...
See gh-44384
2025-02-22 18:33:05 +01:00
Dmytro Nosan
2f288bf614
Clarify which Mongo properties are ignored when URI property is set
...
See gh-44384
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-22 18:28:42 +01:00
Moritz Halbritter
53405a48c2
Add property to configure Spring Kafka's authExceptionRetryInterval
...
Closes gh-44199
2025-02-19 09:14:57 +01:00
Phillip Webb
651a39b3f6
Merge branch '3.4.x'
2025-02-18 15:12:07 -08:00
Stéphane Nicoll
5c49a76c82
Merge branch '3.4.x'
...
Closes gh-44322
2025-02-18 11:18:45 +01:00
Stéphane Nicoll
ceaf88c1a4
Polish "Include non-default DataSource candidates"
...
See gh-44293
2025-02-18 11:18:26 +01:00
Yanming Zhou
8d27f4ee7c
Include non-default DataSource candidates
...
This commit updates H2ConsoleAutoConfiguration to consider non-default
data sources when logging connection URLs.
See gh-44293
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
2025-02-18 11:18:26 +01:00
Moritz Halbritter
dae891f473
Add SSL service connection support for Kafka
...
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter
789d30deab
Add SSL service connection support for ElasticSearch
...
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter
7cf9cc74a2
Add SSL service connection support for Redis
...
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter
109fd6f97d
Add SSL service connection support for MongoDB
...
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter
0ccf1b81d8
Add SSL service connection support for Couchbase
...
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter
9c520d6af7
Add SSL service connection support for Cassandra
...
See gh-41137
2025-02-17 13:23:16 +01:00
Moritz Halbritter
e26ccbe028
Add SSL service connection support for AMQP
...
See gh-41137
2025-02-17 13:23:15 +01:00
Stéphane Nicoll
631d07cfe1
Merge branch '3.4.x'
...
Closes gh-44308
2025-02-17 13:10:17 +01:00
Stéphane Nicoll
4d21f1e8b1
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44307
2025-02-17 13:10:10 +01:00
Dmytro Nosan
35a77e2cf1
Fix build
...
See gh-44306
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-17 13:09:52 +01:00
Stéphane Nicoll
3ed0e021ac
Polish "Auto-configure ObjectDirectoryMapper"
...
See gh-44290
2025-02-17 12:02:39 +01:00
Dmytro Nosan
8435aeb0e2
Auto-configure ObjectDirectoryMapper
...
This commit improves LdapAutoConfiguration to also auto-configure an
ObjectDirectoryMapper and configure LdapTemplate to use it.
See gh-44290
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-17 12:02:39 +01:00
Andy Wilkinson
ca1bd3f633
Merge branch '3.4.x'
...
Closes gh-44304
2025-02-17 11:01:43 +00:00
Andy Wilkinson
9fa40adb45
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44303
2025-02-17 11:01:31 +00:00
Andy Wilkinson
045fbee395
Document need for $ separator when auto-config is nested
...
Closes gh-44298
2025-02-17 11:00:29 +00:00
Stéphane Nicoll
2adbc24be1
Polish
2025-02-17 11:49:59 +01:00
Stéphane Nicoll
514666b210
Polish
2025-02-17 11:33:15 +01:00
Stéphane Nicoll
980202f654
Merge branch '3.4.x'
...
Closes gh-44300
2025-02-17 11:22:14 +01:00
Tran Ngoc Nhan
d212232d9d
Implement RuntimeHintsRegistrar
...
CLoses gh-44299
2025-02-17 11:21:04 +01:00
Tran Ngoc Nhan
e982136f5e
Implement RuntimeHintsRegistrar
...
See gh-44266
2025-02-17 11:09:29 +01:00
Stéphane Nicoll
4ef74747ef
Merge branch '3.4.x'
...
Closes gh-44297
2025-02-17 11:07:05 +01:00
Stéphane Nicoll
e67c8b43a2
Merge branch '3.3.x' into 3.4.x
...
Closes gh-44296
2025-02-17 11:06:58 +01:00
Stéphane Nicoll
6aa0055e5e
Polish "Do not auto-configure ViewResolver if spring-webmvc is absent"
...
See gh-44259
2025-02-17 11:01:23 +01:00
Dmytro Nosan
ac73766f9b
Do not auto-configure ViewResolver if spring-webmvc is absent
...
See gh-44259
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-17 11:01:07 +01:00
Stéphane Nicoll
8d713fb6c7
Polish "Auto-configure CqlTemplate and ReactiveCqlTemplate"
...
See gh-44291
2025-02-17 09:20:03 +01:00
Dmytro Nosan
e8661f6bee
Auto-configure CqlTemplate and ReactiveCqlTemplate
...
See gh-44291
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-17 09:14:06 +01:00
Andy Wilkinson
cefcdcfdd0
Polish RequestMatcherProvider deprecation javadoc
...
See gh-gh-29596
2025-02-14 07:44:47 +00:00
Andy Wilkinson
24ead90e13
Merge branch '3.4.x'
...
Closes gh-44216
2025-02-11 12:31:19 +00: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
3137f20b4a
Merge branch '3.4.x'
...
Closes gh-44194
2025-02-10 11:09:38 +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
Johnny Lim
8c35bce668
Polish
...
See gh-44184
Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-10 07:32:14 +01:00
Andy Wilkinson
822e7de3eb
Start building against Spring Data Bom 2025.0.0-M1 snapshots
...
See gh-44159
2025-02-07 21:01:57 +00:00
Johnny Lim
c335f772d0
Polish
...
See gh-44148
Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-07 09:21:19 +01:00
Phillip Webb
9576293a03
Polish 'Add ability to match Endpoint requests by HTTP method'
...
See gh-29596
2025-02-04 21:57:40 -08:00
onobc
996ee243a3
Add ability to match Endpoint requests by HTTP method
...
Update both servlet and reactive `EndpointRequest` classes with
support for matching endpoint requests by HTTP method.
See gh-29596
2025-02-04 21:56:14 -08:00
Stéphane Nicoll
e5b03862d3
Polish "Add property to configure Spring MVC default content types"
...
See gh-44040
2025-02-04 12:40:23 +01:00
Dmytro Nosan
d27fd31a3d
Add property to configure Spring MVC default content types
...
This commit adds a configuration property to configure the default
content types with Spring MVC.
See gh-44040
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-02-04 12:40:23 +01:00
Johnny Lim
c9320de559
Use consistent exception messages in Assert calls
...
See gh-44044
Signed-off-by: Johnny Lim <izeye@naver.com>
2025-02-03 13:58:59 +01:00
Johnny Lim
a39e1c4a09
Polish
...
Signed-off-by: Johnny Lim <izeye@naver.com>
See gh-44034
2025-01-31 17:04:58 +01:00
Stéphane Nicoll
a33b700b12
Merge branch '3.4.x'
2025-01-31 17:04:48 +01:00
Stéphane Nicoll
dc9aa6d168
Polish
...
See gh-44034
2025-01-31 17:04:33 +01:00
Moritz Halbritter
8536520e5e
Ignore unbindable datasource datasource properties
...
Closes gh-43988
2025-01-31 10:45:20 +01:00
Phillip Webb
921c362b97
Add 'spring.r2dbc.pool.acquire-retry' property
...
Add a new property to configure the pool acquire retry value.
Closes gh-44017
2025-01-29 11:48:32 -08: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
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
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
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
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
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
Andy Wilkinson
1e43b0003f
Merge branch '3.4.x'
...
Closes gh-43951
2025-01-24 08:54:50 +00: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
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
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
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
0f5eb465c9
Upgrade to Liquibase 4.31.0
...
Closes gh-43896
2025-01-21 13:34:47 +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
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
af29ff56a8
Merge branch '3.4.x'
...
Closes gh-43878
2025-01-19 08:05:02 +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
Moritz Halbritter
3beec788f9
Adapt to Spring Security deprecations
2025-01-17 08:47:14 +01:00
Brian Clozel
6957557fd7
Configure additional GraphQL schema files
...
Prior to this commit, the GraphQL auto-configuration would provide
configuration properties for specifying the locations and file
extensions of schema files to be scanned during startup.
This commit adds a new "spring.graphql.schema.additional-files" that
applications can use to point at particular files, like
"classpath:mylocation/schema.graphqls". These files will be parsed and
considered for the schema in addition to the scanned ones.
Closes gh-42792
2025-01-16 18:15:51 +01:00
Stéphane Nicoll
7d6f81b527
Fix build failure
2025-01-15 20:44:27 +01:00
Vedran Pavic
2bf413c9a9
Add support for AWS Advanced JDBC Wrapper
...
This commit adds an entry for the AWS Advanced JDBC Wrapper to the
DatabaseDriver enum. This allows the driver class name to be
auto-detected from jdbc:aws-wrapper:… URLs.
See gh-43812
Signed-off-by: Vedran Pavic <vedran@vedranpavic.com>
2025-01-15 19:06:57 +00:00
Moritz Halbritter
0cd843cea2
Merge branch '3.4.x'
...
Closes gh-43834
2025-01-15 13:56:02 +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
b75006b88e
Merge branch '3.4.x'
...
Closes gh-43833
2025-01-15 12:15:34 +00: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
Andy Wilkinson
3aa0eb1b21
Merge branch '3.4.x'
...
Closes gh-43818
2025-01-14 17:01:16 +00:00
Andy Wilkinson
d4c7013c8d
Tolerate Gson 2.10 and earlier
...
Closes gh-43442
2025-01-14 17:00:25 +00:00
Andy Wilkinson
2f29a49a1d
Remove APIs deprecated for removal in 3.5
...
Closes gh-43788
2025-01-14 13:59:24 +00:00
Phillip Webb
f8a1a6e6a1
Polish "Deprecate ConditionOutcome.inverse()"
...
See gh-43739
2025-01-13 14:46:58 -08:00
Yanming Zhou
d85a93b60b
Deprecate ConditionOutcome.inverse()
...
Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
See gh-43739
2025-01-13 14:45:13 -08:00
Phillip Webb
4812328be2
Polish OnPropertyCondition
...
See gh-43754
2025-01-13 14:25:42 -08:00
Dmytro Nosan
9c146c0a40
Polish OnPropertyCondition
...
Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
See gh-43754
2025-01-13 14:09:10 -08:00
Phillip Webb
a49719d73e
Use consistent exception messages in Assert calls
...
Update `Assert` calls to consistently use messages of the form
"'item' must [not] ...".
Closes gh-43780
2025-01-11 21:18:47 -08:00
Phillip Webb
f08188d5cf
Change relevant Assert calls to throw IllegalStateException
...
Change certain Assert class from `assert...` to `assertState`
so that a more appropriate `IllegalStateException` is thrown.
Fixes gh-43779
2025-01-11 21:16:36 -08:00
Phillip Webb
29baaf32e6
Merge branch '3.4.x'
2025-01-11 10:26:06 -08: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
46a499bf1f
Make RuntimeHints predicates more explicit
...
This commit narrows method invocation wherever applicable as the default
is 'introspect' only.
2025-01-11 18:17:10 +01:00
Stéphane Nicoll
ae83f7e229
Merge branch '3.4.x'
...
Closes gh-43776
2025-01-11 12:54:38 +01: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
Phillip Webb
b48ce96746
Update copyright year of changed files
2025-01-08 15:46:10 -08:00
Phillip Webb
52b9b8e711
Fix tests failing due to missing 'spring.jmx.enabled=true'
...
See gh-43706
2025-01-08 15:44:35 -08:00
Phillip Webb
bd3663748b
Restore matchIfMissing attribute
...
Restore accidentally deleted `matchIfMissing` attribute.
See gh-43704
2025-01-08 15:00:45 -08:00
Phillip Webb
b448d5e0a7
Don't create unessary JMX beans
...
Align "spring.jmx.enabled" conditions by removing
`matchIfMissing = true`.
Closes gh-43706
2025-01-08 13:45:01 -08:00
Phillip Webb
7e194a0af6
Fix checkstyle issue
2025-01-08 13:44:46 -08:00
Phillip Webb
86b6171edc
Introduce dedicated annotations to deal with boolean properties
...
Add `@ConditionalOnBooleanProperty` annotation to deal with
boolean properties and primarily for features that users toggle
using `.enabled` properties.
Closes gh-43704
2025-01-08 13:26:11 -08:00
Phillip Webb
e4bcda258a
Polish "Add spring.data.redis.lettuce.read-from property"
...
See gh-42588
Co-authored-by: Stephane Nicoll <stephane.nicoll@broadcom.com>
2025-01-07 16:49:42 +01:00
Dmytro Nosan
fd115980e7
Add spring.data.redis.lettuce.read-from property
...
See gh-42588
2025-01-07 16:35:39 +01:00
Yanming Zhou
0d3e0245a2
Add support for configuring Tomcat connector's max parameter count
...
See gh-43286
2025-01-07 14:35:31 +01:00
Yanming Zhou
1ecf1f3c74
Remove unnecessary creation of DataSourceProperties
...
This commit removes the creation of DataSourceProperties in
DataSourceTransactionManagerAutoConfiguration as the latter does not
use the former.
See gh-43603
2025-01-07 12:38:24 +01:00
Dmytro Nosan
86ef089d16
Use SQLExceptionTranslator bean if defined
...
This commit improves the auto-configuration of JdbcTemplate and
HibernateJpaDialect so that an SQLExceptionTranslator bean is used if
it is available.
See gh-43511
2025-01-07 12:25:23 +01:00
Stéphane Nicoll
ced7c1617c
Polish "Add TaskDecorator support for scheduled tasks"
...
See gh-43190
2025-01-07 12:15:46 +01:00
Dmytro Nosan
f0c5312141
Add TaskDecorator support for scheduled tasks
...
See gh-43190
2025-01-07 12:15:45 +01:00
Stéphane Nicoll
e6af48fc20
Polish "Retain existing modules in JacksonAutoConfiguration"
...
See gh-42836
2025-01-07 11:58:47 +01:00
Dmytro Nosan
993fbb3a0d
Retain existing modules in JacksonAutoConfiguration
...
Previously, the default Jackson2ObjectMapperBuilderCustomizer
implementation did set the list of modules to use. This had the effect
of removing any modules that were registered programmatically by a
customizer with higher precedence.
This commit uses the variant of modulesToInstall that retain any
existing modules. It also adds a note in the documentation as this
behavior can be easily missed.
See gh-42836
2025-01-07 11:56:20 +01:00
Phillip Webb
170ff4eb23
Update copyright year of changed files
2025-01-06 17:40:24 -08:00
Phillip Webb
4c307d6fda
Switch away from using @ConditionalOnProperty prefix
...
Merge `prefix` into `name` attribute and simplify annotations
where possible.
Closes gh-43703
2025-01-06 14:37:18 -08:00
Stéphane Nicoll
97f9589404
Merge branch '3.3.x'
...
Closes gh-43604
2024-12-24 10:29:21 +01:00
Stéphane Nicoll
916705538e
Polish "Add support for symlinks in FileWatcher"
...
See gh-43586
2024-12-24 10:22:52 +01:00
Tomasz Maciejewski
26ca3790b2
Add support for symlinks in FileWatcher
...
This commit allows using symlinks for SSL certificate hot reloading.
See gh-43586
2024-12-24 09:59:59 +01:00
Johnny Lim
81f67b13e6
Remove unused ScopedFooConfiguration in ConditionalOnMissingBeanTests
...
See gh-43592
2024-12-23 15:49:16 +01:00
Phillip Webb
ef431609ab
Merge branch '3.3.x'
...
Closes gh-43563
2024-12-18 10:44:28 -08:00
Phillip Webb
ba916cb66e
Allow KafkaProperties to build properties with empty bundle name
...
Update `KafkaProperties` so that properties can still be built when
the bundle name has no text.
Fixes gh-43561
2024-12-18 10:44:18 -08:00
Phillip Webb
4d6fc85c8e
Merge branch '3.3.x'
2024-12-13 19:03:48 -08:00
Phillip Webb
45da43c6b4
Update copyright year of changed files
2024-12-13 19:03:43 -08:00
Johnny Lim
4d15ee5bf0
Polish
...
See gh-43498
2024-12-13 13:29:20 -08:00
Moritz Halbritter
8c20e6c1e9
Merge branch '3.3.x'
...
Closes gh-43497
2024-12-13 14:17:47 +01:00
Dmytro Nosan
1234409fbe
Multiple WebFlux ResourceHandlerRegistrationCustomizer should be invoked
...
Before this commit, only a single ResourceHandlerRegistrationCustomizer
was invoked. This commit adds functionality to have more
than one ResourceHandlerRegistrationCustomizers
See gh-43494
2024-12-13 14:00:47 +01:00
Moritz Halbritter
61bab92231
Merge branch '3.3.x'
...
Closes gh-43484
2024-12-11 14:25:44 +01:00
Yanming Zhou
a964bbd8cb
Polish variable name for consistency
...
See gh-43483
2024-12-11 14:25:19 +01:00
Phillip Webb
565ec07046
Merge branch '3.3.x'
...
Closes gh-43448
2024-12-09 09:46:47 -08:00
Phillip Webb
3338c22372
Restore `build...` methods that don't need an SSL bundle
...
Restore `buildConsumerProperties()` and `buildProducerProperties()`
methods in `KafkaProperties` to make it more convenient to use them
without an SSL bundle.
Fixes gh-43300
2024-12-09 09:43:13 -08:00
Phillip Webb
86b0c768e7
Fix annotation matching when using scoped proxies
...
Update `OnBeanCondition` to check `isAutowireCandidate` on the original
bean of scoped proxy targets.
Fixes gh-43423
2024-12-05 18:05:23 -08:00
Phillip Webb
916efb632c
Merge branch '3.3.x'
2024-12-04 15:04:22 -08:00
Phillip Webb
9e7972a9b4
Polish code with code cleanup rules
2024-12-04 15:03:40 -08:00
Phillip Webb
3ddfd62f16
Prefer file resolution when loading SSL content
...
Update `SslAutoConfiguration` so that the used resource loader prefers
file based resolution when paths are specified without a prefix. This
restores the behavior found in Spring Boot 3.3.
The `ApplicationResourceLoader` has been updated with a new `get` method
that accepts a `preferFileResolution` parameter. Unfortunately, we can't
directly influence the resource returned by the delegate
`ResourceLoader` since we can't override `getResourceByPath(...)`.
Instead we check if the returned type was likely to have been created
by a call to that method. If so, we change it to a `FileSystemResource`.
This approach should hopefully work with `DefaultResourceLoader` and
subclasses.
Fixes gh-43274
2024-12-03 15:00:15 -08:00