This is an automated email from the ASF dual-hosted git repository. borinquenkid pushed a commit to branch 8.0.x-hibernate7 in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 8eae570169ab5fa6b7f0cd1c2d7070603a638cfd Author: Walter Duque de Estrada <[email protected]> AuthorDate: Thu Jun 18 15:31:26 2026 -0500 fix: restore TaskOutcome import in GrailsCodeStylePluginSpec; remove unused reactor.version Wrong merge choice left GrailsCodeStylePluginSpec using fully-qualified org.gradle.testkit.runner.TaskOutcome.SUCCESS in six places instead of the proper import that 8.0.x carries. reactor.version had no corresponding bomDependencies entry and was not referenced by any module in this project (grails-forge uses Micronaut BOM). Co-Authored-By: Claude Sonnet 4.6 <[email protected]> --- .../apache/grails/buildsrc/GrailsCodeStylePluginSpec.groovy | 13 +++++++------ dependencies.gradle | 1 - 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/GrailsCodeStylePluginSpec.groovy b/build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/GrailsCodeStylePluginSpec.groovy index 3620c119c1..46c9246992 100644 --- a/build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/GrailsCodeStylePluginSpec.groovy +++ b/build-logic/plugins/src/test/groovy/org/apache/grails/buildsrc/GrailsCodeStylePluginSpec.groovy @@ -19,6 +19,7 @@ package org.apache.grails.buildsrc import org.gradle.testkit.runner.GradleRunner +import org.gradle.testkit.runner.TaskOutcome import spock.lang.Specification import spock.lang.TempDir import java.nio.file.Path @@ -70,7 +71,7 @@ class Test{ .build() then: "task finished successfully" - result.task(':codenarcFix').outcome == org.gradle.testkit.runner.TaskOutcome.SUCCESS + result.task(':codenarcFix').outcome == TaskOutcome.SUCCESS and: "violations are fixed" def fixedContent = groovyFile.text @@ -101,7 +102,7 @@ class Test { .build() then: "task finished successfully" - result.task(':codenarcFix').outcome == org.gradle.testkit.runner.TaskOutcome.SUCCESS + result.task(':codenarcFix').outcome == TaskOutcome.SUCCESS and: "strings with single quotes are NOT changed to single quotes (which would break them)" def content = groovyFile.text @@ -127,7 +128,7 @@ class Test { .build() then: "task finished successfully" - result.task(':codenarcFix').outcome == org.gradle.testkit.runner.TaskOutcome.SUCCESS + result.task(':codenarcFix').outcome == TaskOutcome.SUCCESS and: "escaped quotes are NOT broken" groovyFile.text.contains('"\\"\\$it\\""') @@ -153,7 +154,7 @@ class Test { .build() then: "task finished successfully" - result.task(':codenarcFix').outcome == org.gradle.testkit.runner.TaskOutcome.SUCCESS + result.task(':codenarcFix').outcome == TaskOutcome.SUCCESS and: "method references are NOT broken" def content = groovyFile.text @@ -184,7 +185,7 @@ class Test { .build() then: "task finished successfully" - result.task(':codenarcFix').outcome == org.gradle.testkit.runner.TaskOutcome.SUCCESS + result.task(':codenarcFix').outcome == TaskOutcome.SUCCESS and: "adjacent GString boundaries are NOT fused" def content = groovyFile.text @@ -212,7 +213,7 @@ class Test { .build() then: "task finished successfully" - result.task(':codenarcFix').outcome == org.gradle.testkit.runner.TaskOutcome.SUCCESS + result.task(':codenarcFix').outcome == TaskOutcome.SUCCESS and: "double quotes inside single-quoted strings are NOT changed" def content = groovyFile.text diff --git a/dependencies.gradle b/dependencies.gradle index 6eb9fbd55b..8a24cf2889 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -89,7 +89,6 @@ ext { 'jquery.version' : '3.7.1', 'junit.version' : '6.0.3', 'mongodb.version' : '5.8.0', - 'reactor.version' : '3.8.5', 'rxjava.version' : '1.3.8', 'rxjava2.version' : '2.2.21', 'rxjava3.version' : '3.1.12',
