graceframework · rainboyan · Oct 18, 2025 · Oct 17, 2025 · Oct 17, 2025 · Oct 17, 2025
diff --git a/grace-api/build.gradle b/grace-api/build.gradle
@@ -8,7 +8,6 @@ dependencies {
 
     api(libs.slf4j.api)
     api(libs.spring.beans)
-    compileOnly(libs.spring.boot)
     api libs.spring.context, {
         exclude group: 'io.micrometer', module: 'micrometer-observation'
     }

diff --git a/grace-plugin-core/build.gradle b/grace-plugin-core/build.gradle
@@ -14,6 +14,7 @@ dependencies {
     api libs.spring.boot.autoconfigure
     api libs.spring.context
     api libs.spring.core
+    compileOnly libs.spring.tx
     annotationProcessor libs.spring.boot.autoconfigureProcessor
     annotationProcessor libs.spring.boot.configurationProcessor
 

diff --git a/grace-plugin-core/src/main/groovy/org/grails/plugins/core/CoreGrailsPlugin.groovy b/grace-plugin-core/src/main/groovy/org/grails/plugins/core/CoreGrailsPlugin.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2024 the original author or authors.
+ * Copyright 2004-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,12 +28,12 @@ import grails.plugins.Plugin
 import grails.util.Environment
 import grails.util.GrailsUtil
 
-import org.grails.beans.support.PropertiesEditor
-import org.grails.core.support.ClassEditor
 import org.grails.dev.support.DevelopmentShutdownHook
 import org.grails.spring.DefaultRuntimeSpringConfiguration
 import org.grails.spring.RuntimeSpringConfigUtilities
 import org.grails.spring.RuntimeSpringConfiguration
+import org.grails.spring.beans.support.ClassEditor
+import org.grails.spring.beans.support.PropertiesEditor
 
 /**
  * Configures the core shared beans within the Grails application context.

diff --git a/...GrailsBeanPropertyOverrideConfigurer.java → ...GrailsBeanPropertyOverrideConfigurer.java b/...GrailsBeanPropertyOverrideConfigurer.java → ...GrailsBeanPropertyOverrideConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2023 the original author or authors.
+ * Copyright 2009-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/.../support/GrailsPlaceholderConfigurer.java → .../support/GrailsPlaceholderConfigurer.java b/.../support/GrailsPlaceholderConfigurer.java → .../support/GrailsPlaceholderConfigurer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2022 the original author or authors.
+ * Copyright 2004-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...derConfigurerCorePluginRuntimeSpec.groovy → ...derConfigurerCorePluginRuntimeSpec.groovy b/...derConfigurerCorePluginRuntimeSpec.groovy → ...derConfigurerCorePluginRuntimeSpec.groovy
@@ -1,12 +1,12 @@
-package grails.spring
+package org.grails.spring.context.support
 
 import org.springframework.context.ApplicationContext
 
 import grails.core.DefaultGrailsApplication
 import spock.lang.Issue
 import spock.lang.Specification
 
-import org.grails.spring.context.support.GrailsPlaceholderConfigurer
+import grails.spring.BeanBuilder
 
 /**
  * @author Graeme Rocher

diff --git a/...ng/GrailsPlaceholderConfigurerSpec.groovy → ...rt/GrailsPlaceholderConfigurerSpec.groovy b/...ng/GrailsPlaceholderConfigurerSpec.groovy → ...rt/GrailsPlaceholderConfigurerSpec.groovy
@@ -1,8 +1,8 @@
-package grails.spring
+package org.grails.spring.context.support
 
+import grails.spring.BeanBuilder
 import grails.util.Holders
 import grails.core.DefaultGrailsApplication
-import org.grails.spring.context.support.GrailsPlaceholderConfigurer
 import spock.lang.Issue
 import spock.lang.Specification
 

diff --git a/grace-plugin-i18n/build.gradle b/grace-plugin-i18n/build.gradle
@@ -1,7 +1,6 @@
 dependencies {
     api project(":grace-api")
     api project(":grace-bootstrap")
-    api project(":grace-core")
     api project(":grace-plugin-api")
     api project(":grace-util")
     compileOnly project(":grace-web-common")

diff --git a/...ernal/tools/ClassRelativeClassLoader.java → ...ernal/tools/ClassRelativeClassLoader.java b/...ernal/tools/ClassRelativeClassLoader.java → ...ernal/tools/ClassRelativeClassLoader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2023 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ClassRelativeResourcePatternResolver.java → ...ClassRelativeResourcePatternResolver.java b/...ClassRelativeResourcePatternResolver.java → ...ClassRelativeResourcePatternResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016-2022 the original author or authors.
+ * Copyright 2016-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...ternal/tools/MetaClassChangeReporter.java → ...ternal/tools/MetaClassChangeReporter.java b/...ternal/tools/MetaClassChangeReporter.java → ...ternal/tools/MetaClassChangeReporter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2022 the original author or authors.
+ * Copyright 2011-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

diff --git a/...tools/ClassRelativeClassLoaderSpec.groovy → ...tools/ClassRelativeClassLoaderSpec.groovy b/...tools/ClassRelativeClassLoaderSpec.groovy → ...tools/ClassRelativeClassLoaderSpec.groovy
diff --git a/grace-spring-boot/build.gradle b/grace-spring-boot/build.gradle
@@ -7,7 +7,6 @@ dependencies {
     api libs.spring.boot
     api libs.spring.context
     api libs.spring.core
-    compileOnly libs.spring.tx
 
-    testImplementation project(":grace-test-support")
+    testImplementation project(":grace-core")
 }
diff --git a/.../config/NavigableMapPropertySource.groovy → .../config/NavigableMapPropertySource.groovy b/.../config/NavigableMapPropertySource.groovy → .../config/NavigableMapPropertySource.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015-2023 the original author or authors.
+ * Copyright 2015-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import org.springframework.util.StringUtils
  *
  * This class behavior is closely tied to {@link org.grails.config.NavigableMap} which will be removed in future release.
  * @author Graeme Rocher
+ * @author Michael Yan
  * @since 3.0.7
  */
 @CompileStatic

diff --git a/.../org/grails/core/support/ClassEditor.java → ...ils/spring/beans/support/ClassEditor.java b/.../org/grails/core/support/ClassEditor.java → ...ils/spring/beans/support/ClassEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2023 the original author or authors.
+ * Copyright 2004-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.core.support;
+package org.grails.spring.beans.support;
 
 import java.beans.PropertyEditorSupport;
 

diff --git a/...rails/beans/support/PropertiesEditor.java → ...pring/beans/support/PropertiesEditor.java b/...rails/beans/support/PropertiesEditor.java → ...pring/beans/support/PropertiesEditor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014-2022 the original author or authors.
+ * Copyright 2014-2025 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.grails.beans.support;
+package org.grails.spring.beans.support;
 
 import java.util.Map;
 import java.util.Properties;

diff --git a/...spring-boot/src/test/groovy/org/grails/config/GroovyConfigPropertySourceLoaderSpec.groovy b/...spring-boot/src/test/groovy/org/grails/config/GroovyConfigPropertySourceLoaderSpec.groovy
diff --git a/...fig/NavigableMapPropertySourceSpec.groovy → ...fig/NavigableMapPropertySourceSpec.groovy b/...fig/NavigableMapPropertySourceSpec.groovy → ...fig/NavigableMapPropertySourceSpec.groovy
diff --git a/...oovyConfigPropertySourceLoaderSpec.groovy → ...oovyConfigPropertySourceLoaderSpec.groovy b/...oovyConfigPropertySourceLoaderSpec.groovy → ...oovyConfigPropertySourceLoaderSpec.groovy
@@ -1,4 +1,4 @@
-package org.grails.core.cfg
+package org.grails.spring.boot.env
 
 import org.grails.config.PropertySourcesConfig
 import org.springframework.core.env.MutablePropertySources
@@ -7,8 +7,6 @@ import org.springframework.core.io.FileSystemResource
 import org.springframework.core.io.Resource
 import spock.lang.Specification
 
-import org.grails.spring.boot.env.GroovyConfigPropertySourceLoader
-
 @SuppressWarnings("GrMethodMayBeStatic")
 class GroovyConfigPropertySourceLoaderSpec extends Specification {
 

diff --git a/...onfig/YamlPropertySourceLoaderSpec.groovy → ...t/env/YamlPropertySourceLoaderSpec.groovy b/...onfig/YamlPropertySourceLoaderSpec.groovy → ...t/env/YamlPropertySourceLoaderSpec.groovy
diff --git a/.../src/test/resources/builtin-config.groovy → .../src/test/resources/builtin-config.groovy b/.../src/test/resources/builtin-config.groovy → .../src/test/resources/builtin-config.groovy
diff --git a/...rc/test/resources/test-application.groovy → ...rc/test/resources/test-application.groovy b/...rc/test/resources/test-application.groovy → ...rc/test/resources/test-application.groovy