Fridrich Strba
03c801c86e
- Update to v2.3.31 - Update patches: * enable-jdom.patch * javacc-7.patch * jsp-api.patch * jython-compatibility.patch * no-javarebel.patch - Remove unneeded patch: * fix-javadoc-encoding.patch - Package the manual. Add build dependency on docbook5-xsl-stylesheets OBS-URL: https://build.opensuse.org/request/show/953181 OBS-URL: https://build.opensuse.org/package/show/Java:packages/freemarker?expand=0&rev=7
64 lines
2.7 KiB
Diff
64 lines
2.7 KiB
Diff
Index: freemarker-2.3.31/build.xml
|
|
===================================================================
|
|
--- freemarker-2.3.31.orig/build.xml
|
|
+++ freemarker-2.3.31/build.xml
|
|
@@ -273,20 +273,19 @@
|
|
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"
|
|
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.7}"
|
|
includes="
|
|
freemarker/ext/jsp/**,
|
|
freemarker/ext/servlet/**,
|
|
freemarker/cache/WebappTemplateLoader.java"
|
|
excludes="
|
|
- freemarker/ext/jsp/_FreeMarkerPageContext21.java,
|
|
- freemarker/ext/jsp/FreeMarkerJspFactory21.java,
|
|
- freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
|
|
+ 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. -->
|
|
Index: freemarker-2.3.31/ivy.xml
|
|
===================================================================
|
|
--- freemarker-2.3.31.orig/ivy.xml
|
|
+++ freemarker-2.3.31/ivy.xml
|
|
@@ -45,9 +45,6 @@
|
|
description="for building FreeMarker without dependencies that optinal dependencies"
|
|
/>
|
|
|
|
- <conf name="build.jsp2.0" extends="build.base"
|
|
- description="for building FreeMarker with JSP 2.0 support"
|
|
- />
|
|
<conf name="build.jsp2.1" extends="build.base"
|
|
description="for building FreeMarker with JSP 2.1 support"
|
|
/>
|
|
@@ -104,9 +101,7 @@
|
|
<exclude org="xml-apis" module="xml-apis" />
|
|
</dependency>
|
|
|
|
- <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.0" conf="build.jsp2.0->default" />
|
|
- <dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="build.jsp2.0->default" />
|
|
- <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="build.jsp2.1->default" />
|
|
+ <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="rhino" name="js" rev="1.6R1" conf="build.base->default" />
|
|
@@ -183,7 +178,7 @@
|
|
|
|
<!-- Ensure that JSP versions don't accidentally hide each-other -->
|
|
|
|
- <conflict org="javax.servlet.jsp" module="jsp-api" manager="strict" />
|
|
+ <conflict org="javax.servlet" module="jsp-api" manager="strict" />
|
|
|
|
</dependencies>
|
|
</ivy-module>
|