Merge pull request #1243 from rainboyan

* pr/1243: Consolidate 'grace-web-jsp' into 'grace-web-gsp'

Closes gh-1243

Author: rainboyan

grace-plugin-gsp/build.gradle

@@ -4,8 +4,7 @@ dependencies {
     api project(":grace-core")
     api project(":grace-plugin-api")
     api project(":grace-plugin-codecs")
-    api project(':grace-web-gsp')
-    api project(":grace-web-jsp")
+    api project(":grace-web-gsp")
     api project(":grace-web-mvc")
     api project(":grace-web-sitemesh")
     api project(":grace-web-taglib")

grace-web-gsp/build.gradle

@@ -1,10 +1,21 @@
 dependencies {
-    compileOnly libs.ant
-    compileOnlyApi libs.jakarta.servlet
     api project(":grace-gsp")
     api project(":grace-web-common")
     api project(":grace-web-sitemesh")
 
+    compileOnly libs.ant
+    compileOnlyApi libs.jakarta.servlet
+    // Required for JSP support
+    compileOnlyApi libs.jakarta.el
+    compileOnlyApi libs.jakarta.servlet.jsp, {
+        exclude group: 'jakarta.servlet', module: 'jakarta.servlet-api'
+    }
+    compileOnlyApi libs.jakarta.servlet.jsp.jstl, {
+        exclude group: 'jakarta.el', module: 'jakarta.el-api'
+        exclude group: 'jakarta.servlet', module: 'jakarta.servlet-api'
+    }
+    compileOnly libs.glassfish.web.jsp.jstl
+
     testImplementation libs.jakarta.servlet
     testImplementation libs.spring.test
     testImplementation project(":grace-test")