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