From a62699ccfc2474fe6cdeb693a4534b56fb335033 Mon Sep 17 00:00:00 2001
From: Brian Clozel <brian.clozel@broadcom.com>
Date: Tue, 13 Jan 2026 09:30:46 +0100
Subject: [PATCH] Further Gradle deprecation fixes

Closes gh-36132
---
 .../build/shadow/ShadowSource.java               |  2 +-
 framework-api/framework-api.gradle               |  3 ++-
 spring-core/spring-core.gradle                   | 16 ++++++++++------
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/buildSrc/src/main/java/org/springframework/build/shadow/ShadowSource.java b/buildSrc/src/main/java/org/springframework/build/shadow/ShadowSource.java
index 7fb7e1b2d9a..6e3528f063b 100644
--- a/buildSrc/src/main/java/org/springframework/build/shadow/ShadowSource.java
+++ b/buildSrc/src/main/java/org/springframework/build/shadow/ShadowSource.java
@@ -78,7 +78,7 @@ public class ShadowSource extends DefaultTask {
 	}
 
 	@OutputDirectory
-	DirectoryProperty getOutputDirectory() {
+	public DirectoryProperty getOutputDirectory() {
 		return this.outputDirectory;
 	}
 
diff --git a/framework-api/framework-api.gradle b/framework-api/framework-api.gradle
index 978ff802e6d..b2b1b285e9a 100644
--- a/framework-api/framework-api.gradle
+++ b/framework-api/framework-api.gradle
@@ -20,6 +20,7 @@ dependencies {
 	}
 }
 
+def springAspectsOutput = project(":spring-aspects").sourceSets.main.output
 javadoc {
 	javadocTool.set(javaToolchains.javadocToolFor({
 		languageVersion = JavaLanguageVersion.of(25)
@@ -49,7 +50,7 @@ javadoc {
 	doFirst {
 		classpath += files(
 				// ensure the javadoc process can resolve types compiled from .aj sources
-				project(":spring-aspects").sourceSets.main.output
+                springAspectsOutput
 		)
 		classpath += files(moduleProjects.collect { it.sourceSets.main.compileClasspath })
 	}
diff --git a/spring-core/spring-core.gradle b/spring-core/spring-core.gradle
index cd88a0ee6d1..1ee626f732c 100644
--- a/spring-core/spring-core.gradle
+++ b/spring-core/spring-core.gradle
@@ -26,17 +26,19 @@ configurations {
 	graalvm
 }
 
+def javaPoetConfig = configurations.javapoet
 tasks.register('javapoetRepackJar', ShadowJar) {
 	archiveBaseName = 'spring-javapoet-repack'
 	archiveVersion = javapoetVersion
-	configurations = [project.configurations.javapoet]
+	configurations = [javaPoetConfig]
 	relocate('com.palantir.javapoet', 'org.springframework.javapoet')
 }
 
+def javaPoetDir = project.file("build/shadow-source/javapoet")
 tasks.register('javapoetSource', ShadowSource) {
-	configurations = [project.configurations.javapoet]
+	configurations = [javaPoetConfig]
 	relocate('com.palantir.javapoet', 'org.springframework.javapoet')
-	outputDirectory = file("build/shadow-source/javapoet")
+	outputDirectory = javaPoetDir
 }
 
 tasks.register('javapoetSourceJar', Jar) {
@@ -46,17 +48,19 @@ tasks.register('javapoetSourceJar', Jar) {
 	from javapoetSource
 }
 
+def objenesisConfig = configurations.objenesis
 tasks.register('objenesisRepackJar', ShadowJar) {
 	archiveBaseName = 'spring-objenesis-repack'
 	archiveVersion = objenesisVersion
-	configurations = [project.configurations.objenesis]
+	configurations = [objenesisConfig]
 	relocate('org.objenesis', 'org.springframework.objenesis')
 }
 
+def objenesisDir = project.file("build/shadow-source/objenesis")
 tasks.register('objenesisSource', ShadowSource) {
-	configurations = [project.configurations.objenesis]
+	configurations = [objenesisConfig]
 	relocate('org.objenesis', 'org.springframework.objenesis')
-	outputDirectory = file("build/shadow-source/objenesis")
+	outputDirectory = objenesisDir
 }
 
 tasks.register('objenesisSourceJar', Jar) {