Commit Graph

3897 Commits

Author SHA1 Message Date
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
Phillip Webb 246a0e6f21 Merge branch '3.1.x'
Closes gh-38878
2023-12-19 23:10:49 -08:00
Yanming Zhou 8cb8999772 Ban call of URLEncoder.encode/URLDecoder.decode(String,String)
Add ArchUnit rules to ban the use of `URLEncoder` calls with String
charsets and use `Charset` calls instead.

See gh-38740
2023-12-19 23:10:18 -08:00
Phillip Webb 5354ad15b3 Merge branch '3.1.x'
Closes gh-38877
2023-12-19 22:51:48 -08:00
Yanming Zhou 8599e5a986 Remove unnecessary `toString()` calls
See gh-38739
2023-12-19 22:38:34 -08:00
Yanming Zhou d3a51e56b7 Remove unnecessary `static` modifiers
See gh-38739
2023-12-19 22:38:08 -08:00
Yanming Zhou ac18e3015c Use `.isEmpty()` where feasible
See gh-38739
2023-12-19 22:38:05 -08:00
Iliès BELDJILALI e39d1d14ea Hide application name placeholder when include property is false
Update log4j configuration so that an empty value is used when
`LOGGED_APPLICATION_NAME` is missing. Prior to this commit when
`logging.include-application-name` was `false` the logged output
would include the raw `${sys:LOGGED_APPLICATION_NAME}` value.

See gh-38847
2023-12-19 22:08:13 -08:00
Phillip Webb 92a4a1194d Polish 2023-12-15 12:08:11 -08:00
Phillip Webb b08d441021 Merge branch '3.1.x'
Closes gh-38837
2023-12-15 11:43:47 -08:00
Phillip Webb 13fb450563 Don't call runners in parent ApplicationContext
Update `SpringApplication` so that `ApplicationRunner` and
`CommandLineRunner` beans are not considered from the parent
`ApplicationContext`.

The restores the behavior that applied before commit 7d6532cac4
whilst still retaining the correct run order.

Fixes gh-38647
2023-12-15 11:42:26 -08:00
Phillip Webb 26dc14031e Update `LoadedPemSslStore` to use lazy loading
Update `LoadedPemSslStore` so that it loads content lazily. This
restores the behavior of Spring Boot 3.1 and allows bundles to be
defined with files that don't exist as long as they are never accessed.

Fixes gh-38659
2023-12-14 22:03:07 -08:00
Andy Wilkinson 5915db09e6 Merge branch '3.1.x' 2023-12-14 20:17:29 +00:00
Andy Wilkinson 85cfa4798c Close jar to allow it to be cleaned up after test execution
See gh-38766
2023-12-14 20:16:23 +00:00
Brian Clozel e44e0c8f1e Remove ErrorAttributes.ERROR_ATTRIBUTE
This commit removes the now defunkt `ErrorAttributes.ERROR_ATTRIBUTE`
that was introduce to register handled errors as metrics. This has been
replaced since 3.0 by a direct support in Spring Framework and had no
effect whatsoever since that release.

This also updates the documentation to point to the Framework mechanism
that replaced it.

Fixes gh-33731
2023-12-14 11:26:45 +01:00
Andy Wilkinson 8c5b7a87ae Adapt to latest changes in the locking model for context close
See gh-38666
2023-12-14 10:21:48 +00:00
Phillip Webb a9efa96d8a Merge branch '3.1.x'
Closes gh-38770
2023-12-13 16:53:20 -08:00
Phillip Webb da31137596 Ensure that StaticResourceJars does not close cached jars
Update `StaticResourceJars` so that jars obtained via a
`JarURLConnection` are only closed when caches are not being used.

Fixes gh-38766
2023-12-13 16:51:02 -08:00
Andy Wilkinson 612bf95b05 Adapt to changes in the locking model for closing an app context
See gh-38666
2023-12-12 14:51:06 +00:00
Phillip Webb 0fe7d78732 Restore support for custom bind converters in collections
Update the `beansConverterService` introduced in commit f4e05c91c7
so that it can also handle collection based conversions.

Fixes gh-38734
2023-12-11 17:05:27 -08:00
Moritz Halbritter 6330190913 Merge branch '3.1.x'
Closes gh-38728
2023-12-11 09:44:19 +01:00
Yanming Zhou ebfbc0ef05 Cleanup kotlin sources
1. remove unused imports
2. remove redundant semicolon
3. remove empty class body
4. remove redundant 'constructor' keyword
5. remove redundant 'Unit' return type
6. use non-null type if possible

See gh-38708
2023-12-11 09:23:42 +01:00
Moritz Halbritter ad5b844e1f Fix checkstyle issues
MissingParametersFailureAnalyzer looks like it has been commited by
accident.
2023-12-06 11:22:54 +01:00
Phillip Webb b5de38787c Restore `Session.Cookie` class for binary back-compatibility
Fixes gh-38589
2023-12-05 15:00:26 -08:00
Phillip Webb ffdd405fb1 Update NoUniqueBeanDefinitionFailureAnalyzer with parameter hints
Add addition description and action text to help point to the
fact that the `NoUniqueBeanDefinitionException` can be thrown
due to a missing `-parameters` compiler setting.

Closes gh-38652
2023-12-05 15:00:26 -08:00
Phillip Webb ce7d384d2c Add MissingParametersFailureAnalyzer
Add a new failure analyzer that provides hints whenever parameter
names cannot be discovered.

Closes gh-38603
2023-12-05 15:00:26 -08:00
Phillip Webb f609022731 Add suppressed missing parameters exception from ValueObjectBinder
Update `DataObjectBinder` interface and `ValueObjectBinder`
implementation so that suppressed exceptions are added whenever
parameter names cannot be discovered.

See gh-38603
2023-12-05 14:58:49 -08:00