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 bb357f0a6a9..d6cf49ed033 100644
--- a/build.gradle
+++ b/build.gradle
@@ -42,15 +42,7 @@ configure(allprojects) { project ->
 	}
 }
 
-configure([rootProject] + javaProjects) { project ->
-	group = "org.springframework"
-
-	apply plugin: "java"
-	apply plugin: "java-test-fixtures"
-	apply plugin: 'org.springframework.build.conventions'
-	apply from: "${rootDir}/gradle/toolchains.gradle"
-	apply from: "${rootDir}/gradle/ide.gradle"
-
+configure(allprojects - project(":framework-platform")) {
 	configurations {
 		dependencyManagement {
 			canBeConsumed = false
@@ -59,9 +51,21 @@ configure([rootProject] + javaProjects) { project ->
 		}
 		matching { it.name.endsWith("Classpath") }.all { it.extendsFrom(dependencyManagement) }
 	}
-
 	dependencies {
 		dependencyManagement(enforcedPlatform(dependencies.project(path: ":framework-platform")))
+	}
+}
+
+configure([rootProject] + javaProjects) { project ->
+	group = "org.springframework"
+
+	apply plugin: "java"
+	apply plugin: "java-test-fixtures"
+	apply plugin: 'org.springframework.build.conventions'
+	apply from: "${rootDir}/gradle/toolchains.gradle"
+	apply from: "${rootDir}/gradle/ide.gradle"
+
+	dependencies {
 		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 31b2a096c78..c551d6aa0eb 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
 	}