b4a5899
--- freemarker-2.3.23.orig/source/build.xml	2016-01-05 13:51:18.913881273 -0500
b4a5899
+++ freemarker-2.3.23/source/build.xml	2016-01-05 16:04:10.790446860 -0500
b4a5899
@@ -1007,29 +1007,8 @@
b4a5899
   >
b4a5899
     <echo>Getting dependencies...</echo>
b4a5899
     <echo>-------------------------------------------------------</echo>
b4a5899
-    <ivy:settings id="remote" url="http://freemarker.org/repos/ivy/ivysettings-remote.xml" />
b4a5899
     
b4a5899
-    
b4a5899
-      ivypattern=".ivy.part/repo/[organisation]/[module]/ivy-[revision].xml"
b4a5899
-      pattern=".ivy.part/repo/[organisation]/[module]/[artifact]-[revision].[ext]"
b4a5899
-    />
b4a5899
-    <echo>-------------------------------------------------------</echo>
b4a5899
-    <echo>*** Successfully acquired dependencies from the Web ***</echo>
b4a5899
-    <echo>Eclipse users: Now right-click on ivy.xml and Resolve! </echo>
b4a5899
-    <echo>-------------------------------------------------------</echo>
b4a5899
-    
b4a5899
-    
b4a5899
-
b4a5899
-    
b4a5899
-    <move todir=".ivy.part/update-deps-reso-cache">
b4a5899
-      <fileset dir=".ivy/update-deps-reso-cache" />
b4a5899
-    </move>
b4a5899
-    
b4a5899
-    <delete dir=".ivy" />
b4a5899
-    
b4a5899
-    <move todir=".ivy">
b4a5899
-      <fileset dir=".ivy.part" />
b4a5899
-    </move>
b4a5899
+    <ivy:retrieve sync="true"/>
b4a5899
   </target>
b4a5899
 
b4a5899
   
b4a5899
--- freemarker-2.3.23.orig/source/ivy.xml	2016-01-05 13:51:18.900881078 -0500
b4a5899
+++ freemarker-2.3.23/source/ivy.xml	2016-01-06 11:56:54.313942232 -0500
b4a5899
@@ -83,7 +83,7 @@
b4a5899
   <dependencies>
b4a5899
     
b4a5899
     
b4a5899
-    <dependency org="jaxen" name="jaxen" rev="1.0-FCS" conf="build.base->default" />
b4a5899
+    <dependency org="jaxen" name="jaxen" rev="1.1.6" conf="build.base->default" />
b4a5899
     <dependency org="saxpath" name="saxpath" rev="1.0-FCS" conf="build.base->default" />
b4a5899
     <dependency org="xalan" name="xalan" rev="2.7.0" conf="build.base->default">
b4a5899
       
b4a5899
@@ -97,12 +97,10 @@
b4a5899
       <exclude org="xml-apis" module="xml-apis" />
b4a5899
     </dependency>
b4a5899
     
b4a5899
-    <dependency org="javax.servlet.jsp" name="jsp-api" rev="1.2" conf="build.jsp1.2->default" />
b4a5899
-    <dependency org="javax.servlet" name="servlet-api" rev="2.3" conf="build.jsp1.2->default" />
b4a5899
-    <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.0" conf="build.jsp2.0->default; example.struts-webapp->default" />
b4a5899
-    <dependency org="javax.servlet" name="servlet-api" rev="2.4" conf="build.jsp2.0->default; example.servlet->default" />
b4a5899
-    <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.1" conf="build.jsp2.1->default" />
b4a5899
-    <dependency org="javax.servlet" name="servlet-api" rev="2.5" conf="build.jsp2.1->default" />
b4a5899
+    <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.2" conf="build.jsp2.0->default; example.struts-webapp->default" />
b4a5899
+    <dependency org="javax.servlet" name="javax.servlet-api" rev="2.7" conf="build.jsp2.0->default; example.servlet->default" />
b4a5899
+    <dependency org="javax.servlet.jsp" name="jsp-api" rev="2.2" conf="build.jsp2.1->default" />
b4a5899
+    <dependency org="javax.servlet" name="javax.servlet-api" rev="2.7" conf="build.jsp2.1->default" />
b4a5899
     
b4a5899
     <dependency org="rhino" name="js" rev="1.6R1" conf="build.base->default" />
b4a5899
 
b4a5899
@@ -137,17 +135,6 @@
b4a5899
     <dependency org="org.eclipse.jetty" name="jetty-jsp" rev="&jetty.version;" conf="test->default" />
b4a5899
     <dependency org="org.eclipse.jetty" name="jetty-util" rev="&jetty.version;" conf="test->default" />
b4a5899
     
b4a5899
-    <dependency org="displaytag" name="displaytag" rev="1.2" conf="test->default">
b4a5899
-      <exclude org="com.lowagie" name="itext" />
b4a5899
-      <exclude org="org.slf4j" name="slf4j-log4j12" />
b4a5899
-      <exclude org="org.slf4j" name="jcl104-over-slf4j" />
b4a5899
-      <exclude org="log4j" name="log4j" />
b4a5899
-    </dependency>
b4a5899
-    
b4a5899
-    
b4a5899
-    
b4a5899
-    <dependency org="org.freemarker" name="docgen" rev="2.0-branch-head" conf="manual->default" changing="true" />
b4a5899
-    
b4a5899
     
b4a5899
     
b4a5899
     <dependency org="net.java.dev.javacc" name="javacc" rev="3.2" conf="parser->default" />
b4a5899
@@ -164,4 +151,4 @@
b4a5899
     <conflict org="javax.servlet.jsp" module="jsp-api" manager="strict" />
b4a5899
     
b4a5899
   </dependencies>
b4a5899
-</ivy-module>
b4a5899
\ No newline at end of file
b4a5899
+</ivy-module>