packages/freemarker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!7 Update to 2.3.31

Browse Source 
From: @starlet-dx 
Reviewed-by: @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2022-10-21 12:55:17 +00:00 committed by Gitee
commit 046fa497e3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
freemarker-2.3.28.tar.gz
View File

Binary file not shown.

BIN
freemarker-2.3.31.tar.gz Normal file
View File

Binary file not shown.

8
freemarker.spec
View File

@ -1,5 +1,5 @@
Name: freemarker Name: freemarker
Version: 2.3.28 Version: 2.3.31
Release: 1 Release: 1
Summary: The Apache FreeMarker Template Engine Summary: The Apache FreeMarker Template Engine
License: ASL 2.0 License: ASL 2.0
@ -48,7 +48,8 @@ rm src/main/java/freemarker/log/_AvalonLoggerFactory.java
%mvn_file org.%{name}:%{name} %{name} %mvn_file org.%{name}:%{name} %{name}
%build %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 %install
%mvn_artifact build/pom.xml build/%{name}.jar %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 %license LICENSE NOTICE
%changelog %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 * Mon Aug 24 2020 liyanan <liyanan32@huawei.com> - 2.3.28-1
- package init - package init

10
jsp-api.patch
View File

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

12
jython-compatibility.patch
View File

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

2
no-javarebel.patch
View File

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