From 49da92b6a3a67f015d04712abb1891cba7930e77 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 25 Sep 2024 13:53:34 +0200 Subject: [PATCH 1/2] Avoid http URL String (making checkstyleNohttp happy) See gh-33561 --- .../org/springframework/core/io/ResourceTests.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java index 4360faa5381..14882f0b743 100644 --- a/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java +++ b/spring-core/src/test/java/org/springframework/core/io/ResourceTests.java @@ -380,8 +380,8 @@ class ResourceTests { @Test void unusualRelativeResourcesAreEqual() throws Exception { Resource resource = new UrlResource("file:dir/"); - Resource relative = resource.createRelative("http://spring.io"); - assertThat(relative).isEqualTo(new UrlResource("file:dir/http://spring.io")); + Resource relative = resource.createRelative("https://spring.io"); + assertThat(relative).isEqualTo(new UrlResource("file:dir/https://spring.io")); } @Test @@ -422,14 +422,14 @@ class ResourceTests { @Test void useUserInfoToSetBasicAuth() throws Exception { startServer(); - UrlResource resource = new UrlResource("http://alice:secret@localhost:" - + this.server.getPort() + "/resource"); + UrlResource resource = new UrlResource( + "http://alice:secret@localhost:" + this.server.getPort() + "/resource"); assertThat(resource.getInputStream()).hasContent("Spring"); RecordedRequest request = this.server.takeRequest(); String authorization = request.getHeader("Authorization"); assertThat(authorization).isNotNull().startsWith("Basic "); - assertThat(new String(Base64.getDecoder().decode( - authorization.substring(6)), StandardCharsets.ISO_8859_1)).isEqualTo("alice:secret"); + assertThat(new String(Base64.getDecoder().decode(authorization.substring(6)), + StandardCharsets.ISO_8859_1)).isEqualTo("alice:secret"); } @AfterEach From f2b522211f678637d273ba3192ccda9c06a78db7 Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Wed, 25 Sep 2024 14:23:23 +0200 Subject: [PATCH 2/2] Upgrade to Groovy 4.0.23 --- framework-platform/framework-platform.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework-platform/framework-platform.gradle b/framework-platform/framework-platform.gradle index 7ab6286baf8..f3d8824e194 100644 --- a/framework-platform/framework-platform.gradle +++ b/framework-platform/framework-platform.gradle @@ -13,7 +13,7 @@ dependencies { api(platform("io.netty:netty5-bom:5.0.0.Alpha5")) api(platform("io.projectreactor:reactor-bom:2023.0.10")) api(platform("io.rsocket:rsocket-bom:1.1.3")) - api(platform("org.apache.groovy:groovy-bom:4.0.22")) + api(platform("org.apache.groovy:groovy-bom:4.0.23")) api(platform("org.apache.logging.log4j:log4j-bom:2.21.1")) api(platform("org.assertj:assertj-bom:3.26.3")) api(platform("org.eclipse.jetty:jetty-bom:12.0.13"))