Skip to content

Bump spring-boot.version from 4.0.0 to 4.0.1 #2855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dependabot merged 2 commits into from
Dec 21, 2025
Merged

Bump spring-boot.version from 4.0.0 to 4.0.1 #2855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cb42bf0
Bump spring-boot.version from 4.0.0 to 4.0.1
dependabot[bot] Dec 18, 2025
aa00df4
fix: declare types as nullable in Converters
afranken Dec 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@
<!-- Run Docker build by default -->
<skipDocker>false</skipDocker>
<sortpom-maven-plugin.version>4.0.0</sortpom-maven-plugin.version>
<spring-boot.version>4.0.0</spring-boot.version>
<spring-boot.version>4.0.1</spring-boot.version>
<testcontainers.version>2.0.2</testcontainers.version>
<testng.version>7.11.0</testng.version>
<xmlunit-assertj3.version>2.11.0</xmlunit-assertj3.version>
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/kotlin/com/adobe/testing/s3mock/controller/ChecksumModeHeaderConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import org.springframework.core.convert.converter.Converter
* Example: x-amz-checksum-mode: ENABLED
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html)
*/
open class ChecksumModeHeaderConverter : Converter<String, ChecksumMode> {
open class ChecksumModeHeaderConverter : Converter<String, ChecksumMode?> {
override fun convert(source: String): ChecksumMode? {
return ChecksumMode.fromValue(source)
}
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/kotlin/com/adobe/testing/s3mock/controller/HttpRangeHeaderConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package com.adobe.testing.s3mock.controller
import org.springframework.core.convert.converter.Converter
import org.springframework.http.HttpRange

open class HttpRangeHeaderConverter : Converter<String, HttpRange> {
open class HttpRangeHeaderConverter : Converter<String, HttpRange?> {
override fun convert(source: String): HttpRange? =
HttpRange.parseRanges(source).firstOrNull()
}
2 changes: 1 addition & 1 deletion server/src/main/kotlin/com/adobe/testing/s3mock/controller/ObjectCannedAclHeaderConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import org.springframework.core.convert.converter.Converter
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/userguide/acl-overview.html)
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/userguide/acl-overview.html#canned-acl)
*/
open class ObjectCannedAclHeaderConverter : Converter<String, ObjectCannedACL> {
open class ObjectCannedAclHeaderConverter : Converter<String, ObjectCannedACL?> {
override fun convert(source: String): ObjectCannedACL? {
return ObjectCannedACL.fromValue(source)
}
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/kotlin/com/adobe/testing/s3mock/controller/ObjectOwnershipHeaderConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import org.springframework.core.convert.converter.Converter
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/API_OwnershipControlsRule.html)
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/userguide/about-object-ownership.html)
*/
open class ObjectOwnershipHeaderConverter : Converter<String, ObjectOwnership> {
open class ObjectOwnershipHeaderConverter : Converter<String, ObjectOwnership?> {
override fun convert(source: String): ObjectOwnership? {
return ObjectOwnership.fromValue(source)
}
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/kotlin/com/adobe/testing/s3mock/controller/RegionConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import org.springframework.core.convert.converter.Converter
* Example: bucket-region: us-east-1
* [API Reference](https://docs.aws.amazon.com/general/latest/gr/rande.html#s3_region)
*/
open class RegionConverter : Converter<String, Region> {
open class RegionConverter : Converter<String, Region?> {
override fun convert(source: String): Region? {
return Region.fromValue(source)
}
Expand Down
2 changes: 1 addition & 1 deletion server/src/main/kotlin/com/adobe/testing/s3mock/controller/TaggingHeaderConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import tools.jackson.dataformat.xml.XmlMapper
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html)
* [API Reference](https://docs.aws.amazon.com/AmazonS3/latest/API/RESTObjectPOST.html)
*/
class TaggingHeaderConverter(private val xmlMapper: XmlMapper) : Converter<String, List<Tag>> {
class TaggingHeaderConverter(private val xmlMapper: XmlMapper) : Converter<String, List<Tag>?> {

override fun convert(source: String): List<Tag>? {
val value = source.trim()
Expand Down