Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Merge Missing Changes from 6.1.x into 6.2.x #13713

Merged
merged 21 commits into from
Oct 2, 2024
Merged

Merge Missing Changes from 6.1.x into 6.2.x #13713

merged 21 commits into from
Oct 2, 2024

Conversation

jdaugherty
Copy link
Contributor

The conflicts for this merge were:

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

Please pay close attention to the groovy workflow & the snapshot repository configuration.

renovate bot and others added 19 commits January 26, 2024 23:43
@renovate
Update actions/cache action to v4 (grails#13367)
8c65852 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update gspVersion to v6.1.3 (grails#13365)
972cb93 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency org.jsoup:jsoup to v1.17.2 (grails#13363)
856fcde 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency org.asciidoctor:asciidoctorj to v2.5.11 (grails#13361)
ecb16f8 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update grails-testing-support monorepo to v3.1.2 (grails#13364)
4ba5f37 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update datastoreVersion to v8.0.4 (grails#13360)
81cbe84 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update plugin com.gradle.enterprise to v3.16.2 (grails#13366)
57fe4c8 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update apache-tomcat monorepo to v9.0.85 (grails#13359)
ed1c0b4 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@renovate
Update dependency org.grails:grails-datastore-gorm-hibernate5 to v8.0…
228500a 
….3 (grails#13362)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
@matrei
fix: Groovy 3.0.20 compatibility (grails#13371)
a58ae33
@puneetbehl
Update Grails BOM (grails#13374)
7fd6d7c
@puneetbehl
Decouple Nexus Publish and Release Jobs (grails#13375)
66030dd
@puneetbehl
Update release.yml
7eaeeaf
@puneetbehl
Back to 6.1.3-SNAPSHOT
3048525
@matrei
fix(build): Set groovyVersion property in joint workflow (grails#13376)
5312c1f 
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.
@jprinet
Migrate to Develocity build cache connector (grails#13387)
7bc852a
@matrei
fix: Plugin config loading in Micronaut beans (grails#13388)
82a9d0e 
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 grails#11767
Related grails/grails-functional-tests#208
@puneetbehl
feat(core): Remove/Replace deprecated Groovy classes to prepare upgra…
e2061a8 
…de to Groovy 4 (grails#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
@jdaugherty
Merge branch '6.1.x' into 6.2.x
d001c6c 
 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
@CLAassistant
Copy link

CLAassistant commented Oct 1, 2024 •
edited
Loading

CLA assistant check
All committers have signed the CLA.

@jamesfredley
Copy link
Contributor

@jprinet can we get you to sign the CLA on this PR? It is just merging changes up, which include one of your PRs.

@jdaugherty
Revert "feat(core): Remove/Replace deprecated Groovy classes to prepa…
a7f00c7 
…re upgrade to Groovy 4 (grails#13386)"

This reverts commit e2061a8.

# Conflicts:
#	gradle.properties
#	grails-databinding/src/test/groovy/grails/databinding/SimpleDataBinderSpec.groovy
@jprinet
Copy link
Contributor

jprinet commented Oct 2, 2024

Just did @jamesfredley 👍

matrei
matrei approved these changes Oct 2, 2024
View reviewed changes
Copy link
Contributor

@matrei matrei left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a compile error when compiling grails.beans.util.LazyBeanMap with Groovy 3.0.22 and later. Fix is applied in 7.0.x. We can fix that after this PR is merged. #13717

@jdaugherty jdaugherty merged commit 83a9ee9 into grails:6.2.x Oct 2, 2024