From da1d00be7a765d88cb5da3d745d29d74e04a85d5 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Wed, 30 Aug 2023 13:19:11 +0200
Subject: [PATCH] Fix dependency management in framework-docs module

See gh-31049
---
 build.gradle                       | 24 ++++++++++++++----------
 framework-api/framework-api.gradle | 11 -----------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/build.gradle b/build.gradle
index bb357f0a6a..d6cf49ed03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,6 +42,20 @@ configure(allprojects) { project ->
 	}
 }
 
+configure(allprojects - project(":framework-platform")) {
+	configurations {
+		dependencyManagement {
+			canBeConsumed = false
+			canBeResolved = false
+			visible = false
+		}
+		matching { it.name.endsWith("Classpath") }.all { it.extendsFrom(dependencyManagement) }
+	}
+	dependencies {
+		dependencyManagement(enforcedPlatform(dependencies.project(path: ":framework-platform")))
+	}
+}
+
 configure([rootProject] + javaProjects) { project ->
 	group = "org.springframework"
 
@@ -51,17 +65,7 @@ configure([rootProject] + javaProjects) { project ->
 	apply from: "${rootDir}/gradle/toolchains.gradle"
 	apply from: "${rootDir}/gradle/ide.gradle"
 
-	configurations {
-		dependencyManagement {
-			canBeConsumed = false
-			canBeResolved = false
-			visible = false
-		}
-		matching { it.name.endsWith("Classpath") }.all { it.extendsFrom(dependencyManagement) }
-	}
-
 	dependencies {
-		dependencyManagement(enforcedPlatform(dependencies.project(path: ":framework-platform")))
 		testImplementation("org.junit.jupiter:junit-jupiter-api")
 		testImplementation("org.junit.jupiter:junit-jupiter-params")
 		testImplementation("org.junit.platform:junit-platform-suite-api")
diff --git a/framework-api/framework-api.gradle b/framework-api/framework-api.gradle
index 31b2a096c7..c551d6aa0e 100644
--- a/framework-api/framework-api.gradle
+++ b/framework-api/framework-api.gradle
@@ -13,18 +13,7 @@ repositories {
 	}
 }
 
-configurations {
-	dependencyManagement {
-		canBeConsumed = false
-		canBeResolved = false
-		visible = false
-	}
-	matching { it.name.endsWith("Classpath") }.all { it.extendsFrom(dependencyManagement) }
-}
-
-
 dependencies {
-	dependencyManagement(enforcedPlatform(dependencies.project(path: ":framework-platform")))
 	rootProject.subprojects.findAll { it.name.startsWith("spring-") }.each { moduleProject ->
 		javadoc moduleProject
 	}