From 7a839e988a729af47f658828008ec885869e54e3 Mon Sep 17 00:00:00 2001
From: Sam Brannen <104798+sbrannen@users.noreply.github.com>
Date: Mon, 17 Mar 2025 17:48:22 +0100
Subject: [PATCH] Make dependencies on AssertJ and JUnit in spring-core-test
 optional

This commit also removes unnecessary dependencies in
spring-core-test.gradle and updates framework-docs.gradle accordingly.

Closes gh-34612
---
 framework-docs/framework-docs.gradle     | 5 +++--
 spring-core-test/spring-core-test.gradle | 9 ++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/framework-docs/framework-docs.gradle b/framework-docs/framework-docs.gradle
index 5850c2f51d..38da4496b8 100644
--- a/framework-docs/framework-docs.gradle
+++ b/framework-docs/framework-docs.gradle
@@ -45,6 +45,7 @@ dependencies {
 	api(project(":spring-aspects"))
 	api(project(":spring-context"))
 	api(project(":spring-context-support"))
+	api(project(":spring-core-test"))
 	api(project(":spring-jdbc"))
 	api(project(":spring-jms"))
 	api(project(":spring-test"))
@@ -66,9 +67,9 @@ dependencies {
 	api("org.apache.activemq:activemq-ra:6.1.2")
 	api("org.apache.commons:commons-dbcp2:2.11.0")
 	api("org.aspectj:aspectjweaver")
+	api("org.assertj:assertj-core")
 	api("org.eclipse.jetty.websocket:jetty-websocket-jetty-api")
 	api("org.jetbrains.kotlin:kotlin-stdlib")
+	api("org.junit.jupiter:junit-jupiter-api")
 
-	implementation(project(":spring-core-test"))
-	implementation("org.assertj:assertj-core")
 }
diff --git a/spring-core-test/spring-core-test.gradle b/spring-core-test/spring-core-test.gradle
index 55f2a8b8f4..a398ed30c3 100644
--- a/spring-core-test/spring-core-test.gradle
+++ b/spring-core-test/spring-core-test.gradle
@@ -2,11 +2,10 @@ description = "Spring Core Test"
 
 dependencies {
 	api(project(":spring-core"))
-	api("org.assertj:assertj-core")
-	api("org.junit.jupiter:junit-jupiter-api")
-	compileOnly("org.junit.jupiter:junit-jupiter")
-	compileOnly("org.junit.platform:junit-platform-engine")
-	compileOnly("org.junit.platform:junit-platform-launcher")
+	optional("org.assertj:assertj-core")
+	optional("org.junit.jupiter:junit-jupiter-api")
+	compileOnly("org.junit.jupiter:junit-jupiter-params") // Used in CompileWithForkedClassLoaderExtension Javadoc
+	compileOnly("org.junit.platform:junit-platform-launcher") // Used in CompileWithForkedClassLoaderExtension
 	implementation("com.thoughtworks.qdox:qdox")
 }