Commit Graph

50613 Commits

Author SHA1 Message Date
Andy Wilkinson
99d9c3572f Update .sdkmanrc to use 17.0.9+11
Closes gh-37961
2023-10-20 16:03:56 +01:00
Andy Wilkinson
4ed68b9e32 Merge branch '2.7.x' into 3.0.x 2023-10-20 16:01:26 +01:00
Andy Wilkinson
313e3d59a3 Update Java version in .sdkmanrc to 8u392+9
Closes gh-37959
2023-10-20 16:00:56 +01:00
Andy Wilkinson
d5cf588a98 Merge branch '3.1.x'
Closes gh-37978
2023-10-20 15:59:00 +01:00
Andy Wilkinson
9d64a11418 Merge branch '3.0.x' into 3.1.x
Closes gh-37977
2023-10-20 15:58:48 +01:00
Andy Wilkinson
f081a0e9be Upgrade to Checkstyle 10.12.4
Closes gh-37976
2023-10-20 15:58:24 +01:00
Andy Wilkinson
9897576562 Polish d22969ae
The current threads must be retrieved each time so that we can see
the keep-alive thread dying.

See gh-37736
2023-10-20 12:57:17 +01:00
Andy Wilkinson
d13d38a141 Trim multiple leading slashes in NestedLocation
See gh-37668
2023-10-20 11:55:35 +01:00
Andy Wilkinson
88bf3dfba2 Close byte channel created by newByteChannelReturnsByteChannel
See gh-7161
2023-10-20 11:22:16 +01:00
Andy Wilkinson
dad5dc6750 Try to fix NestedFileSystemProviderTests on Windows
See gh-7161
2023-10-20 10:56:08 +01:00
Andy Wilkinson
d22969ae09 Tolerate race condition in shouldStopKeepAliveThreadIfContextIsClosed
See gh-37736
2023-10-20 10:19:34 +01:00
Andy Wilkinson
4161eb1853 Fix path handling in NestedLocation on Windows
See 4b495ca
See gh-37668
2023-10-20 09:15:54 +01:00
Phillip Webb
3eeb1b2849 Merge branch '3.1.x' 2023-10-19 23:21:42 -07:00
Phillip Webb
9f3afb3636 Merge branch '3.0.x' into 3.1.x 2023-10-19 23:21:20 -07:00
Phillip Webb
7c864804d5 Merge branch '2.7.x' into 3.0.x 2023-10-19 23:21:08 -07:00
Phillip Webb
d47f8bf945 Update copyright year of changed files 2023-10-19 23:20:43 -07:00
Phillip Webb
25ce0ef3fc Refine PemContent and PEM parsers 2023-10-19 23:19:45 -07:00
Phillip Webb
41724fc5f1 Merge branch '3.1.x' 2023-10-19 22:06:53 -07:00
Phillip Webb
1dc3ea957b Merge branch '3.0.x' into 3.1.x 2023-10-19 22:06:49 -07:00
Phillip Webb
5ab4e0d153 Merge branch '2.7.x' into 3.0.x 2023-10-19 22:06:42 -07:00
Phillip Webb
548b0ea91f Fix failing exception assertion
See gh-37964
2023-10-19 22:05:59 -07:00
Phillip Webb
32e6ce210e Allow PemPrivateKeyParser to parse multiple keys
Update `PemPrivateKeyParser` so that it can parse multiple keys in a
single PEM file.

Closes gh-37970
2023-10-19 22:01:23 -07:00
Phillip Webb
deb79425ee Polish 2023-10-19 21:47:13 -07:00
Phillip Webb
d638bbb0ba Merge branch '3.1.x'
Closes gh-37967
2023-10-19 21:25:44 -07:00
Phillip Webb
1d456e09d2 Merge branch '3.0.x' into 3.1.x
Closes gh-37966
2023-10-19 21:12:52 -07:00
Phillip Webb
a0b999c8b4 Merge branch '2.7.x' into 3.0.x
Closes gh-37965
2023-10-19 20:55:51 -07:00
Phillip Webb
abdad1cabe Constently use assertThatExceptionOf... assertions
Closes gh-37964
2023-10-19 20:17:26 -07:00
Andy Wilkinson
e25886f2de Consider checkpoint restoration when logging start time and uptime
Closes gh-37084
2023-10-19 19:54:58 +01:00
Moritz Halbritter
b883c59658 Merge branch '3.1.x' 2023-10-19 15:35:36 +02:00
Spring Builds
8b8e23f4b5 Next development version (v3.1.6-SNAPSHOT) 2023-10-19 12:40:23 +00:00
Moritz Halbritter
f64359f758 Merge branch '3.1.x' 2023-10-19 13:30:54 +02:00
Moritz Halbritter
e9201f1a66 Merge branch '3.0.x' into 3.1.x 2023-10-19 13:30:45 +02:00
Spring Builds
c16f9dda96 Next development version (v3.0.13-SNAPSHOT) 2023-10-19 10:39:31 +00:00
Andy Wilkinson
688de3b873 Merge branch '3.1.x' 2023-10-19 10:55:34 +01:00
Phillip Webb
343046d30c Polish 2023-10-19 10:55:26 +01:00
Phillip Webb
fcb75b6a1e Search implemented interfaces on superclass for @ServiceConnection
Refine original fix to also search interfaces on the superclass.

Fixes gh-37671
2023-10-19 10:52:19 +01:00
Andy Wilkinson
c865496fc5 Merge branch '3.1.x' 2023-10-19 10:34:58 +01:00
Andy Wilkinson
5fc1d31953 Merge branch '3.0.x' into 3.1.x 2023-10-19 10:33:13 +01:00
Andy Wilkinson
18267be47d Merge branch '2.7.x' into 3.0.x 2023-10-19 10:32:46 +01:00
Andy Wilkinson
fe69930ac7 Correct configuration of Sonatype credentials used for promotion 2023-10-19 09:20:00 +01:00
Moritz Halbritter
d82e98ef42 Merge branch '3.1.x'
Closes gh-37960
2023-10-19 10:05:43 +02:00
Moritz Halbritter
64cf3b0712 Document how to share services with Docker Compose
Closes gh-37886
2023-10-19 10:05:14 +02:00
Moritz Halbritter
55dc2963ef Rename Testcontainers bean startup property
Old name: spring.testcontainers.startup
New name: spring.testcontainers.beans.startup

Closes gh-37073
2023-10-19 09:22:27 +02:00
Andy Wilkinson
8b6b6378f5 Polish CI pipeline 2023-10-19 08:16:53 +01:00
Spring Builds
6945d3df26 Next development version (v2.7.18-SNAPSHOT) 2023-10-19 06:49:32 +00:00
Phillip Webb
b8365e3118 Fix misconfigured Maven test
See gh-37669
2023-10-18 22:58:45 -07:00
Phillip Webb
a8ad8ca9f7 Upgrade to Java 21.0.1+12
Closes gh-37945
2023-10-18 21:20:42 -07:00
Phillip Webb
a354c236bb Upgrade to Java 17.0.9+11
See gh-37944
2023-10-18 21:20:24 -07:00
Phillip Webb
062b544447 Upgrade to Ubuntu Jammy 20231004
Closes gh-37957
2023-10-18 21:19:51 -07:00
Phillip Webb
5c6c0879fc Merge branch '3.1.x' 2023-10-18 21:19:11 -07:00