diff --git a/freemarker-2.3.28.tar.gz b/freemarker-2.3.28.tar.gz
deleted file mode 100644
index 65ec13a..0000000
Binary files a/freemarker-2.3.28.tar.gz and /dev/null differ
diff --git a/freemarker-2.3.31.tar.gz b/freemarker-2.3.31.tar.gz
new file mode 100644
index 0000000..6827fe7
Binary files /dev/null and b/freemarker-2.3.31.tar.gz differ
diff --git a/freemarker.spec b/freemarker.spec
index 2dd4586..cf7fd0b 100644
--- a/freemarker.spec
+++ b/freemarker.spec
@@ -1,5 +1,5 @@
 Name:                freemarker
-Version:             2.3.28
+Version:             2.3.31
 Release:             1
 Summary:             The Apache FreeMarker Template Engine
 License:             ASL 2.0
@@ -48,7 +48,8 @@ rm src/main/java/freemarker/log/_AvalonLoggerFactory.java
 %mvn_file org.%{name}:%{name} %{name}
 
 %build
-ant -Divy.mode=local -Ddeps.available=true javacc jar javadoc maven-pom
+JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF-8 \
+    ant -Divy.mode=local -Ddeps.available=true javacc jar javadoc maven-pom
 
 %install
 %mvn_artifact build/pom.xml build/%{name}.jar
@@ -62,5 +63,8 @@ ant -Divy.mode=local -Ddeps.available=true javacc jar javadoc maven-pom
 %license LICENSE NOTICE
 
 %changelog
+* Fri Oct 21 2022 yaoxin <yaoxin30@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
diff --git a/jsp-api.patch b/jsp-api.patch
index 45cc33f..546b8c9 100644
--- a/jsp-api.patch
+++ b/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 @@
diff --git a/jython-compatibility.patch b/jython-compatibility.patch
index bc36e05..ce62425 100644
--- a/jython-compatibility.patch
+++ b/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"
 -    />
diff --git a/no-javarebel.patch b/no-javarebel.patch
index eaa49ea..4943522 100644
--- a/no-javarebel.patch
+++ b/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,