You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@grails.apache.org by bo...@apache.org on 2026/10/20 00:46:36 UTC

(grails-core) 03/04: Merge branch 'refactor/java-to-groovy-grails-spring' into groovyism/grails-spring

This is an automated email from the ASF dual-hosted git repository.

borinquenkid pushed a commit to branch groovyism/grails-spring
in repository https://gitbox.apache.org/repos/asf/grails-core.git

commit f69982d3847d6c3e8c54a0129591bc0ecbf7ed7f
Merge: caf2dd027b 7640f1019c
Author: Walter Duque de Estrada <wb...@mac.com>
AuthorDate: Fri Oct 16 21:45:54 2026 -0500

    Merge branch 'refactor/java-to-groovy-grails-spring' into groovyism/grails-spring
    
    # Conflicts:
    #       grails-spring/src/main/groovy/org/grails/spring/DefaultBeanConfiguration.groovy
    #       grails-spring/src/main/groovy/org/grails/spring/DefaultRuntimeSpringConfiguration.groovy