5230 Commits

Author SHA1 Message Date
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