Skip to content

Commit 2647136

Browse files
committed
Update to Spring-Boot 4.0.0-M2
1 parent 45ea0a0 commit 2647136

File tree

2 files changed

+2
-36
lines changed

2 files changed

+2
-36
lines changed

pom.xml

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -65,40 +65,6 @@
6565
<url>https://github.com/adobe/S3Mock/tree/main</url>
6666
</scm>
6767

68-
<repositories>
69-
<!-- TODO: remove after upgrading to Spring Boot 4 release in November -->
70-
<repository>
71-
<id>spring-milestones</id>
72-
<name>Spring Milestone Repository</name>
73-
<url>https://repo.spring.io/milestone</url>
74-
</repository>
75-
<repository>
76-
<id>spring-snapshots</id>
77-
<name>Spring Snapshot Repository</name>
78-
<url>https://repo.spring.io/snapshot</url>
79-
<snapshots>
80-
<enabled>true</enabled>
81-
</snapshots>
82-
</repository>
83-
</repositories>
84-
85-
<pluginRepositories>
86-
<!-- TODO: remove after upgrading to Spring Boot 4 release in November -->
87-
<pluginRepository>
88-
<id>spring-milestones</id>
89-
<name>Spring Milestone Repository</name>
90-
<url>https://repo.spring.io/milestone</url>
91-
</pluginRepository>
92-
<pluginRepository>
93-
<id>spring-snapshots</id>
94-
<name>Spring Snapshot Repository</name>
95-
<url>https://repo.spring.io/snapshot</url>
96-
<snapshots>
97-
<enabled>true</enabled>
98-
</snapshots>
99-
</pluginRepository>
100-
</pluginRepositories>
101-
10268
<distributionManagement>
10369
<repository>
10470
<id>ossrh</id>
@@ -163,7 +129,7 @@
163129
<skipDocker>false</skipDocker>
164130
<sortpom-maven-plugin.version>4.0.0</sortpom-maven-plugin.version>
165131
<!-- TODO: update to 4.0.0 after Spring Boot 4 release in November -->
166-
<spring-boot.version>4.0.0-M1</spring-boot.version>
132+
<spring-boot.version>4.0.0-M2</spring-boot.version>
167133
<testcontainers.version>1.21.3</testcontainers.version>
168134
<testng.version>7.11.0</testng.version>
169135
<xmlunit-assertj3.version>2.10.3</xmlunit-assertj3.version>

server/src/test/kotlin/com/adobe/testing/s3mock/ObjectControllerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1132,7 +1132,7 @@ internal class ObjectControllerTest : BaseControllerTest() {
11321132
).thenReturn(s3ObjectMetadata)
11331133

11341134
val headers = HttpHeaders().apply {
1135-
this[HttpHeaders.IF_MATCH] = listOf("\"etag-123\"")
1135+
this[HttpHeaders.IF_MATCH] = "\"etag-123\""
11361136
this[AwsHttpHeaders.X_AMZ_SDK_CHECKSUM_ALGORITHM] = "CRC32"
11371137
contentType = MediaType.APPLICATION_OCTET_STREAM
11381138
}

0 commit comments

Comments
 (0)