Skip to content

Commit 3b87c87

Browse files
jhoellerjhoeller
committed
Merge branch '6.1.x'
2 parents 460ffbc + 723c94e commit 3b87c87

File tree

4 files changed

+35
-34
lines changed

4 files changed

+35
-34
lines changed

‎buildSrc/src/main/java/org/springframework/build/CheckstyleConventions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void apply(Project project) {
5050
project.getPlugins().apply(CheckstylePlugin.class);
5151
project.getTasks().withType(Checkstyle.class).forEach(checkstyle -> checkstyle.getMaxHeapSize().set("1g"));
5252
CheckstyleExtension checkstyle = project.getExtensions().getByType(CheckstyleExtension.class);
53-
checkstyle.setToolVersion("10.13.0");
53+
checkstyle.setToolVersion("10.14.1");
5454
checkstyle.getConfigDirectory().set(project.getRootProject().file("src/checkstyle"));
5555
String version = SpringJavaFormatPlugin.class.getPackage().getImplementationVersion();
5656
DependencySet checkstyleDependencies = project.getConfigurations().getByName("checkstyle").getDependencies();

‎framework-platform/framework-platform.gradle

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,27 +7,27 @@ javaPlatform {
77
}
88

99
dependencies {
10-
api(platform("com.fasterxml.jackson:jackson-bom:2.15.3"))
11-
api(platform("io.micrometer:micrometer-bom:1.12.3"))
10+
api(platform("com.fasterxml.jackson:jackson-bom:2.15.4"))
11+
api(platform("io.micrometer:micrometer-bom:1.12.4"))
1212
api(platform("io.netty:netty-bom:4.1.107.Final"))
1313
api(platform("io.netty:netty5-bom:5.0.0.Alpha5"))
14-
api(platform("io.projectreactor:reactor-bom:2023.0.3"))
14+
api(platform("io.projectreactor:reactor-bom:2023.0.4"))
1515
api(platform("io.rsocket:rsocket-bom:1.1.3"))
16-
api(platform("org.apache.groovy:groovy-bom:4.0.18"))
16+
api(platform("org.apache.groovy:groovy-bom:4.0.19"))
1717
api(platform("org.apache.logging.log4j:log4j-bom:2.21.1"))
1818
api(platform("org.assertj:assertj-bom:3.25.3"))
19-
api(platform("org.eclipse.jetty:jetty-bom:12.0.6"))
20-
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.6"))
19+
api(platform("org.eclipse.jetty:jetty-bom:12.0.7"))
20+
api(platform("org.eclipse.jetty.ee10:jetty-ee10-bom:12.0.7"))
2121
api(platform("org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3"))
2222
api(platform("org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0"))
2323
api(platform("org.junit:junit-bom:5.10.2"))
24-
api(platform("org.mockito:mockito-bom:5.10.0"))
24+
api(platform("org.mockito:mockito-bom:5.11.0"))
2525

2626
constraints {
2727
api("com.fasterxml:aalto-xml:1.3.2")
2828
api("com.fasterxml.woodstox:woodstox-core:6.5.1")
2929
api("com.github.ben-manes.caffeine:caffeine:3.1.8")
30-
api("com.github.librepdf:openpdf:1.3.41")
30+
api("com.github.librepdf:openpdf:1.3.42")
3131
api("com.google.code.findbugs:findbugs:3.0.1")
3232
api("com.google.code.findbugs:jsr305:3.0.2")
3333
api("com.google.code.gson:gson:2.10.1")
@@ -102,19 +102,19 @@ dependencies {
102102
api("org.apache.httpcomponents.client5:httpclient5:5.3.1")
103103
api("org.apache.httpcomponents.core5:httpcore5-reactive:5.2.4")
104104
api("org.apache.poi:poi-ooxml:5.2.5")
105-
api("org.apache.tomcat.embed:tomcat-embed-core:10.1.18")
106-
api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.18")
107-
api("org.apache.tomcat:tomcat-util:10.1.18")
108-
api("org.apache.tomcat:tomcat-websocket:10.1.18")
109-
api("org.aspectj:aspectjrt:1.9.21")
110-
api("org.aspectj:aspectjtools:1.9.21")
111-
api("org.aspectj:aspectjweaver:1.9.21")
105+
api("org.apache.tomcat.embed:tomcat-embed-core:10.1.19")
106+
api("org.apache.tomcat.embed:tomcat-embed-websocket:10.1.19")
107+
api("org.apache.tomcat:tomcat-util:10.1.19")
108+
api("org.apache.tomcat:tomcat-websocket:10.1.19")
109+
api("org.aspectj:aspectjrt:1.9.21.1")
110+
api("org.aspectj:aspectjtools:1.9.21.1")
111+
api("org.aspectj:aspectjweaver:1.9.21.1")
112112
api("org.awaitility:awaitility:4.2.0")
113113
api("org.bouncycastle:bcpkix-jdk18on:1.72")
114114
api("org.codehaus.jettison:jettison:1.5.4")
115115
api("org.crac:crac:1.4.0")
116116
api("org.dom4j:dom4j:2.1.4")
117-
api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.2")
117+
api("org.eclipse.jetty:jetty-reactive-httpclient:4.0.3")
118118
api("org.eclipse.persistence:org.eclipse.persistence.jpa:3.0.4")
119119
api("org.eclipse:yasson:2.0.4")
120120
api("org.ehcache:ehcache:3.10.8")

‎spring-core/src/test/java/org/springframework/core/io/ModuleResourceTests.java

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
class ModuleResourceTests {
3636

3737
private static final String existingPath = "java/beans/Introspector.class";
38+
3839
private static final String nonExistingPath = "org/example/NonExistingClass.class";
3940

4041

@@ -48,20 +49,10 @@ void existingClassFileResource() throws IOException {
4849
ModuleResource mr = new ModuleResource(Introspector.class.getModule(), existingPath);
4950
assertExistingResource(mr);
5051
assertThat(mr.getDescription()).startsWith("module resource").contains(mr.getModule().getName(), mr.getPath());
51-
System.err.println(mr.getDescription());
52-
5352
assertThat(mr.getContentAsByteArray()).isEqualTo(cpr.getContentAsByteArray());
5453
assertThat(mr.contentLength()).isEqualTo(cpr.contentLength());
5554
}
5655

57-
private static void assertExistingResource(Resource resource) {
58-
assertThat(resource.exists()).isTrue();
59-
assertThat(resource.isReadable()).isTrue();
60-
assertThat(resource.isOpen()).isFalse();
61-
assertThat(resource.isFile()).isFalse();
62-
assertThat(resource.getFilename()).isEqualTo("Introspector.class");
63-
}
64-
6556
@Test
6657
void nonExistingResource() {
6758
ModuleResource mr = new ModuleResource(Introspector.class.getModule(), nonExistingPath);
@@ -81,6 +72,7 @@ void equalsAndHashCode() {
8172
Resource resource1 = new ModuleResource(Introspector.class.getModule(), existingPath);
8273
Resource resource2 = new ModuleResource(Introspector.class.getModule(), existingPath);
8374
Resource resource3 = new ModuleResource(Introspector.class.getModule(), nonExistingPath);
75+
8476
assertThat(resource1).isEqualTo(resource1);
8577
assertThat(resource1).isEqualTo(resource2);
8678
assertThat(resource2).isEqualTo(resource1);
@@ -89,4 +81,13 @@ void equalsAndHashCode() {
8981
assertThat(resource1).doesNotHaveSameHashCodeAs(resource3);
9082
}
9183

84+
85+
private static void assertExistingResource(Resource resource) {
86+
assertThat(resource.exists()).isTrue();
87+
assertThat(resource.isReadable()).isTrue();
88+
assertThat(resource.isOpen()).isFalse();
89+
assertThat(resource.isFile()).isFalse();
90+
assertThat(resource.getFilename()).isEqualTo("Introspector.class");
91+
}
92+
9293
}

‎spring-core/src/test/java/org/springframework/core/io/support/PathMatchingResourcePatternResolverTests.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2023 the original author or authors.
2+
* Copyright 2002-2024 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -51,14 +51,14 @@
5151
*/
5252
class PathMatchingResourcePatternResolverTests {
5353

54-
private static final String[] CLASSES_IN_CORE_IO_SUPPORT = { "EncodedResource.class",
54+
private static final String[] CLASSES_IN_CORE_IO_SUPPORT = {"EncodedResource.class",
5555
"LocalizedResourceHelper.class", "PathMatchingResourcePatternResolver.class", "PropertiesLoaderSupport.class",
5656
"PropertiesLoaderUtils.class", "ResourceArrayPropertyEditor.class", "ResourcePatternResolver.class",
57-
"ResourcePatternUtils.class", "SpringFactoriesLoader.class" };
57+
"ResourcePatternUtils.class", "SpringFactoriesLoader.class"};
5858

59-
private static final String[] TEST_CLASSES_IN_CORE_IO_SUPPORT = { "PathMatchingResourcePatternResolverTests.class" };
59+
private static final String[] TEST_CLASSES_IN_CORE_IO_SUPPORT = {"PathMatchingResourcePatternResolverTests.class"};
6060

61-
private static final String[] CLASSES_IN_REACTOR_UTIL_ANNOTATION = { "NonNull.class", "NonNullApi.class", "Nullable.class" };
61+
private static final String[] CLASSES_IN_REACTOR_UTIL_ANNOTATION = {"NonNull.class", "NonNullApi.class", "Nullable.class"};
6262

6363

6464
private PathMatchingResourcePatternResolver resolver = new PathMatchingResourcePatternResolver();
@@ -329,8 +329,8 @@ private void assertExactSubPaths(String pattern, String pathPrefix, String... su
329329
}
330330

331331
private String getPath(Resource resource) {
332-
// Tests fail if we use resouce.getURL().getPath(). They would also fail on Mac OS when
333-
// using resouce.getURI().getPath() if the resource paths are not Unicode normalized.
332+
// Tests fail if we use resource.getURL().getPath(). They would also fail on macOS when
333+
// using resource.getURI().getPath() if the resource paths are not Unicode normalized.
334334
//
335335
// On the JVM, all tests should pass when using resouce.getFile().getPath(); however,
336336
// we use FileSystemResource#getPath since this test class is sometimes run within a

0 commit comments

Comments
 (0)