Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
47,465 Commits 23 Branches 0 Tags
52648d9d704b065db7c48100d0d5c1466e1db577
Commit Graph

3962 Commits

Author SHA1 Message Date
Moritz Halbritter
b0914f8632 Merge branch '3.2.x' 2024-02-19 14:31:54 +01: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
8574926210 Merge branch '3.2.x' 
Closes gh-39622
 2024-02-19 11:34:40 +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
Moritz Halbritter
8ec463c688 Polish "Change Banner declaration with new Java Syntax" 
See gh-39585
 2024-02-16 09:09:13 +01:00
qlido
9c57444464 Change Banner declaration with new Java Syntax 
See gh-39585
 2024-02-16 09:08:14 +01:00
Scott Frederick
51991d6f41 Merge branch '3.2.x' 
Closes gh-39536
 2024-02-13 13:11:50 -06: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
7f55cae90f Merge branch '3.2.x' 2024-02-12 10:19:46 +01: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
a62d4e620c Merge branch '3.2.x' 
Closes gh-39520
 2024-02-12 08:42:11 +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
2efb25c737 Merge branch '3.2.x' 
Closes gh-39516
 2024-02-11 15:09:47 -06: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
Moritz Halbritter
c0de2ba913 Merge branch '3.2.x' 
Closes gh-39365
 2024-02-01 08:56:21 +01: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
8f1a330dd5 Update copyright header of cleaned up code 
See gh-39259
 2024-01-23 10:18:50 -08:00
Phillip Webb
48343cc531 Polish 'Simplify stream chain operations' 
See gh-39259
 2024-01-23 10:18:50 -08:00
Tobias Lippert
7f4aaacf42 Simplify stream chain operations 
See gh-39259
 2024-01-23 10:18:49 -08:00
Tobias Lippert
cb26c31dd6 Replace explicit type with diamond operator 
See gh-39259
 2024-01-23 10:18:49 -08:00
Tobias Lippert
ac5a08a49b Avoid redundant boxing 
See gh-39259
 2024-01-23 10:18:49 -08:00
Phillip Webb
ddb769bf7f Polish 'Simplify conditionals' 
See gh-39259
 2024-01-23 09:47:07 -08:00
Tobias Lippert
65a1ff84e6 Simplify conditionals 
See gh-39259
 2024-01-23 09:07:40 -08:00
Tobias Lippert
def7523398 Inline redundant if statements 
See gh-39259
 2024-01-23 09:07:35 -08:00
Tobias Lippert
9cdd0c3776 Remove unnecessary semicolons 
See gh-39259
 2024-01-23 09:07:29 -08:00
Tobias Lippert
17902c9cec Remove unnecessary toString calls 
See gh-39259
 2024-01-23 09:07:00 -08:00
Phillip Webb
a0a804cfdf Merge branch '3.2.x' 2024-01-22 12:20:41 -08: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
686fe84a72 Merge branch '3.2.x' 
Closes gh-39232
 2024-01-17 15:58:25 -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
eeb508112e Upgrade to Tomcat 10.1.18 
Closes gh-39213
 2024-01-17 18:57:01 +00: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
Moritz Halbritter
7d4d8e955e Register classes that implement multiple Servlet interfaces 
Closes gh-39056
 2024-01-17 15:05:27 +01:00
Andy Wilkinson
d5d78e5b85 Merge branch '3.2.x' 
Closes gh-39168
 2024-01-17 13:03:39 +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
a7463c02cf Merge branch '3.2.x' 
Closes gh-39159
 2024-01-16 17:30:41 -06:00
Scott Frederick
90564d722d Merge branch '3.1.x' into 3.2.x 
Fixes gh-39158
 2024-01-16 17:06:17 -06:00