!5 升级master工程的freemarker到2.3.31版本

From: @xigaoxinyan 
Reviewed-by: @myeuler 
Signed-off-by: @myeuler

freemarker-2.3.30-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="3.0.3" />
++
+     <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,5 +1,7 @@
+%bcond_with jp_minimal
+
 Name:                freemarker
-Version:             2.3.28
+Version:             2.3.31
 Release:             1
 Summary:             The Apache FreeMarker Template Engine
 License:             ASL 2.0
@@ -11,11 +13,21 @@ Patch3:              fix-javadoc-encoding.patch
 Patch5:              no-javarebel.patch
 Patch6:              enable-jdom.patch
 Patch7:              javacc-7.patch
+Patch8:              freemarker-2.3.30-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 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:       jcl-over-slf4j jdom >= 1.0 junit log4j-over-slf4j slf4j
 BuildRequires:       xalan-j2 >= 2.7.0
+
+%if %{without jp_minimal}
+BuildRequires:       dom4j
+BuildRequires:       saxpath
+BuildRequires:       jython
+BuildRequires:       rhino >= 1.6
+%endif
+
 %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,17 +52,33 @@ 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
-sed -i -e '/saxpath/d' -e '/avalon-logkit/d' ivy.xml
+sed -i '/<javadoc/a\ additionalparam="-Xdoclint:none" encoding="UTF-8"' build.xml
+sed -i -e '/avalon-logkit/d' ivy.xml
 rm src/main/java/freemarker/log/_AvalonLoggerFactory.java
+
+%if %{with jp_minimal}
+sed -i -e '/"rhino"/d' -e '/"jython"/d' ivy.xml
+rm -rf src/main/java/freemarker/ext/{rhino,jython,ant}
+rm src/main/ava/freemarker/template/utility/JythonRuntime.java
+sed -i -e '/dom4j/d' -e '/saxpath/d' ivy.xml
+rm src/main/java/freemarker/ext/xml/_Dom4jNavigator.java
+%endif
+
+sed -i -e '/^Import-Package/s/:/: !org.apache.log4j, /' osgi.bnd
 %mvn_file org.%{name}:%{name} %{name}
 
 %build
+export LANG=C.UTF-8
+export JAVA_HOME=%{_jvmdir}/java-1.8.0
 ant -Divy.mode=local -Ddeps.available=true javacc jar javadoc maven-pom
 
 %install
+export LANG=C.UTF-8
 %mvn_artifact build/pom.xml build/%{name}.jar
 %mvn_install -J build/api
 
@@ -62,5 +90,8 @@ ant -Divy.mode=local -Ddeps.available=true javacc jar javadoc maven-pom
 %license LICENSE NOTICE
 
 %changelog
+* Wed Jun 01 2022 xigaoxinyan <xigaoxinyan@h-partners.com> - 2.3.31-1
+- Update to 2.3.31
+
 * Mon Aug 24 2020 liyanan <liyanan32@huawei.com> - 2.3.28-1
 - package init

jsp-api.patch

@@ -7,11 +7,11 @@
 -    <ivy:cachepath conf="build.jsp2.0" pathid="ivy.dep.jsp2.0" />
 +    <ivy:cachepath conf="build.jsp2.1" pathid="ivy.dep.jsp2.1" />
      <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" 
-       debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
+       debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
        includeantruntime="false"
 -      classpathref="ivy.dep.jsp2.0"
 +      classpathref="ivy.dep.jsp2.1"
-       bootclasspath="${boot.classpath.j2se1.5}"
+       bootclasspath="${boot.classpath.j2se1.7}"
        includes="
          freemarker/ext/jsp/**,
          freemarker/ext/servlet/**,
@@ -28,10 +28,10 @@
 -    
 -    <ivy:cachepath conf="build.jsp2.1" pathid="ivy.dep.jsp2.1" />
 -    <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" 
--      debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
+-      debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
 -      includeantruntime="false"
 -      classpathref="ivy.dep.jsp2.1"
--      bootclasspath="${boot.classpath.j2se1.5}"
+-      bootclasspath="${boot.classpath.j2se1.7}"
 -      includes="
 -        freemarker/ext/jsp/_FreeMarkerPageContext21.java,
 -        freemarker/ext/jsp/FreeMarkerJspFactory21.java,
@@ -40,7 +40,7 @@
 -
      <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" />
      <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" 
-       debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
+       debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
 --- ivy.xml.orig	2018-03-30 22:03:42.000000000 +0100
 +++ ivy.xml	2018-08-22 08:53:03.369873853 +0100
 @@ -45,9 +45,6 @@

jython-compatibility.patch

@@ -32,11 +32,11 @@
 -    <ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" />
 +    <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
      <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" 
-       debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
+       debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
        includeantruntime="false"
 -      classpathref="ivy.dep.jython2.0"
 +      classpathref="ivy.dep.jython2.5"
-       bootclasspath="${boot.classpath.j2se1.5}"
+       bootclasspath="${boot.classpath.j2se1.7}"
        includes="
          freemarker/ext/ant/**,
          freemarker/template/utility/JythonRuntime.java,
@@ -48,10 +48,10 @@
 -    
 -    <ivy:cachepath conf="build.jython2.2" pathid="ivy.dep.jython2.2" />
 -    <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" 
--      debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
+-      debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
 -      includeantruntime="false"
 -      classpathref="ivy.dep.jython2.2"
--      bootclasspath="${boot.classpath.j2se1.5}"
+-      bootclasspath="${boot.classpath.j2se1.7}"
 -      includes="
 +        freemarker/ext/jython/_Jython20And21VersionAdapter.java,
          freemarker/ext/jython/_Jython22VersionAdapter.java"
@@ -59,10 +59,10 @@
      
 -    <ivy:cachepath conf="build.jython2.5" pathid="ivy.dep.jython2.5" />
 -    <javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off" 
--      debug="on" optimize="off" target="1.5" source="1.5" encoding="utf-8"
+-      debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
 -      includeantruntime="false"
 -      classpathref="ivy.dep.jython2.5"
--      bootclasspath="${boot.classpath.j2se1.5}"
+-      bootclasspath="${boot.classpath.j2se1.7}"
 -      includes="
 -        freemarker/ext/jython/_Jython25VersionAdapter.java"
 -    />

no-javarebel.patch

@@ -2,7 +2,7 @@
 +++ build.xml	2017-12-06 18:32:55.974897827 +0000
 @@ -264,6 +264,7 @@
        classpathref="ivy.dep"
-       bootclasspath="${boot.classpath.j2se1.5}"
+       bootclasspath="${boot.classpath.j2se1.7}"
        excludes="
 +        freemarker/ext/beans/JRebelClassChangeNotifier.java
          freemarker/core/_Java?*Impl.java,