graceframework · rainboyan · Dec 5, 2025 · Dec 5, 2025
diff --git a/grace-plugin-controllers/build.gradle b/grace-plugin-controllers/build.gradle
@@ -3,6 +3,7 @@ dependencies {
     api project(":grace-bootstrap")
     api project(":grace-core")
     api project(":grace-plugin-api")
+    api project(":grace-plugin-databinding")
     api project(":grace-plugin-mimetypes")
     api project(":grace-plugin-validation")
     api project(":grace-util")

diff --git a/grace-plugin-databinding/build.gradle b/grace-plugin-databinding/build.gradle
@@ -1,7 +1,7 @@
 dependencies {
     api project(":grace-api")
     api project(":grace-plugin-api")
-    api project(":grace-web-databinding")
+    api project(":grace-web-common")
 
     compileOnly libs.jakarta.servlet
     api libs.spring.boot.autoconfigure

diff --git a/...traits/WebDataBindingTraitInjector.groovy → ...traits/WebDataBindingTraitInjector.groovy b/...traits/WebDataBindingTraitInjector.groovy → ...traits/WebDataBindingTraitInjector.groovy
diff --git a/.../grails/web/databinding/DataBinder.groovy → .../grails/web/databinding/DataBinder.groovy b/.../grails/web/databinding/DataBinder.groovy → .../grails/web/databinding/DataBinder.groovy
@@ -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.

diff --git a/...ils/web/databinding/WebDataBinding.groovy → ...ils/web/databinding/WebDataBinding.groovy b/...ils/web/databinding/WebDataBinding.groovy → ...ils/web/databinding/WebDataBinding.groovy
@@ -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.

diff --git a/.../main/resources/META-INF/grails.factories → .../main/resources/META-INF/grails.factories b/.../main/resources/META-INF/grails.factories → .../main/resources/META-INF/grails.factories
diff --git a/...nding/DataBinderTraitGeneratedSpec.groovy → ...nding/DataBinderTraitGeneratedSpec.groovy b/...nding/DataBinderTraitGeneratedSpec.groovy → ...nding/DataBinderTraitGeneratedSpec.groovy
diff --git a/...g/WebDataBindingTraitGeneratedSpec.groovy → ...g/WebDataBindingTraitGeneratedSpec.groovy b/...g/WebDataBindingTraitGeneratedSpec.groovy → ...g/WebDataBindingTraitGeneratedSpec.groovy
diff --git a/grace-plugin-fields/build.gradle b/grace-plugin-fields/build.gradle
@@ -1,7 +1,8 @@
 dependencies {
+    api project(":grace-plugin-databinding")
     api project(":grace-plugin-validation")
     api project(":grace-scaffolding-core")
-    api project(":grace-web-databinding")
+    api project(":grace-web-common")
     api project(":grace-web-gsp")
     api project(":grace-web-taglib")
     implementation libs.grace.datastore.core

diff --git a/grace-test-suite-web/build.gradle b/grace-test-suite-web/build.gradle
@@ -23,7 +23,7 @@ dependencies {
     testImplementation project(":grace-plugin-controllers")
     testImplementation project(":grace-plugin-rest")
     testImplementation project(":grace-web")
-    testImplementation project(":grace-web-databinding")
+    testImplementation project(":grace-web-common")
     testImplementation project(":grace-spring")
     testImplementation project(":grace-test-support")
 

diff --git a/grace-web-common/build.gradle b/grace-web-common/build.gradle
@@ -5,6 +5,8 @@ dependencies {
     api project(":grace-encoder")
     api project(":grace-util")
 
+    compileOnly libs.grace.datastore.core
+    compileOnly libs.jakarta.annotation.api
     compileOnlyApi libs.jakarta.servlet
     api libs.groovy.templates
     api libs.spring.contextSupport
@@ -13,5 +15,6 @@ dependencies {
     implementation libs.caffeine
 
     testImplementation libs.jakarta.servlet
+    testImplementation libs.spring.test
     testImplementation project(":grace-test")
 }
diff --git a/...rails/beans/util/LazyMetaPropertyMap.java → ...rails/beans/util/LazyMetaPropertyMap.java b/...rails/beans/util/LazyMetaPropertyMap.java → ...rails/beans/util/LazyMetaPropertyMap.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/...ils/web/databinding/DataBindingUtils.java → ...ils/web/databinding/DataBindingUtils.java b/...ils/web/databinding/DataBindingUtils.java → ...ils/web/databinding/DataBindingUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2006-2023 the original author or authors.
+ * Copyright 2006-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/...eb/databinding/GrailsWebDataBinder.groovy → ...eb/databinding/GrailsWebDataBinder.groovy b/...eb/databinding/GrailsWebDataBinder.groovy → ...eb/databinding/GrailsWebDataBinder.groovy
diff --git a/...web/databinding/ASTDatabindingHelper.java → ...web/databinding/ASTDatabindingHelper.java b/...web/databinding/ASTDatabindingHelper.java → ...web/databinding/ASTDatabindingHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2022 the original author or authors.
+ * Copyright 2012-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/.../DataBindingEventMulticastListener.groovy → .../DataBindingEventMulticastListener.groovy b/.../DataBindingEventMulticastListener.groovy → .../DataBindingEventMulticastListener.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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/...nding/DataBindingLazyMetaPropertyMap.java → ...nding/DataBindingLazyMetaPropertyMap.java b/...nding/DataBindingLazyMetaPropertyMap.java → ...nding/DataBindingLazyMetaPropertyMap.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.

diff --git a/...abinding/DefaultASTDatabindingHelper.java → ...abinding/DefaultASTDatabindingHelper.java b/...abinding/DefaultASTDatabindingHelper.java → ...abinding/DefaultASTDatabindingHelper.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2023 the original author or authors.
+ * Copyright 2012-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/...nding/GrailsWebDataBindingListener.groovy → ...nding/GrailsWebDataBindingListener.groovy b/...nding/GrailsWebDataBindingListener.groovy → ...nding/GrailsWebDataBindingListener.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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/...ing/SpringConversionServiceAdapter.groovy → ...ing/SpringConversionServiceAdapter.groovy b/...ing/SpringConversionServiceAdapter.groovy → ...ing/SpringConversionServiceAdapter.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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/...equestBodyDataBindingSourceCreator.groovy → ...equestBodyDataBindingSourceCreator.groovy b/...equestBodyDataBindingSourceCreator.groovy → ...equestBodyDataBindingSourceCreator.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2024 the original author or authors.
+ * Copyright 2013-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/...ce/DefaultDataBindingSourceCreator.groovy → ...ce/DefaultDataBindingSourceCreator.groovy b/...ce/DefaultDataBindingSourceCreator.groovy → ...ce/DefaultDataBindingSourceCreator.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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/...e/DefaultDataBindingSourceRegistry.groovy → ...e/DefaultDataBindingSourceRegistry.groovy b/...e/DefaultDataBindingSourceRegistry.groovy → ...e/DefaultDataBindingSourceRegistry.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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/...ng/bindingsource/HalGPathResultMap.groovy → ...ng/bindingsource/HalGPathResultMap.groovy b/...ng/bindingsource/HalGPathResultMap.groovy → ...ng/bindingsource/HalGPathResultMap.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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/...ce/HalJsonDataBindingSourceCreator.groovy → ...ce/HalJsonDataBindingSourceCreator.groovy b/...ce/HalJsonDataBindingSourceCreator.groovy → ...ce/HalJsonDataBindingSourceCreator.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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/...rce/HalXmlDataBindingSourceCreator.groovy → ...rce/HalXmlDataBindingSourceCreator.groovy b/...rce/HalXmlDataBindingSourceCreator.groovy → ...rce/HalXmlDataBindingSourceCreator.groovy
diff --git a/...ngsource/InvalidRequestBodyException.java → ...ngsource/InvalidRequestBodyException.java b/...ngsource/InvalidRequestBodyException.java → ...ngsource/InvalidRequestBodyException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013 the original author or authors.
+ * Copyright 2013-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/...ce/JsonApiDataBindingSourceCreator.groovy → ...ce/JsonApiDataBindingSourceCreator.groovy b/...ce/JsonApiDataBindingSourceCreator.groovy → ...ce/JsonApiDataBindingSourceCreator.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2022 the original author or authors.
+ * Copyright 2013-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/...ource/JsonDataBindingSourceCreator.groovy → ...ource/JsonDataBindingSourceCreator.groovy b/...ource/JsonDataBindingSourceCreator.groovy → ...ource/JsonDataBindingSourceCreator.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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/...source/XmlDataBindingSourceCreator.groovy → ...source/XmlDataBindingSourceCreator.groovy b/...source/XmlDataBindingSourceCreator.groovy → ...source/XmlDataBindingSourceCreator.groovy
diff --git a/...rs/AbstractStructuredBindingEditor.groovy → ...rs/AbstractStructuredBindingEditor.groovy b/...rs/AbstractStructuredBindingEditor.groovy → ...rs/AbstractStructuredBindingEditor.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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/...teArrayMultipartFileValueConverter.groovy → ...teArrayMultipartFileValueConverter.groovy b/...teArrayMultipartFileValueConverter.groovy → ...teArrayMultipartFileValueConverter.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2013-2023 the original author or authors.
+ * Copyright 2013-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/.../bean/util/LazyMetaPropertyMapSpec.groovy → .../bean/util/LazyMetaPropertyMapSpec.groovy b/.../bean/util/LazyMetaPropertyMapSpec.groovy → .../bean/util/LazyMetaPropertyMapSpec.groovy
diff --git a/...bean/util/LazyMetaPropertyMapTests.groovy → ...bean/util/LazyMetaPropertyMapTests.groovy b/...bean/util/LazyMetaPropertyMapTests.groovy → ...bean/util/LazyMetaPropertyMapTests.groovy
diff --git a/...ataBindingLazyMetaPropertyMapTests.groovy → ...ataBindingLazyMetaPropertyMapTests.groovy b/...ataBindingLazyMetaPropertyMapTests.groovy → ...ataBindingLazyMetaPropertyMapTests.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2005 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/...stBodyDataBindingSourceCreatorSpec.groovy → ...stBodyDataBindingSourceCreatorSpec.groovy b/...stBodyDataBindingSourceCreatorSpec.groovy → ...stBodyDataBindingSourceCreatorSpec.groovy
diff --git a/...indingsource/HalGPathResultMapSpec.groovy → ...indingsource/HalGPathResultMapSpec.groovy b/...indingsource/HalGPathResultMapSpec.groovy → ...indingsource/HalGPathResultMapSpec.groovy
diff --git a/...alJsonDataBindingSourceCreatorSpec.groovy → ...alJsonDataBindingSourceCreatorSpec.groovy b/...alJsonDataBindingSourceCreatorSpec.groovy → ...alJsonDataBindingSourceCreatorSpec.groovy
diff --git a/...n/JsonDataBindingSourceCreatorSpec.groovy → ...n/JsonDataBindingSourceCreatorSpec.groovy b/...n/JsonDataBindingSourceCreatorSpec.groovy → ...n/JsonDataBindingSourceCreatorSpec.groovy
diff --git a/...sonApiDataBindingSourceCreatorSpec.groovy → ...sonApiDataBindingSourceCreatorSpec.groovy b/...sonApiDataBindingSourceCreatorSpec.groovy → ...sonApiDataBindingSourceCreatorSpec.groovy
diff --git a/grace-web-databinding/README.md b/grace-web-databinding/README.md
diff --git a/grace-web-databinding/build.gradle b/grace-web-databinding/build.gradle
diff --git a/grace-web/build.gradle b/grace-web/build.gradle
@@ -2,7 +2,6 @@ dependencies {
     api project(":grace-api")
     api project(":grace-plugin-api")
     api project(":grace-web-common")
-    api project(":grace-web-databinding")
     api project(":grace-web-gsp")
     api project(":grace-web-mvc")
     api project(":grace-web-sitemesh")

diff --git a/settings.gradle b/settings.gradle
@@ -32,7 +32,6 @@ include (
         'grace-views-markup',
         'grace-web',
         'grace-web-common',
-        'grace-web-databinding',
         'grace-web-gsp',
         'grace-web-mvc',
         'grace-web-sitemesh',