rstoyanchev
b5b9386be6
Polishing
...
Closes gh-31413
2023-10-13 11:47:47 +01:00
Olga MaciaszekSharma
0cd196e3dd
Add UriBuilderFactoryArgumentResolver
...
See gh-31413
2023-10-13 11:47:47 +01:00
Sam Brannen
364186e699
Polishing
2023-10-12 17:52:55 +02:00
Sam Brannen
047c2c1c20
Do not swallow failures in tests
2023-10-12 17:51:26 +02:00
Sam Brannen
a4fe57a9e2
Restore imports for deprecated types in tests
2023-10-12 17:35:01 +02:00
Stéphane Nicoll
1e7fc6035d
Merge branch '6.0.x'
2023-10-12 16:19:49 +02:00
Stéphane Nicoll
6669ab1ae7
Merge pull request #31416 from GVictorG7
...
* pr/31416:
Polish "Replace deprecated method getBuildDir()"
Replace deprecated method getBuildDir()
Closes gh-31416
2023-10-12 16:19:41 +02:00
Stéphane Nicoll
d05ac097dd
Polish "Replace deprecated method getBuildDir()"
...
See gh-31416
2023-10-12 16:14:23 +02:00
Victor Georgescu
35103b0cd1
Replace deprecated method getBuildDir()
...
See gh-31416
2023-10-12 16:10:40 +02:00
Stephane Nicoll
37c2619fc4
Add AOT support for TypedStringValue
...
This commit adds support for TypeStringValue when generating AOT code.
If the value does not specify an explicit type, it's specified as is.
Otherwise, the TypeStringValue instance is restored via the appropriate
code generation.
Closes gh-29074
2023-10-12 14:11:53 +02:00
Stéphane Nicoll
15c19411f6
Harmonize exception handling
...
This commit applies the same catch block to orderForConsistence(Map)
than the one that's used for sets.
Closes gh-31419
2023-10-12 13:55:33 +02:00
Brian Clozel
aab538d1f0
Merge branch '6.0.x'
2023-10-12 11:58:10 +02:00
Spring Builds
3b50f992fe
Next development version (v6.0.14-SNAPSHOT)
2023-10-12 09:28:10 +00:00
Brian Clozel
bb23032a78
Merge branch '6.0.x'
2023-10-11 19:16:41 +02:00
Brian Clozel
4bd54dffbc
Upgrade to concourse-release-scripts 0.4.0-SNAPSHOT
2023-10-11 19:16:06 +02:00
rstoyanchev
776e28a6c4
MockMvc supports filter initParams and DispatcherType's
...
Closes gh-27717, gh-31362
2023-10-11 17:09:18 +01:00
rstoyanchev
0542fe5232
Update ClientHttpRequestInterceptor javadoc
...
Clarify the interceptor is responsible for closing the response
if it throws an exception after receiving it.
Closes gh-29751
2023-10-11 17:09:18 +01:00
Juergen Hoeller
c7b832cfc8
Enforce REQUIRES_NEW for correct transaction configuration
...
Closes gh-31414
2023-10-11 17:14:32 +02:00
Juergen Hoeller
2cdc114273
Merge branch '6.0.x'
2023-10-11 16:11:34 +02:00
Juergen Hoeller
86650d1a39
Polishing
2023-10-11 16:10:53 +02:00
Juergen Hoeller
87424cd605
Upgrade to SLF4J 2.0.9 and AspectJ 1.9.20.1
2023-10-11 15:44:07 +02:00
Juergen Hoeller
80e82cd43f
Do not close transactional Connection in doReleaseConnection
...
Closes gh-28133
2023-10-11 15:43:02 +02:00
Sam Brannen
25778e2f0e
Clean up warnings in tests
2023-10-11 13:32:48 +02:00
Sam Brannen
00dde8bd88
Polishing
2023-10-11 13:32:47 +02:00
Juergen Hoeller
653a631df5
Merge branch '6.0.x'
...
# Conflicts:
# spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaDialect.java
2023-10-11 13:28:11 +02:00
rstoyanchev
3277b0d6ac
Handle STOMP messages to user destination in order
...
Closes gh-31395
2023-10-11 12:16:04 +01:00
Rossen Stoyanchev
9eb39e182e
Polishing
...
See gh-21798
2023-10-11 12:16:04 +01:00
rstoyanchev
a205eab618
Handle STOMP messages from client in order
...
See gh-21798
2023-10-11 12:16:04 +01:00
rstoyanchev
4195e6906c
OrderedMessageChannelDecorator supports multiple subscribers
...
See gh-21798
2023-10-11 12:16:04 +01:00
rstoyanchev
d62d7f5ff1
Polishing
...
See gh-21798
2023-10-11 12:16:04 +01:00
Juergen Hoeller
66ce8c9a25
Properly return SQLExceptionTranslator-provided exception
...
Closes gh-31409
2023-10-11 13:13:22 +02:00
Juergen Hoeller
e76b453685
Translate Hibernate TransactionException through SQLException cause
...
Closes gh-31274
2023-10-11 13:09:19 +02:00
OnlyWick
eafbcfd385
Remove redundant static declaration on Search class
...
Closes gh-31381
2023-10-11 13:01:21 +02:00
Brian Clozel
d1cf71cc70
Merge branch '6.0.x'
2023-10-11 11:24:00 +02:00
Brian Clozel
e9fcb21d55
Refine status KeyValue for HTTP server observations
...
Prior to this commit, a cancelled exchange would always result in an
`"status":"UNKNOWN"` KeyValue. This only applied to reactive variants,
as cancelled exchanges are not currently detected for Servlet
implementations.
In some cases, exchanges can be cancelled by clients before they are
completed, but the response was actually received by the client. The
response status information has been set by the application and the
response has been committed. For those cases, we shouldn't assume an
"UNKNOWN" value.
This commit assumes that committed responses have a response status set
by the application and that the observations should reflect that. From
now on, we only assume an "UNKNOWN" status if the response has not been
commited.
Fixes gh-31388
2023-10-11 11:17:38 +02:00
Arjen Poutsma
c692d7e020
Merge branch '6.0.x'
2023-10-11 10:37:26 +02:00
Arjen Poutsma
ee9dff30c5
Updated Java 17 version in sdkmanrc
2023-10-11 10:36:29 +02:00
Sébastien Deleuze
bbaa35e69e
Merge branch '6.0.x'
2023-10-11 10:13:12 +02:00
Sébastien Deleuze
2158410853
Revert "Support Jackson's DatatypeFeature in Jackson2ObjectMapperBuilder"
...
This reverts commit 5f053401e2 .
2023-10-11 10:10:36 +02:00
Stéphane Nicoll
dc0d6a41d6
Polish
2023-10-11 09:00:40 +02:00
Stéphane Nicoll
93206c3f6e
Add support for custom locale to render compiler messages
...
Closes gh-31408
2023-10-11 09:00:40 +02:00
Sébastien Deleuze
ae88bbaac3
Reintroduce org.springframework.http.client.reactive.ReactorResourceFactory
...
This commit reintroduces a deprecated ReactorResourceFactory in
org.springframework.http.client.reactive package that extends
the one in org.springframework.http.client package to avoid an
API breaking change and to provide a smoother upgrade experience.
Closes gh-31399
2023-10-11 08:38:17 +02:00
Juergen Hoeller
841448877a
Upgrade to Reactor 2023.0.0-RC1
...
Includes Jetty 12.0.2 and Checkstyle 10.12.4
Closes gh-31406
2023-10-11 00:46:24 +02:00
Juergen Hoeller
38de3d5b57
Merge branch '6.0.x'
...
# Conflicts:
# build.gradle
# framework-platform/framework-platform.gradle
# spring-context/src/main/java/org/springframework/context/support/AbstractApplicationContext.java
2023-10-11 00:19:54 +02:00
Juergen Hoeller
e0a55c2caa
Upgrade to Micrometer 1.10.12 and Reactor 2022.0.12
...
Includes Context Propagation 1.0.6, Netty 4.1.100, Jetty 11.0.17, Tomcat 10.1.14, Groovy 4.0.15, Mockito 5.6, Checkstyle 10.12.4
Closes gh-31404
Closes gh-31405
2023-10-11 00:13:51 +02:00
Juergen Hoeller
0b96da4b6d
Revise javadoc for LifecycleProcessor bean etc
2023-10-10 23:36:08 +02:00
Juergen Hoeller
c0d98fcc7a
Consistent Object result declarations for ResultQuerySpec
...
Closes gh-31403
2023-10-10 22:58:13 +02:00
Juergen Hoeller
de6692e7d8
Merge branch '6.0.x'
...
# Conflicts:
# spring-core/src/main/java/org/springframework/core/annotation/AnnotationTypeMapping.java
2023-10-10 21:58:31 +02:00
Juergen Hoeller
387a16bd4e
Revise transaction annotation recommendations
...
Closes gh-23538
2023-10-10 21:56:14 +02:00
Juergen Hoeller
8b5d993e61
Throw IllegalArgumentException for null SQL String
...
Closes gh-31391
2023-10-10 21:55:12 +02:00