Merge 6.2.x to 7.0.x #13718
Merged
Merge 6.2.x to 7.0.x #13718
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
….3 (apache#13362) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Currently, CI_GROOVY_VERSION does not make the build properly override the groovy version. This changes the workflow from using CI_GROOVY_VERSION environment variable to overriding groovyVersion property via a Gradle environment variable project property.
This commit changes the behavior of the GrailsApplicationPostProcessor so that it no longer creates a new plugin manager if a plugin manager already exists in the application context. Resolves apache#11767 Related grails/grails-functional-tests#208
…de to Groovy 4 (apache#13386) * Remove/Replace deprecated Groovy classes to prepare upgrade to Groovy 4 * feat(dep): Update dependency grails-plugin-converters to 5.0.0 * Revert changes related to JsonSlurper and XmlSlurper from GrailsMockHttpServletRequest
Conflicts: .github/workflows/groovy-joint-workflow.yml .github/workflows/release.yml build.gradle gradle.properties grails-bom/plugins.properties grails-core/src/test/groovy/grails/util/GrailsUtilTests.java grails-databinding/src/test/groovy/grails/databinding/SimpleDataBinderSpec.groovy grails-docs/build.gradle grails-shell/src/main/groovy/org/grails/cli/profile/AbstractProfile.groovy grails-test-suite-persistence/build.gradle grails-test-suite-uber/build.gradle grails-test-suite-web/build.gradle settings.gradle
…re upgrade to Groovy 4 (apache#13386)" This reverts commit e2061a8. # Conflicts: # gradle.properties # grails-databinding/src/test/groovy/grails/databinding/SimpleDataBinderSpec.groovy
The dependency on `org.codehaus.groovy.modules.http-builder:http-builder` is unused and sometimes the `0.7.2` cannot be resolved causing build failures.
Merge Missing Changes from 6.1.x into 6.2.x
…to prepare upgrade to Groovy 4 (apache#13386)"" This reverts commit a7f00c7.
Conflicts: .github/workflows/gradle.yml .github/workflows/groovy-joint-workflow.yml .github/workflows/retry-release.yml build.gradle gradle.properties grails-console/src/main/groovy/grails/ui/shell/support/GroovyshApplicationContext.groovy grails-core/src/main/groovy/grails/beans/util/LazyBeanMap.groovy grails-core/src/main/groovy/grails/boot/config/GrailsApplicationPostProcessor.groovy grails-core/src/main/groovy/grails/util/GrailsUtil.java grails-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy grails-core/src/test/groovy/org/grails/exception/reporting/StackTracePrinterSpec.groovy grails-databinding/src/test/groovy/grails/databinding/XMLBindingSpec.groovy grails-plugin-mimetypes/src/test/groovy/grails/web/mime/MimeUtilitySpec.groovy grails-shell/src/main/groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderSpec.groovy grails-test-suite-uber/src/test/groovy/grails/persistence/EntityTransformTests.groovy grails-test-suite-uber/src/test/groovy/grails/test/mixin/unique/UniqueConstraintOnHasOneSpec.groovy grails-test-suite-uber/src/test/groovy/org/grails/commons/MultipleClassesPerFileTests.groovy grails-test-suite-uber/src/test/groovy/org/grails/commons/UrlMappingsArtefactHandlerTests.groovy grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestTests.groovy grails-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalDomainClassJsonRendererSpec.groovy grails-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalDomainClassXmlRendererSpec.groovy grails-test-suite-web/src/test/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRendererSpec.groovy grails-test-suite-web/src/test/groovy/org/grails/web/binding/JSONBindingToNullSpec.groovy grails-test/src/main/groovy/org/grails/plugins/testing/AbstractGrailsMockHttpServletResponse.groovy grails-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy
matrei approved these changes Oct 2, 2024
...-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderBindingXmlSpec.groovy Outdated Show resolved Hide resolved
jamesfredley approved these changes Oct 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit. This suggestion is invalid because no changes were made to the code. Suggestions cannot be applied while the pull request is closed. Suggestions cannot be applied while viewing a subset of changes. Only one suggestion per line can be applied in a batch. Add this suggestion to a batch that can be applied as a single commit. Applying suggestions on deleted lines is not supported. You must change the existing code in this line in order to create a valid suggestion. Outdated suggestions cannot be applied. This suggestion has been applied or marked resolved. Suggestions cannot be applied from pending reviews. Suggestions cannot be applied on multi-line comments. Suggestions cannot be applied while the pull request is queued to merge. Suggestion cannot be applied right now. Please check back later.
I'm assuming the latest changes in 7.0.x were correct 99% of the time so I mostly took those changes in the merge conflict. This commit also reverts the revert we did in 6.2.x for groovy 4.
Conflicts:
.github/workflows/gradle.yml
.github/workflows/groovy-joint-workflow.yml
.github/workflows/retry-release.yml
build.gradle
gradle.properties
grails-console/src/main/groovy/grails/ui/shell/support/GroovyshApplicationContext.groovy
grails-core/src/main/groovy/grails/beans/util/LazyBeanMap.groovy
grails-core/src/main/groovy/grails/boot/config/GrailsApplicationPostProcessor.groovy
grails-core/src/main/groovy/grails/util/GrailsUtil.java
grails-core/src/main/groovy/org/grails/compiler/injection/GlobalGrailsClassInjectorTransformation.groovy
grails-core/src/test/groovy/org/grails/exception/reporting/StackTracePrinterSpec.groovy
grails-databinding/src/test/groovy/grails/databinding/XMLBindingSpec.groovy
grails-plugin-mimetypes/src/test/groovy/grails/web/mime/MimeUtilitySpec.groovy
grails-shell/src/main/groovy/org/grails/cli/boot/GrailsDependencyVersions.groovy
grails-test-suite-persistence/src/test/groovy/grails/web/databinding/GrailsWebDataBinderSpec.groovy
grails-test-suite-uber/src/test/groovy/grails/persistence/EntityTransformTests.groovy
grails-test-suite-uber/src/test/groovy/grails/test/mixin/unique/UniqueConstraintOnHasOneSpec.groovy
grails-test-suite-uber/src/test/groovy/org/grails/commons/MultipleClassesPerFileTests.groovy
grails-test-suite-uber/src/test/groovy/org/grails/commons/UrlMappingsArtefactHandlerTests.groovy
grails-test-suite-uber/src/test/groovy/org/grails/plugins/testing/GrailsMockHttpServletRequestTests.groovy
grails-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalDomainClassJsonRendererSpec.groovy
grails-test-suite-uber/src/test/groovy/org/grails/plugins/web/rest/render/hal/HalDomainClassXmlRendererSpec.groovy
grails-test-suite-web/src/test/groovy/org/grails/plugins/web/rest/render/xml/DefaultXmlRendererSpec.groovy
grails-test-suite-web/src/test/groovy/org/grails/web/binding/JSONBindingToNullSpec.groovy
grails-test/src/main/groovy/org/grails/plugins/testing/AbstractGrailsMockHttpServletResponse.groovy
grails-web-databinding/src/test/groovy/org/grails/web/databinding/bindingsource/HalGPathResultMapSpec.groovy