!2 Upgrade to 2.3.29

From: @si-gui
Reviewed-by: @overweight
Signed-off-by: @overweight

freemarker.spec

@@ -1,10 +1,10 @@
 Name:                freemarker
-Version:             2.3.28
+Version:             2.3.29
 Release:             1
 Summary:             The Apache FreeMarker Template Engine
-License:             ASL 2.0
+License:             ASL 2.0 and OFL-1.1 and CC-BY-SA-3.0
 URL:                 https://freemarker.apache.org/
-Source0:             https://github.com/apache/incubator-freemarker/archive/v%{version}/%{name}-%{version}.tar.gz
+Source0:             https://github.com/apache/freemarker/archive/v%{version}/%{name}-%{version}.tar.gz
 Patch1:              jsp-api.patch
 Patch2:              jython-compatibility.patch
 Patch3:              fix-javadoc-encoding.patch
@@ -15,7 +15,7 @@ BuildArch:           noarch
 BuildRequires:       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:       xalan-j2 >= 2.7.0 saxpath
 %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
@@ -43,14 +43,23 @@ find -type f -name "*.class" -delete
 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"' build.xml
+sed -i -e '/avalon-logkit/d' ivy.xml
 rm src/main/java/freemarker/log/_AvalonLoggerFactory.java
+
+sed -i -e '/"rhino"/d' -e '/"jython"/d' ivy.xml
+rm -rf src/main/java/freemarker/ext/{rhino,jython,ant}
+rm src/main/java/freemarker/template/utility/JythonRuntime.java
+sed -i -e '/dom4j/d' -e '/saxpath/d' ivy.xml
+rm src/main/java/freemarker/ext/xml/_Dom4jNavigator.java
 %mvn_file org.%{name}:%{name} %{name}
 
 %build
+export LANG=C.UTF-8
 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 +71,8 @@ ant -Divy.mode=local -Ddeps.available=true javacc jar javadoc maven-pom
 %license LICENSE NOTICE
 
 %changelog
+* Fri Apr 30 2021 sunguoshuai <sunguoshuai@huawei.com> - 2.3.29-1
+- Upgrade to 2.3.29
+
 * Mon Aug 24 2020 liyanan <liyanan32@huawei.com> - 2.3.28-1
 - package init