From 3e7c4313f5d1e9e814810b756af842322fc4b113 Mon Sep 17 00:00:00 2001
From: Michael Yan <rain@rainboyan.com>
Date: Tue, 7 Jan 2025 16:43:06 +0800
Subject: [PATCH] Update dependencies of `grace-web-jsp`

Closes gh-889

See gh-681 gh-885
---
 grace-test-support/build.gradle   |  1 +
 grace-web-gsp-taglib/build.gradle |  8 +++++++-
 grace-web-jsp/build.gradle        | 13 +++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/grace-test-support/build.gradle b/grace-test-support/build.gradle
index 19809ad625..948c4515c2 100755
--- a/grace-test-support/build.gradle
+++ b/grace-test-support/build.gradle
@@ -10,6 +10,7 @@ dependencies {
 
     api libs.grails.async.core
     api project(":grace-plugin-gsp")
+    api project(":grace-web-gsp")
     api libs.groovy.test.junit5
     api libs.grails.datastore.gorm
     api libs.grails.datastore.gorm.test
diff --git a/grace-web-gsp-taglib/build.gradle b/grace-web-gsp-taglib/build.gradle
index cd73f27e4f..0d04a091f1 100644
--- a/grace-web-gsp-taglib/build.gradle
+++ b/grace-web-gsp-taglib/build.gradle
@@ -1,4 +1,10 @@
 dependencies {
     compileOnlyApi libs.jakarta.servlet
-    api project(':grace-web-jsp')
+    compileOnlyApi libs.sitemesh, {
+        exclude group: 'jakarta.servlet', module: 'jakarta.servlet-api'
+    }
+    api project(':grace-gsp')
+    api project(':grace-taglib')
+    api project(':grace-web-gsp')
+    api project(':grace-web-taglib')
 }
diff --git a/grace-web-jsp/build.gradle b/grace-web-jsp/build.gradle
index a7acf4f826..848901b8c6 100644
--- a/grace-web-jsp/build.gradle
+++ b/grace-web-jsp/build.gradle
@@ -4,8 +4,13 @@ dependencies {
 
     compileOnlyApi libs.jakarta.servlet
     // Required for JSP support
-    implementation libs.jakarta.servlet.jsp
-    implementation libs.jakarta.servlet.jsp.jstl
-    implementation libs.jakarta.el
-    implementation libs.glassfish.web.jsp.jstl
+    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
 }