mirror of
https://github.com/spring-projects/spring-framework.git
synced 2026-09-17 08:24:13 +00:00
Further Gradle deprecation fixes
Closes gh-36132
This commit is contained in:
@@ -78,7 +78,7 @@ public class ShadowSource extends DefaultTask {
|
||||
}
|
||||
|
||||
@OutputDirectory
|
||||
DirectoryProperty getOutputDirectory() {
|
||||
public DirectoryProperty getOutputDirectory() {
|
||||
return this.outputDirectory;
|
||||
}
|
||||
|
||||
|
||||
@@ -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 })
|
||||
}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user