Commit Graph

54053 Commits

Author SHA1 Message Date
Andy Wilkinson ab66034e1b Merge branch '3.3.x' into 3.4.x
Closes gh-44634
2025-03-06 18:34:54 +00:00
Andy Wilkinson 67b0a26474 Improve structure of test resources in Actuator modules
Closes gh-44632
2025-03-06 18:31:35 +00:00
Moritz Halbritter 2e74ce8bf2 Merge branch '3.3.x' into 3.4.x
Closes gh-44630
2025-03-06 17:39:26 +01:00
Moritz Halbritter a807a07a59 Always try to deserialize message in case of Docker transport errors
Before this commit, if the status code was 4xx or 500, we tried to read the errors
object, consuming the http entity. When we tried to deserialize the message,
the http entity was already consumed, an IOException has been thrown and null
is returned for the message.

Now, we read the content in a byte[] and deserialize the errors and the message
from that. This ensures that we can read both the errors and the message.

Closes gh-44628
2025-03-06 17:27:00 +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 d097870de5 Update CouchbaseAutoConfigurationsTests to use own resources
See gh-44576
2025-03-06 13:24:39 +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 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 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 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 1eef4385ec Merge branch '3.3.x' into 3.4.x 2025-03-05 15:43:00 +00:00
Andy Wilkinson 1f5b9de302 Normalize the separator in resource names
See gh-44444
2025-03-05 15:42:41 +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 0fb1d2bed7 Merge branch '3.3.x' into 3.4.x
Closes gh-44576
2025-03-05 14:34:50 +00:00
Andy Wilkinson bfd4e7b4ee Merge branch '3.3.x' into 3.4.x 2025-03-05 14:34:11 +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 5683d39fd6 Allow resources to hide existing resources with the same name
See gh-44444
2025-03-05 14:33:57 +00:00
Stéphane Nicoll a8d7f54118 Merge branch '3.3.x' into 3.4.x 2025-03-05 15:32:09 +01:00
Stéphane Nicoll 7912a03536 Upgrade to Neo4j Java Driver 5.28.2
Closes gh-44574
2025-03-05 15:17:38 +01:00
Stéphane Nicoll b077329bb4 Start building against Spring WS 4.0.12 snapshots
See gh-44573
2025-03-05 15:12:43 +01:00
Stéphane Nicoll 4e4f2ea9a3 Start building against Spring Security 6.4.4 snapshots
See gh-44572
2025-03-05 15:12:39 +01:00
Stéphane Nicoll ceffb0e24e Start building against Spring Pulsar 1.2.4 snapshots
See gh-44571
2025-03-05 15:12:35 +01:00
Stéphane Nicoll 3361f91d6b Start building against Spring Kafka 3.3.4 snapshots
See gh-44570
2025-03-05 15:12:31 +01:00
Stéphane Nicoll 3b1d3ee412 Start building against Spring Data Bom 2024.1.4 snapshots
See gh-44569
2025-03-05 15:12:27 +01:00
Stéphane Nicoll 18ec4ff1f4 Start building against Spring Batch 5.2.2 snapshots
See gh-44568
2025-03-05 15:12:23 +01:00
Stéphane Nicoll a205981299 Start building against Reactor Bom 2024.0.4 snapshots
See gh-44567
2025-03-05 15:12:19 +01:00
Stéphane Nicoll dc6822e7dd Start building against Micrometer Tracing 1.4.4 snapshots
See gh-44566
2025-03-05 15:12:15 +01:00
Stéphane Nicoll 6514ce0815 Start building against Micrometer 1.14.5 snapshots
See gh-44565
2025-03-05 15:12:11 +01:00
Stéphane Nicoll d5d27462ab Start building against Spring WS 4.0.12 snapshots
See gh-44564
2025-03-05 14:53:18 +01:00
Stéphane Nicoll a0f3850a7f Start building against Spring Security 6.3.8 snapshots
See gh-44563
2025-03-05 14:53:14 +01:00
Stéphane Nicoll 57e17adde0 Start building against Spring Pulsar 1.1.10 snapshots
See gh-44562
2025-03-05 14:53:11 +01:00
Stéphane Nicoll 08e9e4949b Start building against Spring Data Bom 2024.0.10 snapshots
See gh-44561
2025-03-05 14:53:07 +01:00
Stéphane Nicoll 057c30c561 Start building against Reactor Bom 2023.0.16 snapshots
See gh-44560
2025-03-05 14:53:03 +01:00
Stéphane Nicoll 37c4ea5c09 Start building against Micrometer Tracing 1.3.10 snapshots
See gh-44559
2025-03-05 14:52:59 +01:00
Stéphane Nicoll 8b1240331f Start building against Micrometer 1.13.12 snapshots
See gh-44558
2025-03-05 14:52:55 +01:00
Stéphane Nicoll 558073e4ba Merge branch '3.3.x' into 3.4.x 2025-03-05 13:33:20 +01:00
Stéphane Nicoll 9a8d18c1ec Upgrade to Testcontainers 1.20.6
Closes gh-44557
2025-03-05 12:58:09 +01:00
Stéphane Nicoll 4dd58aaf96 Upgrade to SLF4J 2.0.17
Closes gh-44556
2025-03-05 12:58:05 +01:00
Stéphane Nicoll e104ad0a0c Upgrade to Pulsar 3.3.5
Closes gh-44555
2025-03-05 12:58:01 +01:00
Stéphane Nicoll 2476b9af0e Upgrade to Netty 4.1.119.Final
Closes gh-44554
2025-03-05 12:57:57 +01:00
Stéphane Nicoll 4d8ff528f1 Upgrade to Maven Install Plugin 3.1.4
Closes gh-44553
2025-03-05 12:57:53 +01:00
Stéphane Nicoll 1a11de9cf6 Upgrade to Maven Deploy Plugin 3.1.4
Closes gh-44552
2025-03-05 12:57:49 +01:00
Stéphane Nicoll ad5e56d3ce Upgrade to Logback 1.5.17
Closes gh-44551
2025-03-05 12:57:45 +01:00
Stéphane Nicoll f30c338a90 Upgrade to jOOQ 3.19.20
Closes gh-44550
2025-03-05 12:57:41 +01:00
Stéphane Nicoll cfeb9bd6b6 Upgrade to Jackson Bom 2.18.3
Closes gh-44549
2025-03-05 12:57:37 +01:00