diff --git a/buildSrc/src/main/java/org/springframework/build/TestConventions.java b/buildSrc/src/main/java/org/springframework/build/TestConventions.java index 649204b932b..34b7eeff6c1 100644 --- a/buildSrc/src/main/java/org/springframework/build/TestConventions.java +++ b/buildSrc/src/main/java/org/springframework/build/TestConventions.java @@ -71,7 +71,7 @@ class TestConventions { "junit.platform.discovery.issue.severity.critical", "INFO" )); if (project.hasProperty("testGroups")) { - test.systemProperty("testGroups", project.getProperties().get("testGroups")); + test.systemProperty("testGroups", project.findProperty("testGroups")); } test.jvmArgs( "--add-opens=java.base/java.lang=ALL-UNNAMED", @@ -82,7 +82,7 @@ class TestConventions { private void configureByteBuddyAgent(Project project) { if (project.hasProperty("byteBuddyVersion")) { - String byteBuddyVersion = (String) project.getProperties().get("byteBuddyVersion"); + String byteBuddyVersion = (String) project.findProperty("byteBuddyVersion"); Configuration byteBuddyAgentConfig = project.getConfigurations().create("byteBuddyAgentConfig"); byteBuddyAgentConfig.setTransitive(false); Dependency byteBuddyAgent = project.getDependencies().create("net.bytebuddy:byte-buddy-agent:" + byteBuddyVersion); diff --git a/framework-api/framework-api.gradle b/framework-api/framework-api.gradle index d2ad72f356e..97e39ac9220 100644 --- a/framework-api/framework-api.gradle +++ b/framework-api/framework-api.gradle @@ -15,8 +15,8 @@ repositories { } dependencies { - moduleProjects.each { moduleProject -> - javadoc moduleProject + rootProject.ext.moduleProjects.each { moduleProject -> + javadoc project(moduleProject.path) } } @@ -52,7 +52,7 @@ javadoc { // ensure the javadoc process can resolve types compiled from .aj sources springAspectsOutput ) - classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath }) + classpath += files(rootProject.ext.moduleProjects.collect { it.sourceSets.main.compileClasspath }) } } @@ -96,7 +96,7 @@ tasks.register('schemaZip', Zip) { description = "Builds -${archiveClassifier} archive containing all " + "XSDs for deployment at https://springframework.org/schema." duplicatesStrategy = DuplicatesStrategy.EXCLUDE - moduleProjects.each { module -> + rootProject.ext.moduleProjects.each { module -> def Properties schemas = new Properties(); module.sourceSets.main.resources.find { diff --git a/framework-bom/framework-bom.gradle b/framework-bom/framework-bom.gradle index 840f20537fa..da45bac746c 100644 --- a/framework-bom/framework-bom.gradle +++ b/framework-bom/framework-bom.gradle @@ -8,7 +8,7 @@ group = "org.springframework" dependencies { constraints { parent.moduleProjects.sort { "$it.name" }.each { - api it + api project(it.path) } } } diff --git a/gradle/ide.gradle b/gradle/ide.gradle index 65928c8686e..a6d561e76b3 100644 --- a/gradle/ide.gradle +++ b/gradle/ide.gradle @@ -7,7 +7,6 @@ apply plugin: 'eclipse' eclipse.jdt { sourceCompatibility = 17 targetCompatibility = 17 - javaRuntimeName = "JavaSE-17" } // Replace classpath entries with project dependencies (GRADLE-1116)