From 40afd70780ac0c07c6f158db15d4ce49f957a8fb Mon Sep 17 00:00:00 2001
From: Paulo Gustavo Veiga <pveiga@wisemapping.com>
Date: Mon, 31 Jul 2023 21:01:33 -0700
Subject: [PATCH] Update to jslt 3.0.1

---
 distribution/Dockerfile                              |  7 ++-----
 distribution/build-image.sh                          |  8 ++++----
 wise-webapp/pom.xml                                  | 12 +++++++++++-
 wise-webapp/src/main/webapp/WEB-INF/views/init.jsp   |  9 +++------
 .../src/main/webapp/WEB-INF/views/pageHeaders.jsf    |  2 +-
 .../src/main/webapp/WEB-INF/views/reactInclude.jsp   |  2 +-
 6 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/distribution/Dockerfile b/distribution/Dockerfile
index 0578be08..8e7b84be 100644
--- a/distribution/Dockerfile
+++ b/distribution/Dockerfile
@@ -3,7 +3,7 @@
 
 # Based info setup ...
 #FROM --platform=$BUILDPLATFORM tomcat:9.0.71-jdk17
-FROM tomcat:9.0.71-jdk17
+FROM tomcat:10.1.11-jdk17
 LABEL maintainer="Paulo Gustavo Veiga <pveiga@wisemapping.com>"
 
 # Build variables ...
@@ -21,7 +21,7 @@ RUN cd ${WEBAPP_TARGET_DIR} && jar -xvf /tmp/wisemapping.war
 RUN rm /tmp/wisemapping.war
 
 # Change logger to
-RUN cp ${WEBAPP_TARGET_DIR}/WEB-INF/classes/log4j-stdout.xml ${WEBAPP_TARGET_DIR}/WEB-INF/classes/log4j.properties
+RUN cp ${WEBAPP_TARGET_DIR}/WEB-INF/classes/log4j-stdout.xml ${WEBAPP_TARGET_DIR}/WEB-INF/classes/log4j.xml
 
 # Add support for proxy
 RUN sed -i 's|\
@@ -32,9 +32,6 @@ RUN sed -i 's|\
   </Host>|' \
   /usr/local/tomcat/conf/server.xml
 
-RUN sed -i 's|<Context>|<Context>\
-    <Loader jakartaConverter="TOMCAT" />|' \
-  /usr/local/tomcat/conf/context.xml
 # Copy default HSQL DB for testing ...
 RUN mkdir -p ${DB_BASE_DIR}/db
 COPY db/ ${DB_BASE_DIR}/db
diff --git a/distribution/build-image.sh b/distribution/build-image.sh
index 8d0815a8..9862e7c2 100755
--- a/distribution/build-image.sh
+++ b/distribution/build-image.sh
@@ -4,7 +4,7 @@ set -o
 set -u
 
 mvn -f ../pom.xml clean package
-#docker build --platform linux/amd64 -t wisemapping/wisemapping:latest -f ./Dockerfile ../wise-webapp/target/
-docker buildx create --use --platform=linux/arm64,linux/amd64 --name multi-platform-builder
-docker buildx inspect --bootstrap
-docker buildx build --platform=linux/amd64,linux/arm64 --push -t wisemapping/wisemapping:latest -f ./Dockerfile ../wise-webapp/target/ 
+docker build --platform linux/amd64 -t wisemapping/wisemapping:latest -f ./Dockerfile ../wise-webapp/target/
+#docker buildx create --use --platform=linux/arm64,linux/amd64 --name multi-platform-builder
+#docker buildx inspect --bootstrap
+#docker buildx build --platform=linux/amd64,linux/arm64 --push -t wisemapping/wisemapping:latest -f ./Dockerfile ../wise-webapp/target/
diff --git a/wise-webapp/pom.xml b/wise-webapp/pom.xml
index 51954632..5c68122e 100644
--- a/wise-webapp/pom.xml
+++ b/wise-webapp/pom.xml
@@ -223,7 +223,17 @@
             <version>6.0.0</version>
             <scope>provided</scope>
         </dependency>
-
+        <!-- JSLT implementation -->
+        <dependency>
+            <groupId>jakarta.servlet.jsp.jstl</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl-api</artifactId>
+            <version>3.0.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.glassfish.web</groupId>
+            <artifactId>jakarta.servlet.jsp.jstl</artifactId>
+            <version>3.0.0</version>
+        </dependency>
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
diff --git a/wise-webapp/src/main/webapp/WEB-INF/views/init.jsp b/wise-webapp/src/main/webapp/WEB-INF/views/init.jsp
index ff6cef0a..94a2f9ba 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/views/init.jsp
+++ b/wise-webapp/src/main/webapp/WEB-INF/views/init.jsp
@@ -1,10 +1,7 @@
-<%@taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
-<%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
-<%@ taglib uri = "http://java.sun.com/jsp/jstl/functions" prefix = "fn" %>
-
+<%@taglib uri="jakarta.tags.functions" prefix="fn" %>
+<%@taglib uri="jakarta.tags.core" prefix="c"%>
 <%
+
     request.setAttribute("principal", com.wisemapping.security.Utils.getUser());
 %>
 
diff --git a/wise-webapp/src/main/webapp/WEB-INF/views/pageHeaders.jsf b/wise-webapp/src/main/webapp/WEB-INF/views/pageHeaders.jsf
index 83b8a6db..d4f1f025 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/views/pageHeaders.jsf
+++ b/wise-webapp/src/main/webapp/WEB-INF/views/pageHeaders.jsf
@@ -1,4 +1,4 @@
-<%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@taglib uri="jakarta.tags.core" prefix="c"%>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
diff --git a/wise-webapp/src/main/webapp/WEB-INF/views/reactInclude.jsp b/wise-webapp/src/main/webapp/WEB-INF/views/reactInclude.jsp
index 17dd986e..420142bc 100644
--- a/wise-webapp/src/main/webapp/WEB-INF/views/reactInclude.jsp
+++ b/wise-webapp/src/main/webapp/WEB-INF/views/reactInclude.jsp
@@ -1,4 +1,4 @@
-<%@ taglib uri = "http://java.sun.com/jsp/jstl/functions" prefix = "fn" %>
+<%@ taglib uri = "jakarta.tags.functions" prefix = "fn" %>
 <%@ page pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %>
 
 <!DOCTYPE html>