Update dependencies of grace-web-jsp

Closes gh-889 See gh-681 gh-885
graceframework · Jan 7, 2025 · 3e7c431 · 3e7c431
1 parent 6d4aa2d
commit 3e7c431
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
 }