Commit Graph

5243 Commits

Author SHA1 Message Date
Andy Wilkinson 19c386040b Merge branch '3.4.x'
Closes gh-44698
2025-03-12 15:49:41 +00:00
Andy Wilkinson 59ddba1063 Merge branch '3.3.x' into 3.4.x
Closes gh-44697
2025-03-12 15:48:36 +00:00
Andy Wilkinson 9b15b4bce9 Consolidate mock web server factories
Closes gh-44674
2025-03-12 15:26:47 +00:00
Andy Wilkinson b61578d183 Merge branch '3.4.x'
Closes gh-44695
2025-03-12 12:54:27 +00:00
Andy Wilkinson 08b358e829 Merge branch '3.3.x' into 3.4.x
Closes gh-44694
2025-03-12 12:50:18 +00:00
Andy Wilkinson 3a6e4e9e58 Add checks for factories files
META-INF/spring.factories and META-INF/spring/aot.factories in the
main source set are now checked. The checks verify that:

- Each class listed in the values exists in the source set's output
- The classes are listed alphabetically
- Nested classes are identified using their binary name

Closes gh-44676
2025-03-12 12:44:18 +00:00
Andy Wilkinson 6f04cf032b Adapt test to change in Neo4j driver's internals
See gh-44690
2025-03-12 12:02:28 +00:00
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