387677eae8
Upgrade to JUnit 5.12
...
Closes gh-34416
2025-03-12 12:46:34 +01:00
641b809d4b
Upgrade to Reactor 2025.0.0-M1
...
Closes gh-34577
2025-03-12 12:21:00 +01:00
0d3f07fdd6
Merge branch '6.2.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2025-03-12 11:54:31 +01:00
4a314867d7
Upgrade to Reactor 2024.0.4 and Micrometer 1.14.5
...
Closes gh-34578
Closes gh-34580
2025-03-12 11:51:33 +01:00
beb3a91847
Upgrade to Hibernate ORM 7.0.0.Beta4
...
Includes Hamcrest 3.0
See gh-33750
2025-03-11 19:17:00 +01:00
15b251dcd6
Merge branch '6.2.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2025-03-10 11:04:14 +01:00
90ddb40d7a
Upgrade to Jetty 12.0.17 and Jetty Reactive HttpClient 4.0.9
...
Includes Apache HttpClient 5.4.1, Netty 4.1.119, Jackson 2.18.3, Gson 2.12.1, FreeMarker 2.3.34, Protobuf 4.30, Groovy 4.0.26, Jython 2.7.4, JRuby 9.4.12, Caffeine 3.2, QDox 2.2, Awaitility 4.3, EasyMock 5.5, HtmlUnit 4.10
Closes gh-34561
2025-03-10 11:00:35 +01:00
34129f3f89
Upgrade to JUnit 5.12
...
Closes gh-34416
2025-02-23 17:38:04 +01:00
6868ff7dbe
Merge branch '6.2.x'
2025-02-13 13:10:37 +01:00
a8be11ebaf
Upgrade to TestNG 7.11
2025-02-13 13:08:54 +01:00
dce3f71b7d
Merge branch '6.2.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2025-02-11 22:11:45 +01:00
2df90e32c0
Upgrade to Netty 4.1.118 and Checkstyle 10.21.2
2025-02-11 22:10:15 +01:00
e9d16da633
Remove Netty 5 support
...
Closes gh-34345
2025-02-11 12:27:33 +00:00
2f6d142ad7
Merge branch '6.2.x'
2025-02-11 11:41:02 +01:00
16e3973118
Upgrade to Reactor 2024.0.3
...
Closes gh-34403
2025-02-11 11:36:47 +01:00
5c37d07ad3
Upgrade to RSocket 1.1.5
...
Closes gh-34402
2025-02-11 10:39:21 +01:00
12891d1975
Upgrade to Micrometer 1.14.4
...
Closes gh-34401
2025-02-11 10:34:33 +01:00
262ce16bb4
Upgrade to Kotlin Serialization 1.8
...
Closes gh-34378
2025-02-06 17:42:19 +01:00
66b3a94376
Upgrade to Kotlin Coroutines 1.10
...
Closes gh-34376
2025-02-06 17:41:44 +01:00
f6602c2f68
Merge branch '6.2.x'
2025-01-18 14:05:19 +01:00
8c3d5621db
Upgrade to AssertJ 3.27.3
2025-01-18 14:02:07 +01:00
65df3097e0
Upgrade to JSONAssert 2.0-rc1
...
Closes gh-33799
2025-01-16 14:10:13 +01:00
38a41b6d01
Merge branch '6.2.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2025-01-15 18:29:30 +01:00
7d844274dc
Upgrade to Jetty 12.0.16, Netty 4.1.117, Protobuf 4.29.3, Checkstyle 10.21.1
2025-01-15 18:27:49 +01:00
46327d6e9b
Merge branch '6.2.x'
2025-01-14 16:41:19 +01:00
cd1aefa5e0
Upgrade to Reactor 2024.0.2
...
Closes gh-34252
2025-01-14 16:36:43 +01:00
6be811119e
Merge branch '6.2.x'
2025-01-13 13:58:16 +01:00
172c25fb0e
Upgrade to Micrometer 1.14.3
...
Closes gh-34251
2025-01-13 13:54:47 +01:00
6888137cb6
Merge branch '6.2.x'
2025-01-13 09:12:32 +01:00
a1503a59ee
Start building against Reactor 2024.0.2 snapshots
...
See gh-34252
2025-01-13 09:09:19 +01:00
5f29df3ac3
Start building against Micrometer 1.14.3 snapshots
...
See gh-34251
2025-01-13 09:08:06 +01:00
c85e56aac9
Polishing
...
See gh-34237
2025-01-10 18:06:46 +01:00
f2a18e5920
Upgrade to Jetty 12.1.0.alpha0
...
Closes gh-34237
2025-01-10 18:03:10 +01:00
df1ed0a4dc
Refine dependencies to fix compilation with Java 23
...
Closes gh-34220
2025-01-09 16:01:39 +01:00
4345acd7b9
Merge branch '6.2.x'
2025-01-05 12:29:50 +02:00
138bdc597d
Upgrade to AssertJ 3.27.2
2025-01-05 12:28:23 +02:00
bab8a8300b
Merge branch '6.2.x'
2025-01-03 16:44:26 +02:00
9de2b947cb
Upgrade to AssertJ 3.27.1
2025-01-03 16:42:07 +02:00
e73e7564d0
Upgrade to Mockito 5.15.2
2025-01-03 16:36:39 +02:00
bf06d74879
Merge branch '6.2.x'
2024-12-21 16:03:43 +01:00
2baf70768d
Upgrade to AssertJ 3.27
2024-12-21 15:49:31 +01:00
bc5d771a06
Switch to JSpecify annotations
...
This commit updates the whole Spring Framework codebase to use JSpecify
annotations instead of Spring null-safety annotations with JSR 305
semantics.
JSpecify provides signficant enhancements such as properly defined
specifications, a canonical dependency with no split-package issue,
better tooling, better Kotlin integration and the capability to specify
generic type, array and varargs element null-safety. Generic type
null-safety is not defined by this commit yet and will be specified
later.
A key difference is that Spring null-safety annotations, following
JSR 305 semantics, apply to fields, parameters and return values,
while JSpecify annotations apply to type usages. That's why this
commit moves nullability annotations closer to the type for fields
and return values.
See gh-28797
2024-12-19 11:07:23 +01:00
c75887c20d
Merge branch '6.2.x'
2024-12-16 15:01:21 +01:00
b0fcde9aa3
Upgrade to JUnit 5.11.4
...
Closes gh-34095
2024-12-16 14:42:30 +01:00
5cbb5d4d70
Upgrade to Hibernate ORM 7.0.0.Beta3 and Validator 9.0.0.CR1
...
Using relocated Maven coordinates.
See gh-33750
2024-12-15 14:37:54 +01:00
5e549da75f
Use Log4j 3.0.0 beta 3 for testing
...
See gh-32459
2024-12-12 19:15:27 +01:00
3db1b94465
Replace spring-jcl with regular Apache Commons Logging 1.3
...
Closes gh-32459
2024-12-12 17:37:11 +01:00
429833cae6
Merge branch '6.2.x'
...
# Conflicts:
# spring-web/src/main/java/org/springframework/http/client/SimpleClientHttpRequestFactory.java
2024-12-11 17:55:36 +01:00
63af572ce8
Upgrade to Jackson 2.18.2, RxJava 3.1.10, Checkstyle 10.20.2
2024-12-11 17:34:53 +01:00
1c435c0f47
Merge branch '6.2.x'
2024-12-10 14:09:18 +01:00
68d6cb9d35
Upgrade to Reactor 2024.0.1
...
Closes gh-34051
2024-12-10 14:06:07 +01:00
6649a6e0f7
Upgrade to Micrometer 1.14.2
...
Closes gh-34050
2024-12-10 14:05:43 +01:00
837579c2e5
Start building against Reactor 2024.0.1 snapshots
...
See gh-34051
2024-12-08 10:49:57 +01:00
03a75cf03a
Start building against Micrometer 1.14.2 snapshots
...
See gh-34050
2024-12-08 10:48:45 +01:00
75e57475ca
Upgrade to Kotlin 2.1.0
...
Spring Framework 7.0 will use a Kotlin 2 baseline, using the latest 2.x
release at the time of the release.
This commit upgrades Kotlin to 2.1.0, and Kotlin Serialization and
Coroutines accordingly.
Closes gh-33629
2024-12-05 11:42:00 +01:00
2b9010c2a2
Remove APIs marked as deprecated for removal
...
Closes gh-33809
2024-12-04 13:19:39 +01:00
3f3341bb1d
Drop server-specific RequestUpgradeStrategy implementations
...
StandardWebSocketUpgradeStrategy is the common replacement on Tomcat, Undertow and all EE servers. JettyRequestUpgradeStrategy remains the preferred choice on Jetty.
Closes gh-33744
2024-12-03 19:08:22 +01:00
949432ce8b
General upgrade to Jakarta EE 11 APIs
...
Includes removal of ManagedBean and javax.annotation legacy support.
Includes AbstractJson(Http)MessageConverter revision for Yasson 3.0.
Includes initial Hibernate ORM 7.0 upgrade.
Closes gh-34011
Closes gh-33750
2024-12-03 13:30:25 +01:00
fec2ed5540
Implement new GraalVM reachability metadata format
...
As of GraalVM 23, a new and simplified reachability metadata format is
available. Metadata now consists of a single
"reachability-metadata.json" file that contains all the information
previously spread in multiple files. The new format does not include
some introspection flags, as they're now automatically included when a
hint is registered against a type.
Also, "typeReachable" has been renamed as "typeReached" to highlight the
fact that the event considered is the static initialization of the type,
not when the static analysis performed during native compilation is
reaching the type.
This new format ships with a JSON schema, which this commit is tested
against.
See gh-33847
2024-11-29 14:43:55 +01:00
4b3e192ca1
Upgrade to Tomcat 11.0
...
This commit upgrades the baseline to Tomcat 11.0 and adapts to the
following behavior changes in Tomcat:
* the MimeHeaders#clear method has been removed
* expired cookies do not set "Max-Age=0" anymore
* responses to HEAD requests do not write the "Content-Length" header
anymore.
Closes gh-33916
2024-11-19 18:11:24 +01:00
c28cbfd582
Upgrade Servlet, JSP and WebSocket API versions
...
This commit updates the Spring Framework baseline for the Servlet, JSP
and WebSocket APIs.
This also removes the previously deprecated APIs in JSP `PageContext`
and guards against the deprecation of the `PushBuilder` API.
See gh-33918
2024-11-19 18:11:18 +01:00
8b66d3c79a
Upgrade Undertow-servlet/websockets to 2.3.18.Final
...
Follow up to 35b452b4
2024-11-19 16:59:04 +01:00
35b452b458
Upgrade to Undertow 2.3.18.Final, dispatch in UndertowHttpHandlerAdapter
...
This ensures that the reactive handling of the request is dispatched
from the Undertow IO thread, marking the exchange as async rather than
ending it once the Undertow `handleRequest` method returns.
Closes gh-33885
2024-11-14 16:14:57 +01:00
d4f8b5d820
Merge branch '6.1.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2024-11-14 12:52:10 +01:00
6cb41dc5e3
Upgrade to Netty 4.1.115
2024-11-14 12:51:03 +01:00
df376d9343
Upgrade to Micrometer 1.12.12 and Reactor 2023.0.12
...
Includes Netty 4.1.114, Jetty 12.0.15, Jetty Reactive HttpClient 4.0.8, RxJava 3.1.9, RSocket 1.1.4, Groovy 4.0.24, JRuby 9.4.9, Checkstyle 10.20.1
Closes gh-33877
Closes gh-33879
2024-11-13 15:08:40 +01:00
4ca596b7bc
Upgrade to Micrometer 1.14.0 and Reactor 2024.0.0
...
Includes Netty 4.1.114, Jetty 12.0.15, Jetty Reactive HttpClient 4.0.8, RxJava 3.1.9, RSocket 1.1.4, HSQLDB 2.7.4, H2 2.3.232, SnakeYAML 2.3, Groovy 4.0.24, JRuby 9.4.9, Jackson 2.18.1, Gson 2.11, Protobuf 4.28.3, XStream 1.4.21, Woodstox 6.7, TestNG 7.10.2, Selenium 4.26, HtmlUnit 4.6, XMLUnit 2.10, Checkstyle 10.20.1
Closes gh-33876
Closes gh-33878
2024-11-13 13:34:43 +01:00
f1e6482f92
Upgrade to Mockito 5.14.2
...
This version brings bytebuddy 1.15.4 which supports JDK 24.
2024-11-04 09:21:21 +01:00
a1f6098158
Merge branch '6.1.x'
2024-10-29 23:04:05 +01:00
11ebceee38
Call get/setRequestConfig for HttpClient 5.4 compatibility
...
Includes upgrade to HttpClient 5.4.1 while retaining a HttpClient 5.1 baseline.
Closes gh-33806
2024-10-29 23:01:57 +01:00
1784ccb200
Upgrade to JUnit 5.11.3
...
Closes gh-33764
2024-10-21 16:58:14 +02:00
453849ab20
Upgrade to Reactor 2024.0.0-RC1
...
Closes gh-33636
2024-10-15 14:57:44 +02:00
a228eb8bd6
Upgrade to Reactor 2023.0.11
...
Closes gh-33637
2024-10-15 14:56:57 +02:00
c79b575417
Upgrade to Micrometer 1.14.0-RC1
...
Closes gh-33648
2024-10-15 09:07:45 +02:00
c015814140
Upgrade to Micrometer 1.12.11
...
Closes gh-33647
2024-10-15 09:06:27 +02:00
6677d452e7
Start building against Micrometer 1.14.0-RC1 snapshots
...
See gh-33648
2024-10-09 14:19:35 +02:00
91cadf7f24
Start building against Reactor 2023.0.11 snapshots
...
See gh-33637
2024-10-09 14:16:14 +02:00
90637b6344
Start building against Micrometer 1.12.11 snapshots
...
See gh-33647
2024-10-09 14:15:22 +02:00
a84a41fa43
Polishing contribution
...
Closes gh-33638
2024-10-08 10:56:42 +01:00
a78385f8e5
Handle X-Forwarded-Prefix parsed by Reactor Netty
...
See gh-33638
2024-10-08 10:56:42 +01:00
d89983d633
Upgrade to Mockito 5.14.1
2024-10-04 17:24:55 +02:00
21d80dd849
Upgrade to JUnit 5.11.2
2024-10-04 15:39:00 +02:00
c44e43d791
Upgrade to JUnit 5.10.5
2024-10-04 15:33:25 +02:00
30dc86810e
Upgrade to Jackson 2.18
...
Closes gh-33615
2024-09-30 13:53:22 +02:00
38c9af2385
Merge branch '6.1.x'
2024-09-30 12:42:17 +02:00
64daba34de
Upgrade to Awaitility 4.2.2
...
See gh-33143
Closes gh-33604
2024-09-30 12:36:54 +02:00
073cfd405b
Merge branch '6.1.x'
2024-09-25 14:24:35 +02:00
f2b522211f
Upgrade to Groovy 4.0.23
2024-09-25 14:23:23 +02:00
17f319b957
Upgrade to JUnit 5.11.1
2024-09-25 11:33:29 +02:00
602ac903ff
Upgrade to JUnit 5.10.4
2024-09-24 15:39:53 +02:00
66a518abd5
Merge branch '6.1.x'
2024-09-24 12:23:47 +02:00
1cecf52883
Upgrade to Apache HttpCore Reactive 5.3
...
Closes gh-33588
2024-09-24 12:21:50 +02:00
88905ea20d
Upgrade to Apache HttpClient 5.4
...
This commit also updates the external Javadoc link to avoid the following
warning in the build.
URL https://hc.apache.org/httpcomponents-client-5.2.x/current/httpclient5/apidocs/package-list was redirected to https://hc.apache.org/httpcomponents-client-5.4.x/current/httpclient5/apidocs/package-list
Closes gh-33587
2024-09-24 12:20:44 +02:00
e587753b1d
Introduce @EasyMockBean bean override example
...
This commit introduces example support for a custom @EasyMockBean
annotation that allows tests to use EasyMock as the mocking framework
for bean overrides in a test's ApplicationContext.
The point of this exercise is to ensure that it is possible for third
parties to introduce bean override support for mocking frameworks other
than Mockito, and that they can do so with the APIs currently in place.
Closes gh-33562
2024-09-18 17:10:06 +02:00
884105d469
Merge branch '6.1.x'
2024-09-11 18:08:30 +02:00
c77de8a6fb
Downgrade to Tomcat 10.1.28
...
Tomcat 10.1.29 was causing failures in spring-webflux when running a
full build.
2024-09-11 18:08:01 +02:00
78028cde05
Upgrade to Mockito 5.13 (depends on JUnit 5.11)
...
See gh-33395
2024-09-11 17:20:01 +02:00
e9f9a7ae8e
Merge branch '6.1.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2024-09-11 17:17:38 +02:00
4e49f67ec5
Upgrade to SLF4J 2.0.16, Tomcat 10.1.29, Jetty 12.0.13, Netty 4.1.113, Undertow 2.3.17, AssertJ 3.26.3, Checkstyle 10.18.1
2024-09-11 17:16:14 +02:00
0fec2cf17a
Upgrade to Reactor 2024.0.0-M6
...
Closes gh-33521
2024-09-10 15:10:59 +02:00
f1f69544b7
Upgrade to Micrometer 1.14.0-M3
...
Closes gh-33520
2024-09-10 15:10:12 +02:00
34f649c3f5
Upgrade to Reactor 2023.0.10
...
Closes gh-33519
2024-09-10 15:05:08 +02:00
5b01f31387
Upgrade to Micrometer 1.12.10
...
Closes gh-33518
2024-09-10 15:04:42 +02:00
2eff5cb463
Upgrade to JUnit 5.11
...
Closes gh-33395
2024-08-15 18:15:15 +02:00
e1cf203295
Merge branch '6.1.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2024-08-13 19:05:20 +02:00
63486bf19c
Upgrade to Tomcat 10.1.28, Jetty 12.0.12, Netty 4.1.112, Undertow 2.3.15
2024-08-13 18:52:15 +02:00
599fc8796b
Upgrade to Reactor 2024.0.0-M5
...
Closes gh-33328
2024-08-13 18:07:31 +02:00
57171143b9
Upgrade to Micrometer 1.14.0-M2
...
Closes gh-33327
2024-08-13 18:07:08 +02:00
86761cd233
Upgrade to Reactor 2023.0.9
...
Closes gh-33326
2024-08-13 17:27:02 +02:00
07cdef410e
Upgrade to Micrometer 1.12.9
...
Closes gh-33325
2024-08-13 17:26:38 +02:00
7d72a03427
Start building against Micrometer 1.14.0-M2 snapshots
...
See gh-33327
2024-08-08 10:55:14 +02:00
88a408474d
Start building against Reactor 2024.0.0-M5 snapshots
...
See gh-33328
2024-08-07 10:22:53 +02:00
5a99407847
Start building against Reactor 2023.0.9 snapshots
...
See gh-33326
2024-08-07 10:02:20 +02:00
05bd246cab
Start building against Micrometer 1.12.9 snapshots
...
See gh-33325
2024-08-07 10:01:54 +02:00
2190c6ec79
Merge branch '6.1.x'
2024-07-21 11:42:39 +02:00
af8dc44469
Polish "Stop referring to STRUCT and ARRAY as they are deprecated"
...
See gh-33248
2024-07-21 11:39:16 +02:00
16b6d42adf
Upgrade to Reactor 2024.0.0-M4
...
Closes gh-33171
2024-07-09 15:52:43 +02:00
86da45ba15
Upgrade to Reactor 2023.0.8
...
Closes gh-33169
2024-07-09 15:52:09 +02:00
b2ba61155a
Upgrade to Micrometer 1.14.0-M1
...
Closes gh-33170
2024-07-09 14:39:28 +02:00
6a60298024
Upgrade to Micrometer 1.12.8
...
Closes gh-33168
2024-07-09 14:39:10 +02:00
4ad5c59dea
Upgrade to Kotlin Coroutines 1.8.1
...
Closes gh-33176
2024-07-09 14:35:15 +02:00
ea2895f7c7
Merge branch '6.1.x'
2024-07-09 14:34:47 +02:00
f8b448e949
Upgrade to Kotlin Serialization 1.6.3
...
Closes gh-33175
2024-07-09 14:31:56 +02:00
f91f7916ac
Merge branch '6.1.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2024-07-08 22:57:14 +02:00
bc2deef951
Upgrade to JRuby 9.4.8, Rhino 1.7.15, Moneta 1.4.4, JSONassert 1.5.3
2024-07-08 22:55:54 +02:00
c6347025d6
Merge branch '6.1.x'
...
# Conflicts:
# spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/ViewResolutionIntegrationTests.java
2024-07-08 19:54:07 +02:00
7322a0d3c5
Upgrade to Groovy 4.0.22, Tomcat 10.1.25, Jetty 12.0.11, Undertow 2.3.14
2024-07-08 19:43:19 +02:00
0a60c622cc
Implement Eclipse Jetty core HTTP handler adapter
...
This provides an implementation of an HTTP Handler Adapter that is coded
directly to the Eclipse Jetty core API, bypassing any servlet
implementation.
This includes a Jetty implementation of the spring `WebSocketClient`
interface, `JettyWebSocketClient`, using an explicit dependency to the
jetty-websocket-api.
Closes gh-32097
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Arjen Poutsma <arjen.poutsma@broadcom.com>
2024-07-08 18:36:46 +02:00
6cccbeda5b
Merge branch '6.1.x'
2024-07-04 04:26:46 +02:00
099a97740e
Downgrade Awaitility to 4.2.0
...
This is required to build against ea builds
Closes gh-33143
2024-07-04 04:20:43 +02:00
3715df11de
Merge branch '6.1.x'
2024-06-27 17:02:16 +02:00
e881c70a93
Upgrade to JUnit 5.10.3
2024-06-27 17:00:43 +02:00
9b58e1ff71
Merge branch '6.1.x'
2024-06-23 17:44:47 +02:00
6b456b6157
Upgrade to FreeMarker 2.3.33
2024-06-22 16:55:56 +02:00
043b93d255
Upgrade to HtmlUnit 4.2.0
...
Closes gh-33081
2024-06-21 14:30:02 +02:00
b196167f19
Merge branch '6.1.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2024-06-12 14:28:53 +02:00
cdfe5816c8
Upgrade to Netty 4.1.111 and Awaitility 4.2.1
2024-06-12 14:23:14 +02:00
c36e270481
Upgrade to Reactor 2024.0.0-M3
...
Closes gh-33006
2024-06-11 14:47:40 +02:00
261dac87cc
Upgrade to Reactor 2023.0.7
...
Closes gh-33007
2024-06-11 14:42:08 +02:00
a6fb7e99a0
Support for Protobuf 4.x
...
This commit compiles our Protobuf against 4.27, effectively raising our
baseline to 3.9+.
This commit also re-generates all the Java messages from the .proto spec
using the latest protoc binary.
Closes gh-33011
2024-06-11 14:12:55 +02:00
3d8488a7d8
Upgrade to Micrometer 1.13.1
...
Closes gh-33000
2024-06-11 09:13:42 +02:00
e48f37d956
Upgrade to Micrometer 1.12.7
...
Closes gh-33001
2024-06-11 09:05:48 +02:00
a26d31ee3a
Merge branch '6.1.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2024-06-05 00:02:33 +02:00
f58c7d80cc
Upgrade to SLF4J 2.0.13, Jetty 12.0.10, Netty 4.1.110, JRuby 9.4.7
2024-06-04 23:44:54 +02:00
870d15c0b6
Merge branch '6.1.x'
2024-05-27 16:44:19 +02:00
8feb842df5
Upgrade to AssertJ 3.26.0
...
See https://github.com/assertj/assertj/issues/3322
2024-05-27 16:43:22 +02:00
559fec052f
Merge branch '6.1.x'
2024-05-21 19:22:55 +02:00
58da30cd30
Upgrade to Jetty Reactive HttpClient 4.0.4
2024-05-21 19:22:20 +02:00
c69ab069b7
Upgrade to Reactor 2024.0.0-M2
...
Closes gh-32785
2024-05-14 22:03:38 +02:00
7c534eeeeb
Merge branch '6.1.x'
...
# Conflicts:
# framework-platform/framework-platform.gradle
2024-05-14 22:02:32 +02:00
Juergen Hoeller
Sam Brannen
rstoyanchev
Stéphane Nicoll
Sébastien Deleuze
Brian Clozel
Sébastien Deleuze
Simon Baslé
Dariusz Jędrzejczyk
Johnny Lim
gregw