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

!10 Upgrade version to 2.3.32

Browse Source 
From: @cherry530 
Reviewed-by: @Lostwayzxc, @caodongxia 
Signed-off-by: @caodongxia
This commit is contained in:
openeuler-ci-bot 2023-07-27 03:51:17 +00:00 committed by Gitee
commit 019b947c23
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
10 changed files with 116 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
enable-jdom.patch
View File

@ -1,6 +1,8 @@
--- src/main/java/freemarker/ext/jdom/NodeListModel.java.orig 2017-10-16 02:17:50.000000000 +0100
+++ src/main/java/freemarker/ext/jdom/NodeListModel.java 2017-12-06 18:53:07.877967201 +0000
@@ -661,7 +661,7 @@
diff --git a/src/main/java/freemarker/ext/jdom/NodeListModel.java b/src/main/java/freemarker/ext/jdom/NodeListModel.java
index 7e963f7..736b781 100644
--- a/src/main/java/freemarker/ext/jdom/NodeListModel.java
+++ b/src/main/java/freemarker/ext/jdom/NodeListModel.java
@@ -675,7 +675,7 @@ implements
else if ("data".equals(localName))
attr = new Attribute("data", pi.getData());
else
@ -9,7 +11,7 @@
} else if (node instanceof DocType) {
DocType doctype = (DocType) node;
if ("publicId".equals(localName))
@@ -762,17 +762,17 @@
@@ -781,17 +781,17 @@ implements
private static final Element getParent(Object node) {
if (node instanceof Element)
@ -32,7 +34,7 @@
else
// With 2.1 semantics it makes more sense to just return a null and let the core
// throw an InvalidReferenceException and the template writer can use ?exists etcetera. (JR)
@@ -794,7 +794,7 @@
@@ -815,7 +815,7 @@ implements
LinkedList list = new LinkedList();
do {
list.addFirst(parent);
@ -41,7 +43,7 @@
} while (parent != null);
return list;
}
@@ -808,7 +808,7 @@
@@ -830,7 +830,7 @@ implements
list.addFirst(node);
do {
list.addFirst(parent);
@ -50,7 +52,7 @@
} while (parent != null);
return list;
}
@@ -861,7 +861,7 @@
@@ -885,7 +885,7 @@ implements
Element parent = ((Attribute) node).getParent();
doc = parent == null ? null : parent.getDocument();
} else if (node instanceof Text) {
@ -59,9 +61,11 @@
doc = parent == null ? null : parent.getDocument();
} else if (node instanceof Document)
doc = (Document) node;
--- src/main/java/freemarker/ext/xml/_JdomNavigator.java.orig 2012-03-01 01:56:25.000000000 +0100
+++ src/main/java/freemarker/ext/xml/_JdomNavigator.java 2012-05-16 13:32:06.328559677 +0200
@@ -122,7 +122,7 @@
diff --git a/src/main/java/freemarker/ext/xml/_JdomNavigator.java b/src/main/java/freemarker/ext/xml/_JdomNavigator.java
index edbc0a1..95a4c01 100644
--- a/src/main/java/freemarker/ext/xml/_JdomNavigator.java
+++ b/src/main/java/freemarker/ext/xml/_JdomNavigator.java
@@ -122,7 +122,7 @@ public class _JdomNavigator extends Navigator {
} else if ("data".equals(localName)) {
result.add(new Attribute("data", pi.getData()));
} else {
@ -70,7 +74,7 @@
}
} else if (node instanceof DocType) {
DocType doctype = (DocType) node;
@@ -186,7 +186,7 @@
@@ -186,7 +186,7 @@ public class _JdomNavigator extends Navigator {
Element parent = ((Attribute) node).getParent();
return parent == null ? null : parent.getDocument();
} else if (node instanceof Text) {

8
fix-javadoc-encoding.patch
View File

@ -1,6 +1,8 @@
--- src/main/java/freemarker/template/LocalizedString.java.orig 2017-10-16 02:17:50.000000000 +0100
+++ src/main/java/freemarker/template/LocalizedString.java 2017-12-06 19:43:10.783714300 +0000
@@ -33,7 +33,7 @@
diff --git a/src/main/java/freemarker/template/LocalizedString.java b/src/main/java/freemarker/template/LocalizedString.java
index 943c7de..7052ee2 100755
--- a/src/main/java/freemarker/template/LocalizedString.java
+++ b/src/main/java/freemarker/template/LocalizedString.java
@@ -33,7 +33,7 @@ import freemarker.core.Environment;
* if "fr".equals(lang)
* return "oui";
* else if "de".equals(lang)

8
freemarker-2.3.31-use-jakarta-el.patch
View File

@ -1,14 +1,12 @@
diff --git a/ivy.xml b/ivy.xml
index 0b03c2b..e880d34 100644
index b0c80bf..65f55f1 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -98,7 +98,8 @@
@@ -97,6 +97,7 @@
<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" />

BIN
freemarker-2.3.31.tar.gz
View File

Binary file not shown.

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

Binary file not shown.

18
freemarker.spec
View File

@ -1,8 +1,8 @@
%bcond_with jp_minimal
Name: freemarker
Version: 2.3.31
Release: 2
Version: 2.3.32
Release: 1
Summary: The Apache FreeMarker Template Engine
License: ASL 2.0
URL: https://freemarker.apache.org/
@ -47,18 +47,17 @@ This package contains the API documentation for %{name}.
%setup -q
find -type f -name "*.jar" -delete
find -type f -name "*.class" -delete
%patch1
%patch2
%patch3
%patch5
%patch6
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch5 -p1
%patch6 -p1
%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 '/<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
@ -91,6 +90,9 @@ export LANG=C.UTF-8
%license LICENSE NOTICE
%changelog
* Wed Jul 26 2023 xu_ping <707078654@qq.com> - 2.3.32-1
- Update version to 2.3.32
* Tue Apr 18 2023 Dongxing Wang <dxwangk@isoftstone.com> - 2.3.31-2
- Update jakarta-el to 4.0.0

23
javacc-7.patch
View File

@ -1,18 +1,8 @@
From c119c7d20b46c91f2c661e4f3789194041c4ba16 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Tue, 4 Apr 2017 16:56:33 +0200
Subject: [PATCH] Fix compatibility with javacc 7
---
build.xml | 16 +++++++++++++++-
src/main/java/freemarker/core/TokenMgrError.java | 5 +++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 6542da9..20d1d56 100644
index 084b359..75c07fe 100644
--- a/build.xml
+++ b/build.xml
@@ -160,13 +160,26 @@
@@ -147,12 +147,25 @@
<mkdir dir="${_javaccOutputDir}" />
<ivy:retrieve conf="parser" pattern="build/javacc-home.tmp/[artifact].[ext]" />
@ -22,7 +12,7 @@ index 6542da9..20d1d56 100644
+ file="${_javaccOutputDir}/FTL.jj"
+ token="template"
+ value="xtemplate"
+ />
+ />
<javacc:generate
- target="src/main/javacc/FTL.jj"
+ target="${_javaccOutputDir}/FTL.jj"
@ -30,17 +20,12 @@ index 6542da9..20d1d56 100644
javacchome="build/javacc-home.tmp"
/>
<delete dir="build/javacc-home.tmp" />
-
+ <!-- undo template keyword replacement -->
+ <replace
+ dir="${_javaccOutputDir}"
+ token="xtemplate"
+ value="template"
+ />
+
<replace
file="${_javaccOutputDir}/FMParser.java"
token="private final LookaheadSuccess"
--
2.9.3

27
jsp-api.patch
View File

@ -1,12 +1,14 @@
--- build.xmlorig 2017-10-16 02:17:50.000000000 +0100
+++ build.xml 2017-12-06 20:05:59.056142612 +0000
@@ -303,36 +303,21 @@
diff --git a/build.xml b/build.xml
index 92033ac..814774d 100644
--- a/build.xml
+++ b/build.xml
@@ -274,35 +274,21 @@
verify="yes" stubversion="1.2"
/>
- <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"
<javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off"
debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
includeantruntime="false"
- classpathref="ivy.dep.jsp2.0"
@ -23,11 +25,11 @@
+ freemarker/ext/jsp/_FreeMarkerPageContext2.java,
+ freemarker/ext/jsp/FreeMarkerJspFactory2.java"
/>
- <!-- There's no build.jsp2.0, as those classes are part of the common build subset. -->
-
-
- <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.7" source="1.7" encoding="utf-8"
- includeantruntime="false"
- classpathref="ivy.dep.jsp2.1"
@ -37,12 +39,13 @@
- freemarker/ext/jsp/FreeMarkerJspFactory21.java,
- freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
- />
-
<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.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
<javac srcdir="build/src-main-java-filtered" destdir="build/classes" deprecation="off"
diff --git a/ivy.xml b/ivy.xml
index dad9ff2..065a3ba 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -45,9 +45,6 @@
description="for building FreeMarker without dependencies that optinal dependencies"
/>

102
jython-compatibility.patch
View File

@ -1,5 +1,56 @@
--- ivy.xml.orig 2017-12-06 19:20:16.456335648 +0000
+++ ivy.xml 2017-12-06 19:20:59.320159647 +0000
diff --git a/build.xml b/build.xml
index 814774d..f74c6de 100644
--- a/build.xml
+++ b/build.xml
@@ -290,41 +290,21 @@
/>
- <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.7" source="1.7" encoding="utf-8"
includeantruntime="false"
- classpathref="ivy.dep.jython2.0"
+ classpathref="ivy.dep.jython2.5"
bootclasspath="${boot.classpath.j2se1.7}"
includes="
freemarker/ext/ant/**,
freemarker/template/utility/JythonRuntime.java,
freemarker/ext/jython/**"
excludes="
- freemarker/ext/jython/_Jython22VersionAdapter.java,
- freemarker/ext/jython/_Jython25VersionAdapter.java"
- />
-
- <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.7" source="1.7" encoding="utf-8"
- includeantruntime="false"
- classpathref="ivy.dep.jython2.2"
- bootclasspath="${boot.classpath.j2se1.7}"
- includes="
+ freemarker/ext/jython/_Jython20And21VersionAdapter.java,
freemarker/ext/jython/_Jython22VersionAdapter.java"
/>
- <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.7" source="1.7" encoding="utf-8"
- includeantruntime="false"
- classpathref="ivy.dep.jython2.5"
- bootclasspath="${boot.classpath.j2se1.7}"
- includes="
- freemarker/ext/jython/_Jython25VersionAdapter.java"
- />
-
<rmic base="build/classes" classpathref="ivy.dep"
includes="build/src-main-java-filtered/freemarker/debug/impl/Rmi*Impl.class"
verify="yes" stubversion="1.2"
diff --git a/ivy.xml b/ivy.xml
index 065a3ba..d7af30f 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -49,12 +49,6 @@
description="for building FreeMarker with JSP 2.1 support"
/>
@ -23,50 +74,3 @@
<dependency org="org.python" name="jython" rev="2.5.0" conf="build.jython2.5->default" />
<dependency org="avalon-logkit" name="avalon-logkit" rev="2.0" conf="build.base->default" />
--- build.xml 2017-12-06 19:19:56.790416398 +0000
+++ build.xml.orig 2017-12-06 19:25:06.163149500 +0000
@@ -318,41 +318,21 @@
freemarker/ext/jsp/FreeMarkerJspFactory2.java"
/>
- <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.7" source="1.7" encoding="utf-8"
includeantruntime="false"
- classpathref="ivy.dep.jython2.0"
+ classpathref="ivy.dep.jython2.5"
bootclasspath="${boot.classpath.j2se1.7}"
includes="
freemarker/ext/ant/**,
freemarker/template/utility/JythonRuntime.java,
freemarker/ext/jython/**"
excludes="
- freemarker/ext/jython/_Jython22VersionAdapter.java,
- freemarker/ext/jython/_Jython25VersionAdapter.java"
- />
-
- <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.7" source="1.7" encoding="utf-8"
- includeantruntime="false"
- classpathref="ivy.dep.jython2.2"
- bootclasspath="${boot.classpath.j2se1.7}"
- includes="
+ freemarker/ext/jython/_Jython20And21VersionAdapter.java,
freemarker/ext/jython/_Jython22VersionAdapter.java"
/>
- <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.7" source="1.7" encoding="utf-8"
- includeantruntime="false"
- classpathref="ivy.dep.jython2.5"
- bootclasspath="${boot.classpath.j2se1.7}"
- includes="
- freemarker/ext/jython/_Jython25VersionAdapter.java"
- />
-
<rmic base="build/classes" classpathref="ivy.dep"
includes="build/src-main-java-filtered/freemarker/debug/impl/Rmi*Impl.class"
verify="yes" stubversion="1.2"

18
no-javarebel.patch
View File

@ -1,16 +1,20 @@
--- build.xml.orig 2017-12-06 18:32:24.827024991 +0000
+++ build.xml 2017-12-06 18:32:55.974897827 +0000
@@ -264,6 +264,7 @@
diff --git a/build.xml b/build.xml
index f74c6de..084b359 100644
--- a/build.xml
+++ b/build.xml
@@ -244,6 +244,7 @@
classpathref="ivy.dep"
bootclasspath="${boot.classpath.j2se1.7}"
excludes="
+ freemarker/ext/beans/JRebelClassChangeNotifier.java
+ freemarker/ext/beans/JRebelClassChangeNotifier.java,
freemarker/core/_Java?*Impl.java,
freemarker/ext/jsp/**,
freemarker/ext/servlet/**,
--- ivy.xml.orig 2017-12-06 18:24:27.374972063 +0000
+++ ivy.xml 2017-12-06 18:24:41.745913477 +0000
@@ -122,8 +122,6 @@
diff --git a/ivy.xml b/ivy.xml
index d7af30f..b0c80bf 100644
--- a/ivy.xml
+++ b/ivy.xml
@@ -108,8 +108,6 @@
<dependency org="org.slf4j" name="jcl-over-slf4j" rev="&slf4j.version;" conf="build.base->default" />
<dependency org="commons-logging" name="commons-logging" rev="1.1.1" conf="build.base->default" />