Merge pull request #1246 from rainboyan

* pr/1246: Consolidate 'grace-web-common' into 'grace-web'

Closes gh-1246

Author: rainboyan

grace-plugin-codecs/build.gradle

@@ -11,5 +11,5 @@ dependencies {
 
     testImplementation libs.jakarta.servlet
     testImplementation project(":grace-test")
-    testImplementation project(":grace-web-common")
+    testImplementation project(":grace-web")
 }

grace-plugin-controllers/build.gradle

@@ -6,6 +6,8 @@ dependencies {
     api project(":grace-plugin-databinding")
     api project(":grace-plugin-mimetypes")
     api project(":grace-plugin-validation")
+    api project(":grace-web-gsp")
+    api project(":grace-web-mvc")
     api project(":grace-util")
 
     compileOnly libs.jakarta.servlet

grace-plugin-converters/build.gradle

@@ -5,7 +5,7 @@ dependencies {
     api project(":grace-plugin-api")
     runtimeOnly project(":grace-plugin-controllers")
     api project(":grace-util")
-    api project(":grace-web-common")
+    api project(":grace-web")
 
     api libs.commons.lang3
     compileOnly libs.jakarta.servlet

grace-plugin-databinding/build.gradle

@@ -1,7 +1,7 @@
 dependencies {
     api project(":grace-api")
     api project(":grace-plugin-api")
-    api project(":grace-web-common")
+    api project(":grace-web")
 
     compileOnly libs.jakarta.servlet
     api libs.spring.boot.autoconfigure

grace-plugin-fields/build.gradle

@@ -2,7 +2,7 @@ dependencies {
     api project(":grace-plugin-databinding")
     api project(":grace-plugin-validation")
     api project(":grace-scaffolding-core")
-    api project(":grace-web-common")
+    api project(":grace-web")
     api project(":grace-web-gsp")
     api project(":grace-web-taglib")
     implementation libs.grace.datastore.core

grace-plugin-i18n/build.gradle

@@ -3,7 +3,7 @@ dependencies {
     api project(":grace-bootstrap")
     api project(":grace-plugin-api")
     api project(":grace-util")
-    compileOnly project(":grace-web-common")
+    compileOnly project(":grace-web")
 
     api libs.groovy.ant
     api libs.spring.boot.autoconfigure

grace-plugin-validation/build.gradle

@@ -4,7 +4,7 @@ dependencies {
     api libs.grace.datastore.gorm.validation
 
     testImplementation project(":grace-plugin-domain-class")
-    testImplementation project(":grace-web-common")
+    testImplementation project(":grace-web")
     testImplementation libs.jakarta.servlet
     testImplementation libs.spring.test
 }

grace-test-suite-web/build.gradle

@@ -23,7 +23,6 @@ dependencies {
     testImplementation project(":grace-plugin-controllers")
     testImplementation project(":grace-plugin-rest")
     testImplementation project(":grace-web")
-    testImplementation project(":grace-web-common")
     testImplementation project(":grace-spring")
     testImplementation project(":grace-test-support")
 

grace-test/build.gradle

@@ -3,6 +3,9 @@ dependencies {
     api project(":grace-plugin-converters")
     api project(":grace-plugin-mimetypes")
     api project(":grace-web")
+    api project(":grace-web-gsp")
+    api project(":grace-web-mvc")
+    api project(":grace-web-taglib")
 
     api libs.ant
     api libs.ant.junit

grace-views-core/build.gradle

@@ -4,7 +4,7 @@ dependencies {
     api project(":grace-encoder")
     api project(":grace-plugin-domain-class")
     api project(":grace-plugin-rest")
-    api project(":grace-web-common")
+    api project(":grace-web")
     api project(":grace-web-url-mappings")
     api libs.grace.datastore.gorm.support
     api libs.caffeine