!8 Add jakarta-el.patch to 2.3.31 解决22.03-LTS-Next 编译问题

From: @desert-sailor 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia

freemarker-2.3.31-use-jakarta-el.patch

@@ -0,0 +1,14 @@
+diff --git a/ivy.xml b/ivy.xml
+index 0b03c2b..e880d34 100644
+--- a/ivy.xml
++++ b/ivy.xml
+@@ -98,7 +98,8 @@
+     
+     <dependency org="javax.servlet" name="jsp-api" rev="2.1" conf="build.jsp2.1->default" />
+     <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="build.jsp2.1->default" />
+-    
++    <dependency org="jakarta.el" name="jakarta.el-api" rev="4.0.0" />
++
+     <dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default" />
+ 
+     <dependency org="org.python" name="jython" rev="2.5.0" conf="build.jython2.5->default" />

freemarker.spec

@@ -1,6 +1,6 @@
 Name:                freemarker
 Version:             2.3.31
-Release:             1
+Release:             2
 Summary:             The Apache FreeMarker Template Engine
 License:             ASL 2.0
 URL:                 https://freemarker.apache.org/
@@ -11,11 +11,14 @@ Patch3:              fix-javadoc-encoding.patch
 Patch5:              no-javarebel.patch
 Patch6:              enable-jdom.patch
 Patch7:              javacc-7.patch
+Patch8:              freemarker-2.3.31-use-jakarta-el.patch
+
 BuildArch:           noarch
-BuildRequires:       ant apache-parent apache-commons-logging aqute-bnd dom4j >= 1.6.1 hamcrest
+BuildRequires:       java-1.8.0-openjdk-devel ant apache-parent apache-commons-logging aqute-bnd dom4j >= 1.6.1 hamcrest
 BuildRequires:       ivy-local glassfish-jsp-api glassfish-servlet-api javacc >= 7.0 jaxen >= 1.1
 BuildRequires:       jcl-over-slf4j jdom >= 1.0 junit jython log4j-over-slf4j rhino >= 1.6 slf4j
 BuildRequires:       xalan-j2 >= 2.7.0
+BuildRequires:       jakarta-el >= 4.0.0
 %description
 Apache FreeMarker is a template engine: a Java library to generate text output
 (HTML web pages, e-mails, configuration files, source code, etc.) based on
@@ -40,6 +43,8 @@ find -type f -name "*.class" -delete
 %patch5
 %patch6
 %patch7 -p1
+%patch8 -p1
+
 rm ivysettings.xml
 sed -i 's/cachepath conf="IDE"/cachepath conf="javadoc"/' build.xml
 sed -i '/conf name="IDE"/i<conf name="javadoc" extends="build.jython2.5,build.jsp2.1" />' ivy.xml
@@ -63,6 +68,9 @@ JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8 \
 %license LICENSE NOTICE
 
 %changelog
+* Sat Apr 15 2023 Dongxing Wang <dxwangk@isoftstone.com> - 2.3.31-2
+- Add jakarta-el.patch to 2.3.31
+
 * Fri Oct 21 2022 yaoxin <yaoxin30@h-partners.com> - 2.3.31-1
 - Update to 2.3.31