root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
52,787 Commits 23 Branches 348 Tags 289 MiB
Commit Graph

27796 Commits

Author SHA1 Message Date
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
Stéphane Nicoll 20d8e47273 Merge branch '3.3.x' into 3.4.x 
Closes gh-44680
 2025-03-12 08:38:26 +01:00
Stéphane Nicoll 0f0180d9dc Prevent upgrade to Jetty 12.0.17 
Closes gh-44611
 2025-03-12 08:38:08 +01:00
Stéphane Nicoll f1eb2da00e Upgrade to Reactor Bom 2023.0.16 
Closes gh-44560
 2025-03-11 16:59:11 +01:00
Stéphane Nicoll 3e5062591f Upgrade to Micrometer Tracing 1.3.10 
Closes gh-44559
 2025-03-11 16:59:11 +01:00
Stéphane Nicoll 7a9589cc98 Upgrade to Micrometer 1.13.12 
Closes gh-44558
 2025-03-11 16:59:11 +01:00
Stéphane Nicoll d18ccfae3d Upgrade to jOOQ 3.19.21 
Closes gh-44668
 2025-03-11 16:59:11 +01:00
Stéphane Nicoll 4efb861c52 Upgrade to ActiveMQ 6.1.6 
Closes gh-44667
 2025-03-11 16:59:04 +01:00
Stéphane Nicoll 7dcacf2a40 Upgrade to Reactor Bom 2024.0.4 
Closes gh-44567
 2025-03-11 16:58:39 +01:00
Stéphane Nicoll b391945b33 Upgrade to Micrometer Tracing 1.4.4 
Closes gh-44566
 2025-03-11 16:58:39 +01:00
Stéphane Nicoll 7d06639a68 Upgrade to Micrometer 1.14.5 
Closes gh-44565
 2025-03-11 16:58:39 +01:00
Stéphane Nicoll a9499a2cc4 Upgrade to jOOQ 3.19.21 
Closes gh-44665
 2025-03-11 16:58:38 +01:00
Stéphane Nicoll ae16d8ac5e Upgrade to Hibernate 6.6.10.Final 
Closes gh-44664
 2025-03-11 16:58:34 +01:00
Stéphane Nicoll 466d15c7c5 Upgrade to ActiveMQ 6.1.6 
Closes gh-44663
 2025-03-11 16:58:28 +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
Moritz Halbritter 8fca1dbb6f Disable test until further investigation 
See gh-44059
 2025-03-10 16:12:33 +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 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 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 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 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 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 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