Skip to content

Commit 7191717

Browse files
committed
Remove JSTL dependencies and update JSP files for Jakarta taglibs compatibility.
1 parent a6ecd4a commit 7191717

File tree

4 files changed

+5
-39
lines changed

4 files changed

+5
-39
lines changed

omod/pom.xml

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -138,44 +138,6 @@
138138
<version>2.0.0-M1</version>
139139
<scope>provided</scope>
140140
</dependency>
141-
142-
<dependency>
143-
<groupId>jakarta.servlet.jsp.jstl</groupId>
144-
<artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
145-
<version>3.0.2</version>
146-
<scope>provided</scope>
147-
</dependency>
148-
149-
<dependency>
150-
<groupId>org.glassfish.web</groupId>
151-
<artifactId>jakarta.servlet.jsp.jstl</artifactId>
152-
<version>3.0.1</version>
153-
<scope>runtime</scope>
154-
<exclusions>
155-
<exclusion>
156-
<groupId>jakarta.servlet</groupId>
157-
<artifactId>jakarta.servlet-api</artifactId>
158-
</exclusion>
159-
<exclusion>
160-
<groupId>jakarta.servlet.jsp</groupId>
161-
<artifactId>jakarta.servlet.jsp-api</artifactId>
162-
</exclusion>
163-
<exclusion>
164-
<groupId>org.glassfish</groupId>
165-
<artifactId>jakarta.el</artifactId>
166-
</exclusion>
167-
<exclusion>
168-
<groupId>org.glassfish</groupId>
169-
<artifactId>jakarta.el-api</artifactId>
170-
</exclusion>
171-
<exclusion>
172-
<groupId>org.apache.tomcat.embed</groupId>
173-
<artifactId>tomcat-embed-jasper</artifactId>
174-
</exclusion>
175-
</exclusions>
176-
</dependency>
177-
178-
179141
</dependencies>
180142

181143
<build>

omod/src/main/webapp/index.jsp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@
2626

2727
<br />
2828

29-
<%@ include file="/WEB-INF/view/module/legacyui/template/footer.jsp" %>
29+
<%--<%@ include file="/WEB-INF/view/module/legacyui/template/footer.jsp" %>--%>
3030

omod/src/main/webapp/tags/url.tag

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ This tag prints out urls in a way that supports external ones
55
and is backwards compatible to support modules that exclude
66
a leading forward slash
77
--%>
8+
<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
9+
810

911
<%@ include file="/WEB-INF/view/module/legacyui/template/include.jsp" %>
1012

omod/src/main/webapp/template/footerFull.jsp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,11 @@
22
<br/>
33
</div>
44
</div>
5+
<%@ taglib prefix="fn" uri="jakarta.tags.functions" %>
56

67
<div id="footer"
78
xmlns:c="jakarta.tags.core"
9+
xmlns:fn="jakarta.tags.functions"
810
>
911

1012
<div id="footerInner">

0 commit comments

Comments
 (0)