Commit Graph

26227 Commits

Author SHA1 Message Date
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
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
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
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
Phillip Webb
b8365e3118 Fix misconfigured Maven test
See gh-37669
2023-10-18 22:58:45 -07:00
Phillip Webb
3ccf29ef49 Refine spring-boot-starter-data-redis-reactive dependencies
Change `spring-boot-starter-data-redis-reactive` to be standalone and
also declare an explicit dependency on reactor.

Closes gh-37943
2023-10-18 20:53:06 -07:00
Phillip Webb
93b562e632 Fix PulsarProperties lookupTimeout
Prefer `null` to `-1` for the default timeout.

See gh-34763
2023-10-18 20:52:12 -07:00
Phillip Webb
3c62defb9d Support java.nio.file Paths and FileSystems with nested jars
Add a `NestedFileSystemProvider` implementation so that the JDK's
`ZipFileSystem` can load content from nested jars and nested
directory entries.

Creating a `ZipFileSystem` may be a relatively expensive operation as
zip structures need to be parsed and in the case of directory entries
a virtual datablock nees to be generated on the fly. As such, we
install the `ZipFileSystem` as late as possible since in a typical
application it may never be needed.

This commit also tweaks Gradle and Maven plugins to ensure that the
service loader file is written to repackaged jars.

Closes gh-7161
2023-10-18 20:46:36 -07:00
Phillip Webb
4b495ca2a9 Change NestedLocation to hold a Path rather than a File
Refactor `NestedLocation` so that it holds a `Path` rather than a
`File`.

See gh-37668
2023-10-18 20:46:35 -07:00
Andy Wilkinson
ec6415f04b Add SSL bundle support to Apache Kafka auto-configuration
Closes gh-37629
Co-authored-by: Scott Frederick <sfrederick@vmware.com>
2023-10-18 16:34:28 -05:00
Andy Wilkinson
af2e363252 Merge branch '3.1.x'
Closes gh-37942
2023-10-18 18:50:52 +01:00
Andy Wilkinson
226221073c Merge branch '3.0.x' into 3.1.x
Closes gh-37941
2023-10-18 18:39:29 +01:00
Andy Wilkinson
a25472ab5b Merge branch '2.7.x' into 3.0.x
Closes gh-37940
2023-10-18 18:39:16 +01:00
Andy Wilkinson
817debb1ee Fix constructor binding with conversion to custom collection type
Closes gh-37734
2023-10-18 17:47:26 +01:00
Andy Wilkinson
8d006f82f7 Merge branch '3.1.x'
Closes gh-37939
2023-10-18 17:46:19 +01:00
Andy Wilkinson
9219fdc638 Merge branch '3.0.x' into 3.1.x
Closes gh-37938
2023-10-18 17:44:30 +01:00
Andy Wilkinson
865203f902 Merge branch '2.7.x' into 3.0.x
Closes gh-37937
2023-10-18 17:37:37 +01:00
Andy Wilkinson
04307aa7e0 Polish "Support @Order on [CommandLine|Application]Runner @Bean definitions"
See gh-37905
2023-10-18 17:16:48 +01:00
Tadaya Tsuyukubo
8ac597c245 Support @Order on [CommandLine|Application]Runner @Bean definitions
Prior to this commit, `@Order` annotation on `@Bean` method was not
considered for `CommandLineRunner` and `ApplicationRunner`.

This commit introduces a `Runner` marker interface and uses it to
retrieve the runner beans. As a result, it enables the use of `@Order`
annotations on `@Bean` methods for both `CommandLineRunner` and
`ApplicationRunner`.

Signed-off-by: Tadaya Tsuyukubo <tadaya@ttddyy.net>

See gh-37905
2023-10-18 17:15:15 +01:00
Andy Wilkinson
1aa704b619 Upgrade to Spring Batch 5.1.0-RC1
Closes gh-37708
2023-10-18 15:47:27 +01:00
Andy Wilkinson
851e6def76 Fix tests on Windows
See gh-37808
2023-10-18 14:08:41 +01:00
Andy Wilkinson
1559485f56 Fix Gradle plugin test classpath after Kotlin upgrade
See gh-37926
2023-10-18 14:07:49 +01:00
Andy Wilkinson
79ab4c4fa7 Upgrade to Undertow 2.3.10.Final
Closes gh-37934
2023-10-18 12:40:39 +01:00
Andy Wilkinson
4b32f249d4 Upgrade to Undertow 2.3.10.Final
Closes gh-37933
2023-10-18 12:17:52 +01:00
Andy Wilkinson
ae75877932 Upgrade to Jetty Reactive HTTPClient 3.0.9
Closes gh-37932
2023-10-18 12:17:45 +01:00
Andy Wilkinson
9c3b689f7c Upgrade to Undertow 2.3.10.Final
Closes gh-37931
2023-10-18 12:00:38 +01:00
Andy Wilkinson
08ea576c37 Upgrade to Jetty Reactive HTTPClient 3.0.9
Closes gh-37930
2023-10-18 12:00:31 +01:00
Andy Wilkinson
27f06ea1e0 Upgrade to Undertow 2.2.28.Final
Closes gh-37929
2023-10-18 11:44:00 +01:00
Andy Wilkinson
afff56a5f9 Upgrade to Spring Session Bom 2021.2.3
Closes gh-37928
2023-10-18 11:43:55 +01:00
Andy Wilkinson
5244bcfb5a Upgrade to Jetty Reactive HTTPClient 1.1.15
Closes gh-37927
2023-10-18 11:43:50 +01:00
Andy Wilkinson
029c28d923 Merge branch '3.1.x'
Closes gh-37925
2023-10-18 11:30:35 +01:00