Commit Graph

28312 Commits

Author SHA1 Message Date
Moritz Halbritter d0a93dd7cd Merge branch '3.4.x' 2025-03-11 14:01:11 +01:00
Moritz Halbritter e7f8b22479 Enable platform mismatch test again
We now try to pull linux/arm64. The image only exists for linux/amd64, which should
throw the platform mismatch exception.

See gh-44059
2025-03-11 13:32:15 +01:00
Stéphane Nicoll f6d8ee166d Start building against Spring WS 4.1.0-M1 snapshots
See gh-44599
2025-03-11 07:51:22 +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
Moritz Halbritter 58fab66163 Merge branch '3.4.x' 2025-03-10 16:15:48 +01:00
Moritz Halbritter 8fca1dbb6f Disable test until further investigation
See gh-44059
2025-03-10 16:12:33 +01:00
Moritz Halbritter 1aa1bab0a8 Merge branch '3.4.x' 2025-03-10 11:28:03 +01:00
Moritz Halbritter 24854f469c Use single-arch image to test platform mismatch detection
See gh-44059
2025-03-10 11:00:55 +01:00
Andy Wilkinson 207c8f54ab Merge branch '3.4.x' 2025-03-07 17:02:36 +00:00
Andy Wilkinson 92a063faca Merge branch '3.3.x' into 3.4.x 2025-03-07 17:02:22 +00:00
Andy Wilkinson e30ae372e3 Move resources into same packages as documentation tests
See gh-44639
2025-03-07 17:01:58 +00:00
Andy Wilkinson ea7caf9b8f Merge branch '3.4.x'
Closes gh-44642
2025-03-07 10:38:59 +00:00
Andy Wilkinson ec985d260e Merge branch '3.3.x' into 3.4.x
Closes gh-44641
2025-03-07 10:37:19 +00:00
Andy Wilkinson edf3cb1421 Position endpoint documentation tests alongside endpoint's auto-config
Closes gh-44639
2025-03-07 10:28:04 +00:00
Moritz Halbritter 12c9bfff2f Merge branch '3.4.x'
Closes gh-44640
2025-03-07 11:03:41 +01: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
Dmytro Nosan b3f90337ec Polish OpenTelemetryResourceAttributesTests
See gh-44636

Signed-off-by: Dmytro Nosan <dimanosan@gmail.com>
2025-03-07 10:08:23 +01:00
Moritz Halbritter d93f4f5554 Throw exception if pulled image platform doesn't match the requested platform
Closes gh-44059
2025-03-07 09:28:17 +01:00
Moritz Halbritter 6f464e71da Merge branch '3.4.x' 2025-03-07 08:21:32 +01:00
Moritz Halbritter 282571ae1e Merge branch '3.3.x' into 3.4.x 2025-03-07 08:21:13 +01:00
Moritz Halbritter 5ec099756f Fix potential NPE when passing 'null' as params 2025-03-07 08:17:37 +01:00
Andy Wilkinson da5796f70c Merge branch '3.4.x'
Closes gh-44635
2025-03-06 18:35:16 +00:00
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 dde9bfbeaa Merge branch '3.4.x'
Closes gh-44631
2025-03-06 17:41:08 +01: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 e0e1f2aeb3 Upgrade to Testcontainers 1.20.6
Closes gh-44625
2025-03-06 16:11:26 +01:00
Stéphane Nicoll a72fedec8f Upgrade to SLF4J 2.0.17
Closes gh-44624
2025-03-06 16:11:26 +01:00
Stéphane Nicoll a88d4bf93b Upgrade to Selenium HtmlUnit 4.29.0
Closes gh-44623
2025-03-06 16:11:26 +01:00
Stéphane Nicoll 38eadf608f Upgrade to Selenium 4.29.0
Closes gh-44622
2025-03-06 16:11:26 +01:00
Stéphane Nicoll 132fb6e18f Upgrade to R2DBC MySQL 1.4.0
Closes gh-44621
2025-03-06 16:11:26 +01:00
Stéphane Nicoll ee5ebeacc8 Upgrade to Pulsar 4.0.3
Closes gh-44620
2025-03-06 16:11:26 +01:00
Stéphane Nicoll 21569a03ff Upgrade to Netty 4.1.119.Final
Closes gh-44619
2025-03-06 16:11:26 +01:00
Stéphane Nicoll e47ddaf5ed Upgrade to Maven Install Plugin 3.1.4
Closes gh-44617
2025-03-06 16:11:26 +01:00
Stéphane Nicoll 46ec9ec5c9 Upgrade to Maven Deploy Plugin 3.1.4
Closes gh-44616
2025-03-06 16:11:26 +01:00
Stéphane Nicoll 3ba8dec983 Upgrade to Maven Compiler Plugin 3.14.0
Closes gh-44615
2025-03-06 16:11:26 +01:00
Stéphane Nicoll daa0c3001e Upgrade to Logback 1.5.17
Closes gh-44614
2025-03-06 16:11:26 +01:00
Stéphane Nicoll e25d715ede Upgrade to jOOQ 3.19.20
Closes gh-44612
2025-03-06 16:11:26 +01:00
Stéphane Nicoll bf8f8a4e23 Upgrade to Jetty Reactive HTTPClient 4.0.9
Closes gh-44610
2025-03-06 15:35:14 +01:00
Stéphane Nicoll 9c83f36bef Upgrade to Infinispan 15.1.7.Final
Closes gh-44608
2025-03-06 15:35:14 +01:00
Stéphane Nicoll f33087e3b7 Upgrade to HtmlUnit 4.10.0
Closes gh-44607
2025-03-06 15:35:14 +01:00
Stéphane Nicoll 443edcdcaf Upgrade to Hibernate 6.6.9.Final
Closes gh-44606
2025-03-06 15:35:14 +01:00
Stéphane Nicoll 0ce71e2c06 Upgrade to Groovy 4.0.26
Closes gh-44605
2025-03-06 15:35:14 +01:00
Stéphane Nicoll 92c198e536 Upgrade to Flyway 11.3.4
Closes gh-44604
2025-03-06 15:35:14 +01:00
Stéphane Nicoll 163e03b3c6 Upgrade to Byte Buddy 1.17.2
Closes gh-44603
2025-03-06 15:35:14 +01:00
Stéphane Nicoll 013633cc48 Upgrade to Awaitility 4.3.0
Closes gh-44602
2025-03-06 15:35:13 +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