Commit Graph

3934 Commits

Author SHA1 Message Date
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
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 f586d2d6bb Merge branch '3.2.x'
Closes gh-39155
2024-01-16 11:56:48 -08: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
Scott Frederick 7851c2362e Remove APIs that were deprecated for removal in 3.3.0
See gh-39039
2024-01-12 16:09:36 -06:00
Andy Wilkinson d032b9d234 Merge branch '3.2.x'
Closes gh-39115
2024-01-12 11:11:50 +00:00
Andy Wilkinson a48e2d3539 Fix configuration property conversion for CharSequence inputs
Closes gh-39051
2024-01-12 11:09:29 +00:00
teacmity c6c7fbc15f Change log messages to use singular or plural instead of "noun(s)"
See gh-37017
2024-01-11 14:35:49 +00:00
Andy Wilkinson 9b8c45c35d Polish "Remove deprecated support for FailureAnalyzer setter injection"
See gh-38322
2024-01-11 14:08:32 +00:00
Zhiyang.Wang1 697b252957 Remove deprecated support for FailureAnalyzer setter injection
See gh-38322
2024-01-11 13:59:02 +00:00
Andy Wilkinson 17e9f0cb8e Merge branch '3.2.x'
Closes gh-39093
2024-01-11 11:36:38 +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
Andy Wilkinson 4b157ceaf2 Make web servers' started log messages more consistent
Closes gh-36149
2024-01-10 12:11:57 +00:00
Andy Wilkinson d2a3c8703a Add missing since javadoc to acceptTasksAfterContextClose
See gh-38968
2024-01-10 09:58:23 +00:00
Moritz Halbritter 1c411c2fc3 Polish "Add configuration property "spring.task.execution.pool.shutdown.accept-tasks-after-context-close""
See gh-38968
2024-01-10 10:38:28 +01:00
Yanming Zhou 0e53c0098f Add configuration property "spring.task.execution.pool.shutdown.accept-tasks-after-context-close"
ExecutorConfigurationSupport::setAcceptTasksAfterContextClose is
introduced since Spring Framework 6.1

See gh-38968
2024-01-10 10:37:15 +01:00
Moritz Halbritter 5650a547cf Merge branch '3.2.x'
Closes gh-39080
2024-01-10 10:31:33 +01: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 70eb941416 Merge branch '3.2.x'
Closes gh-39076
2024-01-10 09:41:48 +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
Jonatan Ivanov 820396fdff Add ProcessInfoContributor
This InfoContributor exposes information about
the process of the application.

See gh-38371
2024-01-10 08:45:49 +01:00
Moritz Halbritter 91d187ca38 Add property for max queue size for Tomcat
Co-authored-by: Ahmed A. Hussein <ahmedhussein411@gmail.com>

Closes gh-36087
2024-01-09 10:38:46 +01:00
Moritz Halbritter 98609e875d Include context path in reactive DefaultErrorAttributes
Closes gh-37269
2024-01-09 09:54:59 +01:00