Bean jspTagLibraryResolver is created only if JSTL exists

Closes gh-888
graceframework · Jan 7, 2025 · 6d4aa2d · 6d4aa2d
1 parent bd05374
commit 6d4aa2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/grace-plugin-gsp/build.gradle b/grace-plugin-gsp/build.gradle
@@ -8,7 +8,7 @@ dependencies {
     api project(":grace-web-mvc")
     api project(":grace-web-url-mappings")
     api project(":grace-web-gsp-taglib")
-    runtimeOnly(project(":grace-web-jsp"))
+    api project(":grace-web-jsp")
     api libs.spring.boot.autoconfigure
     annotationProcessor libs.spring.boot.autoconfigureProcessor
     annotationProcessor libs.spring.boot.configurationProcessor

diff --git a/grace-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesAutoConfiguration.java b/grace-plugin-gsp/src/main/groovy/org/grails/plugins/web/GroovyPagesAutoConfiguration.java
@@ -209,7 +209,7 @@ public ServletRegistrationBean<GroovyPagesServlet> groovyPagesServlet() {
     }
 
     @Bean
-    @ConditionalOnClass(name = "org.grails.gsp.jsp.TagLibraryResolverImpl")
+    @ConditionalOnClass(name = "jakarta.servlet.jsp.jstl.core.Config")
     public TagLibraryResolver jspTagLibraryResolver(GroovyPagesProperties groovyPagesProperties,
             ObjectProvider<GrailsApplication> grailsApplicationObjectProvider) {
         TagLibraryResolverImpl tagLibraryResolver = new TagLibraryResolverImpl();