|
 |
bb59b1a |
--- build.xmlorig 2017-10-16 02:17:50.000000000 +0100
|
|
|
bb59b1a |
+++ build.xml 2017-12-06 20:05:59.056142612 +0000
|
|
|
bb59b1a |
@@ -303,36 +303,21 @@
|
|
|
bb59b1a |
verify="yes" stubversion="1.2"
|
|
|
bb59b1a |
/>
|
|
|
bb59b1a |
|
|
|
bb59b1a |
- <ivy:cachepath conf="build.jsp2.0" pathid="ivy.dep.jsp2.0" />
|
|
|
bb59b1a |
+ <ivy:cachepath conf="build.jsp2.1" pathid="ivy.dep.jsp2.1" />
|
|
|
bb59b1a |
|
|
 |
3b126c5 |
debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
|
|
|
bb59b1a |
includeantruntime="false"
|
|
|
bb59b1a |
- classpathref="ivy.dep.jsp2.0"
|
|
|
bb59b1a |
+ classpathref="ivy.dep.jsp2.1"
|
|
|
3b126c5 |
bootclasspath="${boot.classpath.j2se1.7}"
|
|
|
bb59b1a |
includes="
|
|
|
bb59b1a |
freemarker/ext/jsp/**,
|
|
|
bb59b1a |
freemarker/ext/servlet/**,
|
|
|
bb59b1a |
freemarker/cache/WebappTemplateLoader.java"
|
|
|
bb59b1a |
excludes="
|
|
|
bb59b1a |
- freemarker/ext/jsp/_FreeMarkerPageContext21.java,
|
|
|
bb59b1a |
- freemarker/ext/jsp/FreeMarkerJspFactory21.java,
|
|
|
bb59b1a |
- freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
|
|
|
bb59b1a |
+ freemarker/ext/jsp/_FreeMarkerPageContext2.java,
|
|
|
bb59b1a |
+ freemarker/ext/jsp/FreeMarkerJspFactory2.java"
|
|
|
bb59b1a |
/>
|
|
|
bb59b1a |
|
|
|
bb59b1a |
-
|
|
|
bb59b1a |
-
|
|
|
bb59b1a |
- <ivy:cachepath conf="build.jsp2.1" pathid="ivy.dep.jsp2.1" />
|
|
|
bb59b1a |
-
|
|
|
3b126c5 |
- debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
|
|
|
bb59b1a |
- includeantruntime="false"
|
|
|
bb59b1a |
- classpathref="ivy.dep.jsp2.1"
|
|
|
3b126c5 |
- bootclasspath="${boot.classpath.j2se1.7}"
|
|
|
bb59b1a |
- includes="
|
|
|
bb59b1a |
- freemarker/ext/jsp/_FreeMarkerPageContext21.java,
|
|
|
bb59b1a |
- freemarker/ext/jsp/FreeMarkerJspFactory21.java,
|
|
|
bb59b1a |
- freemarker/ext/jsp/FreeMarkerJspApplicationContext.java"
|
|
|
bb59b1a |
- />
|
|
|
bb59b1a |
-
|
|
|
bb59b1a |
<ivy:cachepath conf="build.jython2.0" pathid="ivy.dep.jython2.0" />
|
|
|
bb59b1a |
|
|
|
3b126c5 |
debug="on" optimize="off" target="1.7" source="1.7" encoding="utf-8"
|
|
|
bb59b1a |
--- ivy.xml.orig 2018-03-30 22:03:42.000000000 +0100
|
|
|
bb59b1a |
+++ ivy.xml 2018-08-22 08:53:03.369873853 +0100
|
|
|
bb59b1a |
@@ -45,9 +45,6 @@
|
|
|
bb59b1a |
description="for building FreeMarker without dependencies that optinal dependencies"
|
|
|
bb59b1a |
/>
|
|
|
bb59b1a |
|
|
|
bb59b1a |
-
|
|
|
bb59b1a |
- description="for building FreeMarker with JSP 2.0 support"
|
|
|
bb59b1a |
- />
|
|
|
bb59b1a |
|
|
|
bb59b1a |
description="for building FreeMarker with JSP 2.1 support"
|
|
|
bb59b1a |
/>
|
|
|
bb59b1a |
@@ -104,9 +101,7 @@
|
|
|
bb59b1a |
<exclude org="xml-apis" module="xml-apis" />
|
|
|
bb59b1a |
</dependency>
|
|
|
bb59b1a |
|
|
|
bb59b1a |
- <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.0" conf="build.jsp2.0->default" />
|
|
|
bb59b1a |
- <dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="build.jsp2.0->default" />
|
|
|
bb59b1a |
- <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="build.jsp2.1->default" />
|
|
|
bb59b1a |
+ <dependency org="javax.servlet" name="jsp-api" rev="2.1" conf="build.jsp2.1->default" />
|
|
|
bb59b1a |
<dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="build.jsp2.1->default" />
|
|
|
bb59b1a |
|
|
|
bb59b1a |
<dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default" />
|
|
|
bb59b1a |
@@ -183,7 +178,7 @@
|
|
|
bb59b1a |
|
|
|
bb59b1a |
|
|
|
bb59b1a |
|
|
|
bb59b1a |
- <conflict org="javax.servlet.jsp" module="jsp-api" manager="strict" />
|
|
|
bb59b1a |
+ <conflict org="javax.servlet" module="jsp-api" manager="strict" />
|
|
|
bb59b1a |
|
|
|
bb59b1a |
</dependencies>
|
|
|
bb59b1a |
</ivy-module>
|