Merge branch '6.1.x'

# Conflicts:
#	buildSrc/src/main/java/org/springframework/build/TestConventions.java
This commit is contained in:
Sam Brannen
2024-07-04 17:05:38 +02:00
4 changed files with 54 additions and 21 deletions

View File

@@ -65,7 +65,6 @@ class TestConventions {
test.jvmArgs(
"--add-opens=java.base/java.lang=ALL-UNNAMED",
"--add-opens=java.base/java.util=ALL-UNNAMED",
"-Djava.locale.providers=COMPAT",
"-Xshare:off"
);
}