Andy Wilkinson
e8acbc1fba
Add TWENTY_TWO to JavaVersion enum
...
Closes gh-39825
2024-03-04 10:15:59 +00:00
Andy Wilkinson
8efdc1e46d
Add CI for Java 22
...
Closes gh-39746
2024-03-04 10:07:28 +00:00
Andy Wilkinson
753bbf4785
Register new Logback converter for reflection in a native image
...
See gh-39564
2024-03-01 10:25:09 +00:00
Andy Wilkinson
ba3602b8b7
Fix handling of application names containing parenthesis
...
Closes gh-39564
2024-02-29 15:55:11 +00:00
Moritz Halbritter
256cdcd51b
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39786
2024-02-28 13:18:24 +01:00
Tim Grohmann
bd6edeaa94
Allow creation of SpringProfileArbiter without Environment
...
See gh-39403
2024-02-28 13:07:43 +01:00
Phillip Webb
12de6aa46a
Merge branch '3.1.x' into 3.2.x
2024-02-21 15:27:27 -08:00
Phillip Webb
2c4909a89a
Update copyright year of changed files
2024-02-21 13:58:53 -08:00
Andy Wilkinson
71e3a92f3c
Upgrade to Tomcat 10.1.19
...
Closes gh-39673
2024-02-21 21:22:18 +00:00
Andy Wilkinson
2581c5c87a
Upgrade to Tomcat 10.1.19
...
Closes gh-39663
2024-02-21 20:10:57 +00:00
Moritz Halbritter
1e45d5cfa2
Merge branch '3.1.x' into 3.2.x
2024-02-19 14:31:46 +01:00
Moritz Halbritter
6d27c0a933
Fix SpringApplicationBannerPrinterTests on Windows
2024-02-19 14:22:18 +01:00
Moritz Halbritter
68637fa86c
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39621
2024-02-19 11:34:33 +01:00
Moritz Halbritter
ea2f273cf8
Polish "Fix local dependent writing of banner into ByteArrayOutputStream"
...
See gh-39601
2024-02-19 11:33:57 +01:00
Thorsten Schmidt
f82a5e10db
Fix local dependent writing of banner into ByteArrayOutputStream
...
See gh-39601
2024-02-19 11:12:12 +01:00
Scott Frederick
720e9cef16
Make RestTemplateBuilder more compatible with RestClient.Builder
...
When Spring Framework builds a `RestClient` from a `RestTemplate`, it
will use any `UriTemplateHandler` that has been set on the
`RestTemplate` if the provided `UriTemplateHandler` is also a
`UriBuilderFactory`. Prior to this commit, Spring Boot's
`RestTemplateBuilder#rootUri` set a `UriTemplateHandler` on the created
`RestTemplate`, but it was not a `UriBuilderFactory` so `RestClient`
would not consider it.
With this commit, `RestTemplateBuilder#rootUri` sets a
`UriTemplateHandler` that is also a `UriBuilderFactory` so that any
root URI that is set on the `RestTemplateBuilder` will be applied to a
`RestClient` also.
Fixes gh-39317
2024-02-13 13:10:55 -06:00
Moritz Halbritter
4387b79831
Merge branch '3.1.x' into 3.2.x
2024-02-12 10:18:46 +01:00
Moritz Halbritter
8ffcfc9b77
Harmonize style of igored exceptions across the codebase
2024-02-12 10:14:20 +01:00
Moritz Halbritter
81bfadb3ab
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39519
2024-02-12 08:42:01 +01:00
dev-chpark
c1df48f969
Rename exception variable name
...
See gh-39518
2024-02-12 08:41:16 +01:00
Scott Frederick
5df64afe97
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39515
2024-02-11 15:09:35 -06:00
Scott Frederick
f90f29dd12
Polish "Resolve property placeholders when binding properties to a Map"
...
See gh-39507
2024-02-11 15:05:48 -06:00
wanger26
8292104d20
Resolve property placeholders when binding properties to a Map
...
Add call to placeholder resolver to ensure property placeholders
are resolved for the `MapBinder`
See gh-39507
Signed-off-by: wanger26 <jakobwanger@gmail.com >
2024-02-11 15:03:34 -06:00
Onur Kagan Ozcan
0df3ec2ef3
Remove System.out usage from Jetty GracefulShutdown
...
See gh-39360
2024-02-01 08:48:00 +01:00
Phillip Webb
cff8cb98c7
Merge branch '3.1.x' into 3.2.x
2024-01-22 12:20:24 -08:00
Phillip Webb
e1986ea11e
Update copyright year of changed files
2024-01-22 12:20:06 -08:00
Phillip Webb
0f53415451
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39231
2024-01-17 15:58:14 -08:00
Phillip Webb
bc52ac6459
Polish 'Reactor PemPrivateKeyParser to use DerElement'
...
See gh-39162
2024-01-17 15:51:29 -08:00
Wzy19930507
cc6303f574
Reactor PemPrivateKeyParser to use DerElement
...
Update `PemPrivateKeyParser` so that the algorithm is read using
DerElement whenever possible.
See gh-39162
2024-01-17 15:49:19 -08:00
Andy Wilkinson
f6fbd105f0
Upgrade to Tomcat 10.1.18
...
Closes gh-39196
2024-01-17 15:58:07 +00:00
Andy Wilkinson
e2420caefd
Upgrade to Tomcat 10.1.18
...
Closes gh-39183
2024-01-17 14:29:27 +00:00
Andy Wilkinson
aec4550b02
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39167
2024-01-17 13:00:22 +00:00
Andy Wilkinson
a7d52226d5
Polish "Improve toString of SslBundle implementations"
...
See gh-39137
2024-01-17 11:50:34 +00:00
amparab
b49ccbb0c2
Improve toString of SslBundle implementations
...
See gh-39137
2024-01-17 11:37:18 +00:00
Scott Frederick
90564d722d
Merge branch '3.1.x' into 3.2.x
...
Fixes gh-39158
2024-01-16 17:06:17 -06:00
Scott Frederick
47b1c41dac
Allow server.ssl properties to mix PEM and JKS certificate types
...
Prior to the introduction of SSL bundles, the `server.ssl` properties
allowed PEM and JKS certificate files types to be mixed when
configuring keystores and truststores. This was lost when adapting to
SSL bundles using `WebServerSslBundle`. This commit restores the
previous behavior for back compatibility.
Fixes gh-39105
2024-01-16 16:26:28 -06:00
Phillip Webb
837047ab79
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39154
2024-01-16 11:56:37 -08:00
Phillip Webb
e23e431f10
Polish 'Remove unreachable throw code'
...
See gh-39107
2024-01-16 11:36:18 -08:00
BenchmarkingBuffalo
a4ae6600ef
Remove unreachable throw code
...
Improve `SpringApplication` by removing the unreachable throw statement
in favor of returning an exception from `handleRunFailure`. This commit
also removes the if statements in favor of dedicated catch blocks.
See gh-39107
2024-01-16 11:35:49 -08:00
Andy Wilkinson
a48e2d3539
Fix configuration property conversion for CharSequence inputs
...
Closes gh-39051
2024-01-12 11:09:29 +00:00
Andy Wilkinson
7087897507
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39091
2024-01-11 10:33:57 +00:00
Andy Wilkinson
45c32854a5
Fix Checkstyle upgrade
...
Closes gh-38746
2024-01-10 15:37:38 +00:00
Moritz Halbritter
66dc72da46
Polish "Fix Jetty ConnectionLimit configuration"
...
See gh-39052
2024-01-10 10:17:38 +01:00
Onur Kagan Ozcan
7113c10b08
Fix Jetty ConnectionLimit configuration
...
See gh-39052
2024-01-10 10:12:27 +01:00
Moritz Halbritter
748a80c448
Merge branch '3.1.x' into 3.2.x
...
Closes gh-39075
2024-01-10 09:41:41 +01:00
Moritz Halbritter
47e8f6168f
Polish "Fix error mark position for PatternParseException"
...
See gh-38944
2024-01-10 09:21:03 +01:00
Fabrice Bibonne
fccce54d52
Fix error mark position for PatternParseException
...
PatternParseException.toDetailedString() return a String
with a mark to specify the error position in the pattern.
The mark takes place in the second line in the String
returned. Because PatternParseFailureAnalyzer.analyze
appended "Invalid mapping pattern detected:" at the
beginning of the returned String, the mark was not well
positioned.
Now, a "\n" is inserted after "Invalid mapping pattern detected:"
and the mark is well positioned
See gh-38944
2024-01-10 09:14:04 +01:00
Andy Wilkinson
735df3597f
Merge branch '3.1.x'
...
Closes gh-38963
2024-01-03 15:13:27 +00:00
Andy Wilkinson
c10f78ec5a
Improve handling of Throwable from logging system init
...
Closes gh-38885
2024-01-03 15:13:05 +00:00
Andy Wilkinson
00cf1a6d13
Remove unnecessary configuration of idle timeout
...
Fixes gh-38960
2024-01-03 11:37:01 +00:00