5bd9b1725a
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38033
2023-10-25 14:41:00 +01:00
ea39a33337
Document server.servlet.encoding.* configuration properties
...
Closes gh-32472
2023-10-25 14:40:29 +01:00
0d1a223fee
Merge branch '3.1.x'
...
Closes gh-38032
2023-10-25 14:08:22 +01:00
649117de35
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38031
2023-10-25 14:08:10 +01:00
331bf51332
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38030
2023-10-25 14:07:57 +01:00
666f68ea60
Document configuration for building images with Colima
...
Closes gh-34522
2023-10-25 14:07:43 +01:00
fb1912149e
Merge branch '3.1.x'
...
Closes gh-38028
2023-10-25 12:24:55 +01:00
581dfbfa33
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38027
2023-10-25 12:24:42 +01:00
5b80dd87d3
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38026
2023-10-25 12:18:41 +01:00
9a23e13894
Add some documentation for customizing the reactive web server
...
Closes gh-31917
2023-10-25 12:17:45 +01:00
6bcd1cf937
Merge branch '3.1.x'
...
Closes gh-38025
2023-10-25 11:10:35 +01:00
f8f60d1aae
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38024
2023-10-25 11:10:22 +01:00
5db85a818e
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38023
2023-10-25 11:09:56 +01:00
a20f81b995
Mention that classpath.idx is typically generated by build plugins
...
Closes gh-37125
2023-10-25 11:09:17 +01:00
edca4901dc
Merge branch '3.1.x'
...
Closes gh-38022
2023-10-25 11:03:36 +01:00
56d31d47f1
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38021
2023-10-25 11:03:24 +01:00
e742321dbb
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38020
2023-10-25 11:02:26 +01:00
fcdc638336
Mention what to do when use-hal-as-default-json-media-type is false
...
Closes gh-26814
2023-10-25 11:01:28 +01:00
4f7e4712dd
Merge branch '3.1.x'
...
Closes gh-38019
2023-10-25 10:45:07 +01:00
4faabcfcdd
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38018
2023-10-25 10:44:38 +01:00
b33ee84146
Merge branch '2.7.x' into 3.0.x
...
Closes gh-38017
2023-10-25 10:44:03 +01:00
8778884f5d
Clarify role of WebMvcRegistrations and WebMvcConfigurer
...
Closes gh-31232
2023-10-25 10:42:25 +01:00
e7c3c6e62c
Merge branch '3.1.x'
...
Closes gh-38016
2023-10-25 10:22:05 +01:00
b764192550
Merge branch '3.0.x' into 3.1.x
...
Closes gh-38015
2023-10-25 10:21:04 +01:00
f16ad50db8
Add Embedded MongoDB to community starters
...
See gh-38010
2023-10-25 10:20:13 +01:00
ddf6b3f23b
Merge branch '3.1.x'
...
Closes gh-38014
2023-10-25 10:26:02 +02:00
73685d1d02
Register required class names for reflection in Testcontainer factory
...
Closes gh-36606
2023-10-25 10:25:42 +02:00
4e7c0737d4
Fix PropertiesLauncher classpath detection without 'loader.path' set
...
Update `PropertiesLauncher` to restore classpath detection logic applied
when no `loader.path` property is set.
Fixes gh-37992
2023-10-24 17:03:18 -07:00
0950d4416a
Pass in filter's name when adding to MockMvc
...
Closes gh-38001
2023-10-24 12:39:42 +01:00
4c3de96d74
Fix links to Antora based JavaDoc and reference documentation
...
This introduces two different attributes for, e.g. the Spring Framework
version: the "normal" one, e.g. 6.1.0-SNAPSHOT, and the Antora one,
e.g. 6.1.
Spring Framework's reference documentation is still broken when using
SNAPSHOT versions, see spring-framework/gh-31480.
See gh-38000
2023-10-24 10:31:26 +02:00
7bd9989614
Fix merge conflict errors
...
See gh-37999
2023-10-23 19:40:44 -07:00
2ac69160c7
Revert "Allow PemPrivateKeyParser to parse multiple keys"
...
This reverts commit 32e6ce210e
2023-10-23 18:32:12 -07:00
a9469d9c8e
Adapt to changes in Framework's internals
...
See gh-37995
2023-10-23 18:07:38 +01:00
b5d4983829
Polish
...
See gh-37984
2023-10-23 11:15:27 +02:00
ddd093f4e2
Fix links in Spring Pulsar section of ref guide
...
Spring for Apache Pulsar recently moved to Antora docs which in turn
modified the base url slightly. This commmit adjusts for the move.
See gh-37986
2023-10-23 11:06:54 +02:00
1571097048
Fix links in Spring Kafka section of ref guide
...
Spring for Apache Kafka recently moved to Antora docs which in turn
modified the base url slightly. This commmit adjusts for the move.
See gh-37987
2023-10-23 11:03:05 +02:00
68d8fa14bf
Polish "Add JVM Checkpoint Restore documentation"
...
See gh-37975
2023-10-23 11:01:25 +02:00
e988bf4212
Add JVM Checkpoint Restore documentation
...
See gh-37975
2023-10-23 11:01:20 +02:00
b11d06deb1
Merge branch '3.1.x'
...
Closes gh-37991
2023-10-23 10:42:42 +02:00
09821feb75
Fix container inspection for Docker Compose >= 2.23.0
...
Docker Compose starting with 2.23.0 returns truncated ids in the
docker compose ps call. We now do a prefix search if an exact match
isn't found in the docker inspect response.
Closes gh-37982
2023-10-23 10:40:20 +02:00
e1bd24695d
Try `@AssertFileChannelDataBlocksClosed` for Windows fix
...
This updates commit dad5dc6750
2023-10-20 10:05:43 -07:00
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
d13d38a141
Trim multiple leading slashes in NestedLocation
...
See gh-37668
2023-10-20 11:55:35 +01:00
88bf3dfba2
Close byte channel created by newByteChannelReturnsByteChannel
...
See gh-7161
2023-10-20 11:22:16 +01:00
dad5dc6750
Try to fix NestedFileSystemProviderTests on Windows
...
See gh-7161
2023-10-20 10:56:08 +01:00
d22969ae09
Tolerate race condition in shouldStopKeepAliveThreadIfContextIsClosed
...
See gh-37736
2023-10-20 10:19:34 +01:00
4161eb1853
Fix path handling in NestedLocation on Windows
...
See 4b495ca
2023-10-20 09:15:54 +01:00
3eeb1b2849
Merge branch '3.1.x'
2023-10-19 23:21:42 -07:00
9f3afb3636
Merge branch '3.0.x' into 3.1.x
2023-10-19 23:21:20 -07:00
7c864804d5
Merge branch '2.7.x' into 3.0.x
2023-10-19 23:21:08 -07:00
d47f8bf945
Update copyright year of changed files
2023-10-19 23:20:43 -07:00
25ce0ef3fc
Refine `PemContent` and PEM parsers
2023-10-19 23:19:45 -07:00
548b0ea91f
Fix failing exception assertion
...
See gh-37964
2023-10-19 22:05:59 -07:00
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
deb79425ee
Polish
2023-10-19 21:47:13 -07:00
d638bbb0ba
Merge branch '3.1.x'
...
Closes gh-37967
2023-10-19 21:25:44 -07:00
1d456e09d2
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37966
2023-10-19 21:12:52 -07:00
a0b999c8b4
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37965
2023-10-19 20:55:51 -07:00
abdad1cabe
Constently use assertThatExceptionOf... assertions
...
Closes gh-37964
2023-10-19 20:17:26 -07:00
e25886f2de
Consider checkpoint restoration when logging start time and uptime
...
Closes gh-37084
2023-10-19 19:54:58 +01:00
343046d30c
Polish
2023-10-19 10:55:26 +01:00
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
d82e98ef42
Merge branch '3.1.x'
...
Closes gh-37960
2023-10-19 10:05:43 +02:00
64cf3b0712
Document how to share services with Docker Compose
...
Closes gh-37886
2023-10-19 10:05:14 +02:00
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
b8365e3118
Fix misconfigured Maven test
...
See gh-37669
2023-10-18 22:58:45 -07:00
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
93b562e632
Fix PulsarProperties lookupTimeout
...
Prefer `null` to `-1` for the default timeout.
See gh-34763
2023-10-18 20:52:12 -07:00
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
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
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
af2e363252
Merge branch '3.1.x'
...
Closes gh-37942
2023-10-18 18:50:52 +01:00
226221073c
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37941
2023-10-18 18:39:29 +01:00
a25472ab5b
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37940
2023-10-18 18:39:16 +01:00
817debb1ee
Fix constructor binding with conversion to custom collection type
...
Closes gh-37734
2023-10-18 17:47:26 +01:00
8d006f82f7
Merge branch '3.1.x'
...
Closes gh-37939
2023-10-18 17:46:19 +01:00
9219fdc638
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37938
2023-10-18 17:44:30 +01:00
865203f902
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37937
2023-10-18 17:37:37 +01:00
04307aa7e0
Polish "Support @Order on [CommandLine|Application]Runner @Bean definitions"
...
See gh-37905
2023-10-18 17:16:48 +01:00
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
1aa704b619
Upgrade to Spring Batch 5.1.0-RC1
...
Closes gh-37708
2023-10-18 15:47:27 +01:00
851e6def76
Fix tests on Windows
...
See gh-37808
2023-10-18 14:08:41 +01:00
1559485f56
Fix Gradle plugin test classpath after Kotlin upgrade
...
See gh-37926
2023-10-18 14:07:49 +01:00
79ab4c4fa7
Upgrade to Undertow 2.3.10.Final
...
Closes gh-37934
2023-10-18 12:40:39 +01:00
4b32f249d4
Upgrade to Undertow 2.3.10.Final
...
Closes gh-37933
2023-10-18 12:17:52 +01:00
ae75877932
Upgrade to Jetty Reactive HTTPClient 3.0.9
...
Closes gh-37932
2023-10-18 12:17:45 +01:00
9c3b689f7c
Upgrade to Undertow 2.3.10.Final
...
Closes gh-37931
2023-10-18 12:00:38 +01:00
08ea576c37
Upgrade to Jetty Reactive HTTPClient 3.0.9
...
Closes gh-37930
2023-10-18 12:00:31 +01:00
27f06ea1e0
Upgrade to Undertow 2.2.28.Final
...
Closes gh-37929
2023-10-18 11:44:00 +01:00
afff56a5f9
Upgrade to Spring Session Bom 2021.2.3
...
Closes gh-37928
2023-10-18 11:43:55 +01:00
5244bcfb5a
Upgrade to Jetty Reactive HTTPClient 1.1.15
...
Closes gh-37927
2023-10-18 11:43:50 +01:00
029c28d923
Merge branch '3.1.x'
...
Closes gh-37925
2023-10-18 11:30:35 +01:00
8f18b116de
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37924
2023-10-18 11:17:41 +01:00
ece239f421
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37923
2023-10-18 11:01:23 +01:00
4cc3aec587
Consider @ComponentScan in imports context cache key
...
Fixes gh-31577
2023-10-18 10:40:23 +01:00
9460f301b4
Merge branch '3.1.x'
...
Closes gh-37921
2023-10-18 10:07:14 +01:00
60a0b7eedb
Merge branch '3.0.x' into 3.1.x
...
Closes gh-37920
2023-10-18 10:07:01 +01:00
85c186a764
Merge branch '2.7.x' into 3.0.x
...
Closes gh-37919
2023-10-18 10:01:49 +01:00
1f0e311cb8
Completely disable restart when running tests
...
Fixes gh-37373
2023-10-18 09:52:47 +01:00
fa954c0c87
Upgrade to Spring Pulsar 1.0.0-RC1
...
Closes gh-37918
2023-10-18 07:59:28 +01:00
4d0e614f5f
Upgrade to Spring Integration 6.2.0-RC1
...
Closes gh-37711
2023-10-18 07:58:38 +01:00
94500f41e9
Upgrade to Spring Integration 6.1.4
...
Closes gh-37914
2023-10-17 18:00:25 +01:00
f645ef5fa5
Upgrade to Spring Integration 6.0.8
...
Closes gh-37795
2023-10-17 17:59:36 +01:00
daa903ab31
Add filters to MockMvc with their init params and dispatcher types
...
Closes gh-37835
2023-10-17 17:54:36 +01:00
02c49b0287
When virtual threads are enabled, configure Pulsar to use them
...
Closes gh-36347
2023-10-17 15:59:41 +01:00
8b115c8ceb
Upgrade to Spring Session 3.2.0-RC1
...
Closes gh-37716
2023-10-17 14:24:42 +01:00
f0cdc57a2c
Upgrade to Spring Authorization Server 1.2.0-RC1
...
Closes gh-37707
2023-10-17 14:24:42 +01:00
84d83c1964
Upgrade to Elasticsearch Client 8.10.4
...
Closes gh-37912
2023-10-17 14:24:41 +01:00
ffeed75804
Upgrade to Spring Session 3.1.3
...
Closes gh-37702
2023-10-17 14:22:19 +01:00
b10556e6ad
Upgrade to Spring Session 3.0.4
...
Closes gh-37686
2023-10-17 14:20:36 +01:00
de91771cb3
Upgrade to Spring Security 6.2.0-RC2
...
Closes gh-37715
2023-10-17 09:03:20 +01:00
d546936d53
Upgrade to Spring Kafka 3.1.0-RC1
...
Closes gh-37712
2023-10-17 09:03:19 +01:00
d5b1acc41f
Upgrade to Spring AMQP 3.1.0-RC1
...
Closes gh-37706
2023-10-17 09:03:19 +01:00
4e21be9086
Upgrade to OkHttp 4.12.0
...
Closes gh-37908
2023-10-17 09:03:18 +01:00
613cc4f5b9
Upgrade to Log4j2 2.21.0
...
Closes gh-37907
2023-10-17 09:03:13 +01:00
fb2ce355af
Upgrade to GraphQL Java 21.2
...
Closes gh-37906
2023-10-17 09:03:08 +01:00
0c9c48d54b
Upgrade to Spring Security 6.1.5
...
Closes gh-37701
2023-10-17 08:59:44 +01:00
439c2f9f84
Upgrade to Spring Kafka 3.0.12
...
Closes gh-37797
2023-10-17 08:59:43 +01:00
cbb8d28e55
Upgrade to Spring Authorization Server 1.1.3
...
Closes gh-37697
2023-10-17 08:59:43 +01:00
1a2832a0b6
Upgrade to Spring AMQP 3.0.10
...
Closes gh-37696
2023-10-17 08:59:42 +01:00
517c63336a
Upgrade to Spring Security 6.0.8
...
Closes gh-37685
2023-10-17 08:46:54 +01:00
2acfe9c4e1
Upgrade to Spring Kafka 3.0.12
...
Closes gh-37796
2023-10-17 08:46:54 +01:00
b33d43cc43
Upgrade to Spring AMQP 3.0.10
...
Closes gh-37681
2023-10-17 08:46:53 +01:00
747cb2dac9
Upgrade to Spring AMQP 2.4.17
...
Closes gh-37676
2023-10-17 08:43:41 +01:00
33c5e1269a
Write signature files to uber jars to for Oracle Java 17 verification
...
Update Gradle and Maven plugins to write an empty `META-INF/BOOT.SF`
file whenever there is a nested signed jar.
This update allows Oracle Java 17 to correctly verify the nested JARs.
The file is required because `JarVerifier` has code roughly equivalent
to:
if (!jarManifestNameChecked && SharedSecrets
.getJavaUtilZipFileAccess().getManifestName(jf, true) == null) {
throw new JarException("The JCE Provider " + jarURL.toString() +
" is not signed.");
}
The `SharedSecrets.getJavaUtilZipFileAccess().getManifestName(jf, true)`
call ends up in `ZipFile.getManifestName(onlyIfSignatureRelatedFiles)`
which is a private method that we cannot override in our `NestedJarFile`
subclass. By writing an empty `.SF` file we ensure that the `Manifest`
is always returned because there are always "signature related files".
Fixes gh-28837
2023-10-16 16:19:16 -07:00
fe752dedef
Polish adoc formatting
2023-10-16 15:50:58 -07:00
9f224ff136
Narrow the scope of 0e3a196 to Resource[] for array binding
...
See gh-15835
2023-10-16 18:18:34 +01:00
d6a9295c26
Allow additional build info properties to have provided values
...
Closes gh-37889
2023-10-16 18:15:42 +01:00
d796087dfa
Polish "Add properties for configuring EnumFeature and JsonNodeFeature"
...
See gh-37885
2023-10-16 15:39:25 +01:00
8edb4b9729
Add properties for configuring EnumFeature and JsonNodeFeature
...
Both `EnumFeature` and `JsonNodeFeature` implement `DataTypeFeature`
which was recently added in Spring Framework. This commits introduces
support to allow the configuration via properties.
See spring-projects/spring-framework#31380
See gh-37885
2023-10-16 15:00:32 +01:00
19fd88b25b
Implement SSL hot reload for Netty and Tomcat
...
Closes gh-37808
2023-10-16 14:08:26 +01:00
92cd85002d
Upgrade to Spring Retry 2.0.4
...
Closes gh-37714
2023-10-16 13:58:18 +01:00
52d80197fe
Upgrade to Spring Retry 2.0.4
...
Closes gh-37700
2023-10-16 13:52:25 +01:00
a8a19acb99
Upgrade to Spring Retry 2.0.4
...
Closes gh-37684
2023-10-16 13:27:37 +01:00
5970f29fd5
Upgrade to Spring Data Bom 2023.1.0-RC1
...
Closes gh-37709
2023-10-16 12:27:50 +01:00
204cfce04c
Upgrade to Dropwizard Metrics 4.2.21
...
Closes gh-37899
2023-10-16 12:27:44 +01:00
fea81fb50d
Upgrade to Spring LDAP 3.1.2
...
Closes gh-37699
2023-10-16 11:57:25 +01:00
43b566b98e
Upgrade to Spring Data Bom 2023.0.5
...
Closes gh-37698
2023-10-16 11:57:25 +01:00
2fabc49a1e
Upgrade to Dropwizard Metrics 4.2.21
...
Closes gh-37897
2023-10-16 11:57:19 +01:00
fc69d272fc
Upgrade to Spring LDAP 3.0.6
...
Closes gh-37683
2023-10-16 11:53:58 +01:00
53a020fef7
Upgrade to Spring Data Bom 2022.0.11
...
Closes gh-37682
2023-10-16 11:53:57 +01:00
03209fad19
Upgrade to Dropwizard Metrics 4.2.21
...
Closes gh-37896
2023-10-16 11:53:57 +01:00
60912c41a6
Upgrade to Spring Data Bom 2021.2.17
...
Closes gh-37677
2023-10-16 11:32:56 +01:00
a70afe2148
Upgrade to Pooled JMS 1.2.5
...
Closes gh-37894
2023-10-16 11:32:56 +01:00
344d1361c8
Upgrade to Dropwizard Metrics 4.2.21
...
Closes gh-37893
2023-10-16 11:32:51 +01:00
0e3a196af5
Fix binding of classpath*: to resource arrays and collections
...
Fixes gh-15835
2023-10-16 11:28:35 +01:00
339f75d309
Fix GraphQL WebSocket HandlerMapping bean ordering
...
Prior to this commit, the GraphQL WebSocket HandlerMapping bean would be
ordered at position "2", before the RouterFunction variant defined by
Spring Framework at position "3".
Since then, the Spring Framework team changed the default order value
for this one at "-1", see spring-projects/spring-framework#30278 .
This prevents the WebSocket upgrade, as the request is handled by the
RouterFunction instead of the WebSocket handler.
This commit updates the handlermapping order and introduces a test to
prevent issues in the future.
Fixes gh-37892
2023-10-16 12:11:31 +02:00
4c3a0f09d7
Support parallel initialization of Testcontainers
...
Add support for a `spring.testcontainers.startup` property that can
be set to "sequential" or "parallel" to change how containers are
started.
Closes gh-37073
2023-10-14 23:58:25 -07:00
efd9aa9b64
Polish
2023-10-14 19:51:42 -07:00
e01e4f1912
Search implemented interfaces on superclass for @ServiceConnection
...
Refine original fix to also search interfaces on the superclass.
Fixes gh-37671
2023-10-14 19:43:41 -07:00
Andy Wilkinson
Johnny Lim
Moritz Halbritter
Phillip Webb
Chris Bono
Sébastien Deleuze
Tadaya Tsuyukubo
Eddú Meléndez
Brian Clozel