1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
Description: Drop jython support
Author: Bastian Germann <bage@debian.org>
Bug-Debian: https://bugs.debian.org/877387
---
--- libfreemarker-java-2.3.32.orig/build.xml
+++ libfreemarker-java-2.3.32/build.xml
@@ -302,40 +302,6 @@
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"
- includeantruntime="false"
- classpathref="ivy.dep.jython2.0"
- 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/_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"
- />
<copy toDir="build/classes">
<fileset dir="src/main/resources"
--- libfreemarker-java-2.3.32.orig/ivy.xml
+++ libfreemarker-java-2.3.32/ivy.xml
@@ -113,10 +113,6 @@
<dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default" />
- <!-- We use Jython 2.1 because there was no 2.0 in central; the relevant methods are the same. -->
- <dependency org="jython" name="jython" rev="2.1" conf="build.jython2.0->default" />
- <dependency org="org.python" name="jython" rev="2.2.1" conf="build.jython2.2->default" />
- <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" />
<dependency org="org.slf4j" name="slf4j-api" rev="${slf4j.version}" conf="build.base->default" />
|
