Skip to content

Fix deprecated Gradle groovy dsl syntax on property assignments #14780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ allprojects {project ->

// Common tasks or meta-tasks.
tasks.register("tidy", {
description "Applies all code formatters and other enforced cleanups to the project."
group "verification"
description = "Applies all code formatters and other enforced cleanups to the project."
group = "verification"
})
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ configure(project(":lucene:benchmark")) {
dst = file("${dataDir}/${name}")
}

description "Download the ${ext.name} data set."
description = "Download the ${ext.name} data set."

outputs.file ext.dst

Expand All @@ -70,7 +70,7 @@ configure(project(":lucene:benchmark")) {
dst = file("${dataDir}/${name}")
}

description "Download the ${ext.name} data set."
description = "Download the ${ext.name} data set."

outputs.file ext.dst

Expand All @@ -96,7 +96,7 @@ configure(project(":lucene:benchmark")) {
dst = file("${dataDir}/${name}")
}

description "Download the ${ext.name} data set."
description = "Download the ${ext.name} data set."

outputs.file ext.dst

Expand All @@ -119,7 +119,7 @@ configure(project(":lucene:benchmark")) {
dst = file("${dataDir}/${name}")
}

description "Download the ${ext.name} data set."
description = "Download the ${ext.name} data set."

outputs.dir ext.dst

Expand All @@ -145,7 +145,7 @@ configure(project(":lucene:benchmark")) {
dst = file("${dataDir}/reuters-out")
}

description "Download the ${ext.name} data set."
description = "Download the ${ext.name} data set."

outputs.dir ext.dst

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ class ChangesToHtmlTask extends DefaultTask {
def output = new ByteArrayOutputStream()
def result = project.exec {
executable project.externalTool("perl")
standardInput changesFile.newInputStream()
standardOutput project.file("${targetDir.get().getAsFile()}/Changes.html").newOutputStream()
standardInput = changesFile.newInputStream()
standardOutput = project.file("${targetDir.get().getAsFile()}/Changes.html").newOutputStream()
errorOutput = output
ignoreExitValue = true

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ class ModularPathsExtension implements Cloneable, Iterable<Object> {
// otherwise get terribly confused.
Configuration modulePatchOnly = createModuleConfigurationForConvention(
SourceSet.isMain(sourceSet) ? "patchOnly" : sourceSet.name + "PatchOnly")
modulePatchOnly.canBeResolved(true)
modulePatchOnly.canBeResolved = (true)
moduleImplementation.extendsFrom(modulePatchOnly)
this.modulePatchOnlyConfiguration = modulePatchOnly

Expand All @@ -351,8 +351,8 @@ class ModularPathsExtension implements Cloneable, Iterable<Object> {
Closure<Configuration> createResolvableModuleConfiguration = { String configurationName ->
Configuration conventionConfiguration = configurations.maybeCreate(configurationName)
Configuration moduleConfiguration = configurations.maybeCreate(moduleConfigurationNameFor(conventionConfiguration.name))
moduleConfiguration.canBeConsumed(false)
moduleConfiguration.canBeResolved(true)
moduleConfiguration.canBeConsumed = false
moduleConfiguration.canBeResolved = true
ensureJarVariant(moduleConfiguration)

project.logger.info("Created resolvable module configuration for '${conventionConfiguration.name}': ${moduleConfiguration.name}")
Expand Down Expand Up @@ -565,8 +565,8 @@ class ModularPathsExtension implements Cloneable, Iterable<Object> {
ConfigurationContainer configurations = project.configurations
Configuration conventionConfiguration = configurations.maybeCreate(configurationName)
Configuration moduleConfiguration = configurations.maybeCreate(moduleConfigurationNameFor(configurationName))
moduleConfiguration.canBeConsumed(false)
moduleConfiguration.canBeResolved(false)
moduleConfiguration.canBeConsumed = false
moduleConfiguration.canBeResolved = false
conventionConfiguration.extendsFrom(moduleConfiguration)

project.logger.info("Created module configuration for '${conventionConfiguration.name}': ${moduleConfiguration.name}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -282,12 +282,12 @@ tasks.withType(Test).configureEach {
// Set up logging.
testLogging {
events TestLogEvent.FAILED
exceptionFormat TestExceptionFormat.FULL
showExceptions true
showCauses true
showStackTraces true
exceptionFormat = TestExceptionFormat.FULL
showExceptions = true
showCauses = true
showStackTraces = true
stackTraceFilters.clear()
showStandardStreams false
showStandardStreams = false
}

// Disable automatic test class detection, rely on class names only. This is needed for testing
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,8 @@ configure(rootProject.ext.mavenProjects) { Project project ->
url = apacheNexusReleasesRepository

credentials {
username asfNexusUsername.getOrElse(null)
password asfNexusPassword.getOrElse(null)
username = asfNexusUsername.getOrElse(null)
password = asfNexusPassword.getOrElse(null)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@ configure(rootProject.ext.mavenProjects) { Project project ->
url = apacheNexusSnapshotsRepository

credentials {
username asfNexusUsername.getOrElse(null)
password asfNexusPassword.getOrElse(null)
username = asfNexusUsername.getOrElse(null)
password = asfNexusPassword.getOrElse(null)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import java.nio.file.Files

configure(project(":lucene:expressions")) {
configurations {
Expand Down Expand Up @@ -54,7 +53,7 @@ configure(project(":lucene:expressions")) {
main = "org.antlr.v4.Tool"
classpath = configurations.antlr

ignoreExitValue false
ignoreExitValue = false
args = [
"-no-listener",
"-visitor",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ configure(project(":lucene:core")) {
plugins.withType(JavaPlugin) {
mrjarJavaVersions.each { jdkVersion ->
def task = tasks.create(name: "generateJdkApiJar${jdkVersion}", type: JavaExec) {
description "Regenerate the API-only JAR file with public Panama Vector API from JDK ${jdkVersion}"
group "generation"
description = "Regenerate the API-only JAR file with public Panama Vector API from JDK ${jdkVersion}"
group = "generation"

javaLauncher = javaToolchains.launcherFor {
languageVersion = JavaLanguageVersion.of(jdkVersion)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -254,12 +254,12 @@ configure([

// Copy the description and group from the source task.
project.afterEvaluate {
conditionalTask.group sourceTask.group
conditionalTask.description sourceTask.description + " (if sources changed)"
conditionalTask.group = sourceTask.group
conditionalTask.description = sourceTask.description + " (if sources changed)"

// Hide low-level tasks from help.
sourceTask.group = null
sourceTask.description sourceTask.description + " (low-level)"
sourceTask.description = sourceTask.description + " (low-level)"
}

// Set conditional execution only if checksum mismatch occurred.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ configure(project(":lucene:analysis:icu")) {
main = "org.apache.lucene.analysis.icu.GenerateUTR30DataFiles"
classpath = sourceSets.tools.runtimeClasspath

ignoreExitValue false
ignoreExitValue = false
workingDir utr30DataDir
args = [
"release-${icu4jVersion.replace(".", "-")}"
Expand Down Expand Up @@ -146,7 +146,7 @@ configure(project(":lucene:analysis:icu")) {
main = "org.apache.lucene.analysis.icu.RBBIRuleCompiler"
classpath = sourceSets.tools.runtimeClasspath

ignoreExitValue false
ignoreExitValue = false
enableAssertions true
args = [sourceDir, targetDir]
}
Expand Down Expand Up @@ -255,8 +255,8 @@ configure(project(":lucene:analysis:common")) {
def icuConfig = rootProject.configurations.icu_current
def outputFile = file("src/java/org/apache/lucene/analysis/util/UnicodeProps.java")

description "Regenerate ${outputFile} (with ${icuConfig.name})"
group "generation"
description = "Regenerate ${outputFile} (with ${icuConfig.name})"
group = "generation"

dependsOn icuConfig

Expand Down Expand Up @@ -293,8 +293,8 @@ configure(project(":lucene:core")) {
def icuConfig = rootProject.configurations.icu_current
def outputFile = file("src/java/org/apache/lucene/util/automaton/CaseFolding.java")

description "Regenerate ${outputFile} (with ${icuConfig.name})"
group "generation"
description = "Regenerate ${outputFile} (with ${icuConfig.name})"
group = "generation"

dependsOn icuConfig

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ def skeletonNoBufferExpansion = file("${resources}/skeleton.disable.buffer.expan

configure(project(":lucene:core")) {
task generateStandardTokenizerInternal(type: JFlexTask) {
description "Regenerate StandardTokenizerImpl.java"
group "generation"
description = "Regenerate StandardTokenizerImpl.java"
group = "generation"

jflexFile = file('src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex')
skeleton = skeletonNoBufferExpansion
Expand Down Expand Up @@ -68,8 +68,8 @@ configure(project(":lucene:analysis:common")) {
def jflexMacro = file("src/java/org/apache/lucene/analysis/email/ASCIITLD.jflex")
def tldList = file("src/test/org/apache/lucene/analysis/email/TLDs.txt")

description "Regenerate top-level domain jflex macros and tests"
group "generation"
description = "Regenerate top-level domain jflex macros and tests"
group = "generation"

dependsOn { sourceSets.tools.runtimeClasspath }

Expand All @@ -84,7 +84,7 @@ configure(project(":lucene:analysis:common")) {
main = "org.apache.lucene.analysis.standard.GenerateJflexTLDMacros"
classpath = sourceSets.tools.runtimeClasspath

ignoreExitValue false
ignoreExitValue = false
args = [
tldZones,
tmpJflexMacro,
Expand Down Expand Up @@ -115,24 +115,24 @@ configure(project(":lucene:analysis:common")) {
}

task generateWikipediaTokenizerInternal(type: JFlexTask) {
description "Regenerate WikipediaTokenizerImpl.java"
group "generation"
description = "Regenerate WikipediaTokenizerImpl.java"
group = "generation"

jflexFile = file('src/java/org/apache/lucene/analysis/wikipedia/WikipediaTokenizerImpl.jflex')
skeleton = skeletonDefault
}

task generateClassicTokenizerInternal(type: JFlexTask) {
description "Regenerate ClassicTokenizerImpl.java"
group "generation"
description = "Regenerate ClassicTokenizerImpl.java"
group = "generation"

jflexFile = file('src/java/org/apache/lucene/analysis/classic/ClassicTokenizerImpl.jflex')
skeleton = skeletonDefault
}

task generateUAX29URLEmailTokenizerInternal(type: JFlexTask) {
description "Regenerate UAX29URLEmailTokenizerImpl.java"
group "generation"
description = "Regenerate UAX29URLEmailTokenizerImpl.java"
group = "generation"

jflexFile = file('src/java/org/apache/lucene/analysis/email/UAX29URLEmailTokenizerImpl.jflex')
skeleton = skeletonNoBufferExpansion
Expand Down Expand Up @@ -201,8 +201,8 @@ configure(project(":lucene:analysis:common")) {
}

task generateHTMLStripCharFilterInternal(type: JFlexTask) {
description "Regenerate HTMLStripCharFilter.java"
group "generation"
description = "Regenerate HTMLStripCharFilter.java"
group = "generation"

// Add included files as inputs.
inputs.file file('src/java/org/apache/lucene/analysis/charfilter/HTMLCharacterEntities.jflex')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ configure(project(":lucene:analysis:kuromoji")) {
}

task compileMecab(type: Download) {
description "Recompile dictionaries from Mecab data."
group "generation"
description = "Recompile dictionaries from Mecab data."
group = "generation"

dependsOn deleteDictionaryData
dependsOn sourceSets.main.runtimeClasspath
Expand Down Expand Up @@ -93,8 +93,8 @@ configure(project(":lucene:analysis:kuromoji")) {
}

task compileNaist(type: Download) {
description "Recompile dictionaries from Naist data."
group "generation"
description = "Recompile dictionaries from Naist data."
group = "generation"

dependsOn deleteDictionaryData
dependsOn sourceSets.main.runtimeClasspath
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ configure(project(":lucene:core")) {
}

task moman() {
description "Regenerate Moman-based sources."
group "generation"
description = "Regenerate Moman-based sources."
group = "generation"

def extraConfig = [
andThenTasks: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ configure(project(":lucene:analysis:nori")) {
}

task compileMecabKo(type: Download) {
description "Recompile dictionaries from Mecab-Ko data."
group "generation"
description = "Recompile dictionaries from Mecab-Ko data."
group = "generation"

dependsOn deleteDictionaryData
dependsOn sourceSets.main.runtimeClasspath
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ configure(project(":lucene:test-framework")) {
def genScript = file("${genDir}/generateEmojiTokenizationTest.pl")
def genOutput = file("${genDir}/EmojiTokenizationTestUnicode_${unicodeVersion.replace('.', '_')}.java")

description "Regenerate ${genOutput}"
group "generation"
description = "Regenerate ${genOutput}"
group = "generation"

inputs.file genScript
inputs.property "unicodeVersion", unicodeVersion
Expand Down Expand Up @@ -59,8 +59,8 @@ configure(project(":lucene:test-framework")) {
def genScript = file("${genDir}/generateJavaUnicodeWordBreakTest.pl")
def genOutput = file("${genDir}/WordBreakTestUnicode_${unicodeVersion.replace('.', '_')}.java")

description "Regenerate ${genOutput}"
group "generation"
description = "Regenerate ${genOutput}"
group = "generation"

inputs.file genScript
inputs.property "unicodeVersion", unicodeVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ allprojects {

standardOutput = wrapped
errorOutput = wrapped
ignoreExitValue true
ignoreExitValue = true
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ def lintTasks = sourceSets.collect { SourceSet sourceSet ->
}

def ecjLint = tasks.register("ecjLint", {
description "Lint Java sources using ECJ."
group "Verification"
description = "Lint Java sources using ECJ."
group = "Verification"

dependsOn lintTasks
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ if (owaspOption.get() || gradle.startParameter.taskNames.contains("owasp")) {
}

def owaspTask = tasks.register("owasp", {
group "Verification"
description "Check project dependencies against OWASP vulnerability database."
group = "Verification"
description = "Check project dependencies against OWASP vulnerability database."
dependsOn "dependencyCheckAggregate"
})

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ configure(allprojects) { prj ->
plugins.withType(JavaPlugin).configureEach {
spotless {
java {
lineEndings(LineEnding.UNIX)
lineEndings = LineEnding.UNIX
endWithNewline()
googleJavaFormat(deps.versions.googleJavaFormat.get())

Expand Down
Loading