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

Commits on Jan 26, 2024

  1. Update actions/cache action to v4 (grails#13367) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    8c65852 View commit details
    Browse the repository at this point in the history

  2. Update gspVersion to v6.1.3 (grails#13365) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    972cb93 View commit details
    Browse the repository at this point in the history

  3. Update dependency org.jsoup:jsoup to v1.17.2 (grails#13363) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    856fcde View commit details
    Browse the repository at this point in the history

  4. Update dependency org.asciidoctor:asciidoctorj to v2.5.11 (grails#13361) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    ecb16f8 View commit details
    Browse the repository at this point in the history

  5. Update grails-testing-support monorepo to v3.1.2 (grails#13364) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    4ba5f37 View commit details
    Browse the repository at this point in the history

  6. Update datastoreVersion to v8.0.4 (grails#13360) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    81cbe84 View commit details
    Browse the repository at this point in the history

  7. Update plugin com.gradle.enterprise to v3.16.2 (grails#13366) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    57fe4c8 View commit details
    Browse the repository at this point in the history

  8. Update apache-tomcat monorepo to v9.0.85 (grails#13359) 

    Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    ed1c0b4 View commit details
    Browse the repository at this point in the history

  9. Update dependency org.grails:grails-datastore-gorm-hibernate5 to v8.0… 

    ….3 (grails#13362)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
    @renovate
    renovate[bot] authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    228500a View commit details
    Browse the repository at this point in the history

  10. fix: Groovy 3.0.20 compatibility (grails#13371)

    @matrei
    matrei authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    a58ae33 View commit details
    Browse the repository at this point in the history

  11. Update Grails BOM (grails#13374)

    @puneetbehl
    puneetbehl authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    7fd6d7c View commit details
    Browse the repository at this point in the history

  12. Decouple Nexus Publish and Release Jobs (grails#13375)

    @puneetbehl
    puneetbehl authored Jan 26, 2024
    Configuration menu
    Copy the full SHA
    66030dd View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

  1. Update release.yml

    @puneetbehl
    puneetbehl committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    7eaeeaf View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2024

  1. Back to 6.1.3-SNAPSHOT

    @puneetbehl
    puneetbehl committed Jan 31, 2024
    Configuration menu
    Copy the full SHA
    3048525 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2024

  1. fix(build): Set groovyVersion property in joint workflow (grails#13376) 

    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.
    @matrei
    matrei authored Feb 6, 2024
    Configuration menu
    Copy the full SHA
    5312c1f View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2024

  1. Migrate to Develocity build cache connector (grails#13387)

    @jprinet
    jprinet authored Feb 20, 2024
    Configuration menu
    Copy the full SHA
    7bc852a View commit details
    Browse the repository at this point in the history

  2. fix: Plugin config loading in Micronaut beans (grails#13388) 

    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
    @matrei
    matrei authored Feb 20, 2024
    Configuration menu
    Copy the full SHA
    82a9d0e View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2024

  1. feat(core): Remove/Replace deprecated Groovy classes to prepare upgra… 

    …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
    @puneetbehl
    puneetbehl authored Feb 27, 2024
    Configuration menu
    Copy the full SHA
    e2061a8 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Merge branch '6.1.x' into 6.2.x 

     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
    @jdaugherty
    jdaugherty committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    d001c6c View commit details
    Browse the repository at this point in the history

  2. Revert "feat(core): Remove/Replace deprecated Groovy classes to prepa… 

    …re upgrade to Groovy 4 (grails#13386)"

This reverts commit e2061a8.

# Conflicts:
#	gradle.properties
#	grails-databinding/src/test/groovy/grails/databinding/SimpleDataBinderSpec.groovy
    @jdaugherty
    jdaugherty committed Oct 1, 2024
    2 Configuration menu
    Copy the full SHA
    a7f00c7 View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Merge remote-tracking branch 'upstream/6.2.x' into 6.2.x

    @jdaugherty
    jdaugherty committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    e43ceee View commit details
    Browse the repository at this point in the history