Update deprecated Gradle task creation
Backport Bot / build (push) Waiting to run Details
Build and Deploy Snapshot / Build and Deploy Snapshot (push) Waiting to run Details
Build and Deploy Snapshot / Verify (push) Blocked by required conditions Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:false version:17], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:21], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
CI / ${{ matrix.os.name}} | Java ${{ matrix.java.version}} (map[toolchain:true version:23], map[id:ubuntu-latest name:Linux]) (push) Waiting to run Details
Deploy Docs / Dispatch docs deployment (push) Waiting to run Details

This commit replaces use of the deprecated Gradle `task` method with
the new `tasks.register` method.

Closes gh-34617

Signed-off-by: Dmitry Sulman <dmitry.sulman@gmail.com>
This commit is contained in:
Dmitry Sulman 2025-03-19 10:30:19 +02:00 committed by Sam Brannen
parent adb4b675fc
commit 5455c645f0
3 changed files with 11 additions and 10 deletions

View File

@ -98,7 +98,7 @@ if (project.name == "spring-oxm") {
} }
// Include project specific settings // Include project specific settings
task eclipseSettings(type: Copy) { tasks.register('eclipseSettings', Copy) {
from rootProject.files( from rootProject.files(
'src/eclipse/org.eclipse.core.resources.prefs', 'src/eclipse/org.eclipse.core.resources.prefs',
'src/eclipse/org.eclipse.jdt.core.prefs', 'src/eclipse/org.eclipse.jdt.core.prefs',
@ -107,7 +107,7 @@ task eclipseSettings(type: Copy) {
outputs.upToDateWhen { false } outputs.upToDateWhen { false }
} }
task cleanEclipseSettings(type: Delete) { tasks.register('cleanEclipseSettings', Delete) {
delete project.file('.settings/org.eclipse.core.resources.prefs') delete project.file('.settings/org.eclipse.core.resources.prefs')
delete project.file('.settings/org.eclipse.jdt.core.prefs') delete project.file('.settings/org.eclipse.jdt.core.prefs')
delete project.file('.settings/org.eclipse.jdt.ui.prefs') delete project.file('.settings/org.eclipse.jdt.ui.prefs')

View File

@ -87,14 +87,15 @@ javadoc {
logging.captureStandardOutput LogLevel.INFO // suppress "## warnings" message logging.captureStandardOutput LogLevel.INFO // suppress "## warnings" message
} }
task sourcesJar(type: Jar, dependsOn: classes) { tasks.register('sourcesJar', Jar) {
dependsOn classes
duplicatesStrategy = DuplicatesStrategy.EXCLUDE duplicatesStrategy = DuplicatesStrategy.EXCLUDE
archiveClassifier.set("sources") archiveClassifier.set("sources")
from sourceSets.main.allSource from sourceSets.main.allSource
// Don't include or exclude anything explicitly by default. See SPR-12085. // Don't include or exclude anything explicitly by default. See SPR-12085.
} }
task javadocJar(type: Jar) { tasks.register('javadocJar', Jar) {
archiveClassifier.set("javadoc") archiveClassifier.set("javadoc")
from javadoc from javadoc
} }

View File

@ -25,40 +25,40 @@ configurations {
graalvm graalvm
} }
task javapoetRepackJar(type: ShadowJar) { tasks.register('javapoetRepackJar', ShadowJar) {
archiveBaseName = 'spring-javapoet-repack' archiveBaseName = 'spring-javapoet-repack'
archiveVersion = javapoetVersion archiveVersion = javapoetVersion
configurations = [project.configurations.javapoet] configurations = [project.configurations.javapoet]
relocate('com.squareup.javapoet', 'org.springframework.javapoet') relocate('com.squareup.javapoet', 'org.springframework.javapoet')
} }
task javapoetSource(type: ShadowSource) { tasks.register('javapoetSource', ShadowSource) {
configurations = [project.configurations.javapoet] configurations = [project.configurations.javapoet]
relocate('com.squareup.javapoet', 'org.springframework.javapoet') relocate('com.squareup.javapoet', 'org.springframework.javapoet')
outputDirectory = file("build/shadow-source/javapoet") outputDirectory = file("build/shadow-source/javapoet")
} }
task javapoetSourceJar(type: Jar) { tasks.register('javapoetSourceJar', Jar) {
archiveBaseName = 'spring-javapoet-repack' archiveBaseName = 'spring-javapoet-repack'
archiveVersion = javapoetVersion archiveVersion = javapoetVersion
archiveClassifier = 'sources' archiveClassifier = 'sources'
from javapoetSource from javapoetSource
} }
task objenesisRepackJar(type: ShadowJar) { tasks.register('objenesisRepackJar', ShadowJar) {
archiveBaseName = 'spring-objenesis-repack' archiveBaseName = 'spring-objenesis-repack'
archiveVersion = objenesisVersion archiveVersion = objenesisVersion
configurations = [project.configurations.objenesis] configurations = [project.configurations.objenesis]
relocate('org.objenesis', 'org.springframework.objenesis') relocate('org.objenesis', 'org.springframework.objenesis')
} }
task objenesisSource(type: ShadowSource) { tasks.register('objenesisSource', ShadowSource) {
configurations = [project.configurations.objenesis] configurations = [project.configurations.objenesis]
relocate('org.objenesis', 'org.springframework.objenesis') relocate('org.objenesis', 'org.springframework.objenesis')
outputDirectory = file("build/shadow-source/objenesis") outputDirectory = file("build/shadow-source/objenesis")
} }
task objenesisSourceJar(type: Jar) { tasks.register('objenesisSourceJar', Jar) {
archiveBaseName = 'spring-objenesis-repack' archiveBaseName = 'spring-objenesis-repack'
archiveVersion = objenesisVersion archiveVersion = objenesisVersion
archiveClassifier = 'sources' archiveClassifier = 'sources'