Skip to content

Commit 073cfd4

Browse files
committed
Merge branch '6.1.x'
2 parents 885f650 + f2b5222 commit 073cfd4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

framework-platform/framework-platform.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dependencies {
1313
api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
1414
api(platform("io.projectreactor:reactor-bom:2024.0.0-M6"))
1515
api(platform("io.rsocket:rsocket-bom:1.1.3"))
16-
api(platform("org.apache.groovy:groovy-bom:4.0.22"))
16+
api(platform("org.apache.groovy:groovy-bom:4.0.23"))
1717
api(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
1818
api(platform("org.assertj:assertj-bom:3.26.3"))
1919
api(platform("org.eclipse.jetty:jetty-bom:12.0.13"))

spring-core/src/test/java/org/springframework/core/io/ResourceTests.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -379,8 +379,8 @@ void relativeResourcesAreEqual() throws Exception {
379379
@Test
380380
void unusualRelativeResourcesAreEqual() throws Exception {
381381
Resource resource = new UrlResource("file:dir/");
382-
Resource relative = resource.createRelative("http://spring.io");
383-
assertThat(relative).isEqualTo(new UrlResource("file:dir/http://spring.io"));
382+
Resource relative = resource.createRelative("https://spring.io");
383+
assertThat(relative).isEqualTo(new UrlResource("file:dir/https://spring.io"));
384384
}
385385

386386
@Test
@@ -421,14 +421,14 @@ void canCustomizeHttpUrlConnectionForRead() throws Exception {
421421
@Test
422422
void useUserInfoToSetBasicAuth() throws Exception {
423423
startServer();
424-
UrlResource resource = new UrlResource("http://alice:secret@localhost:"
425-
+ this.server.getPort() + "/resource");
424+
UrlResource resource = new UrlResource(
425+
"http://alice:secret@localhost:" + this.server.getPort() + "/resource");
426426
assertThat(resource.getInputStream()).hasContent("Spring");
427427
RecordedRequest request = this.server.takeRequest();
428428
String authorization = request.getHeader("Authorization");
429429
assertThat(authorization).isNotNull().startsWith("Basic ");
430-
assertThat(new String(Base64.getDecoder().decode(
431-
authorization.substring(6)), StandardCharsets.ISO_8859_1)).isEqualTo("alice:secret");
430+
assertThat(new String(Base64.getDecoder().decode(authorization.substring(6)),
431+
StandardCharsets.ISO_8859_1)).isEqualTo("alice:secret");
432432
}
433433

434434
@AfterEach

0 commit comments

Comments
 (0)