--- build.xml.orig	2018-07-31 16:53:30.644130082 -0400
+++ build.xml	2018-07-31 16:56:12.472419607 -0400
@@ -216,7 +216,7 @@
   <path id="tomcat.webservices.classpath">
     <path refid="tomcat.classpath" />
     <fileset dir="${tomcat.extras}/webservices">
-      <include name="jaxrpc.jar"/>
+      <!--<include name="jaxrpc.jar"/>-->
       <include name="wsdl4j.jar"/>
     </fileset>
   </path>
@@ -1056,12 +1056,11 @@
     </copy>
 
     <!-- Delete all other versions of Eclipse JDT Compiler and copy the current one -->
-    <local name="jdt.jar.filename" />
-    <basename property="jdt.jar.filename" file="${jdt.jar}"/>
+    <basename property="deploy.jdt.jar.filename" file="${jdt.jar}"/>
     <delete verbose="true">
       <fileset dir="${tomcat.build}/lib">
         <include name="ecj-*.jar"/>
-        <exclude name="${jdt.jar.filename}"/>
+        <exclude name="${deploy.jdt.jar.filename}"/>
       </fileset>
     </delete>
     <copy file="${jdt.jar}" todir="${tomcat.build}/lib"/>
@@ -1734,8 +1733,8 @@
       <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
     </antcall>
 
-    <copy file="${jaxrpc-lib.jar}"
-          tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
+    <!--<copy file="${jaxrpc-lib.jar}"
+          tofile="${tomcat.extras}/webservices/jaxrpc.jar" />-->
     <copy file="${wsdl4j-lib.jar}"
           tofile="${tomcat.extras}/webservices/wsdl4j.jar" />
   </target>
@@ -2976,7 +2975,7 @@ Apache Tomcat ${version} native binaries
     <local name="temp.file"/>
     <mkdir dir="${base.path}"/>
     <tempfile property="temp.file" destdir="${base.path}" prefix="download-"/>
-    <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${temp.file}.tar.gz" />
+    <get src="${sourcefile}" dest="${temp.file}.tar.gz" />
     <verifyChecksum
       enabled="${checksum.enabled}"
       algorithm="${checksum.algorithm}" value="${checksum.value}"
@@ -3018,7 +3017,7 @@ Apache Tomcat ${version} native binaries
     <local name="temp.file"/>
     <mkdir dir="${base.path}"/>
     <tempfile property="temp.file" destdir="${base.path}" prefix="download-" suffix=".zip"/>
-    <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${temp.file}"/>
+    <get src="${sourcefile}" dest="${temp.file}"/>
     <verifyChecksum
       enabled="${checksum.enabled}"
       algorithm="${checksum.algorithm}" value="${checksum.value}"
@@ -3058,7 +3057,7 @@ Apache Tomcat ${version} native binaries
     <local name="temp.file"/>
     <mkdir dir="${base.path}"/>
     <tempfile property="temp.file" destdir="${base.path}" prefix="download-" suffix=".tmp"/>
-    <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${temp.file}"/>
+    <get src="${sourcefile}" dest="${temp.file}"/>
     <verifyChecksum
       enabled="${checksum.enabled}"
       algorithm="${checksum.algorithm}" value="${checksum.value}"
@@ -3109,7 +3108,7 @@ Apache Tomcat ${version} native binaries
 
   <target name="trydownload" if="trydownload.run" depends="trydownload.check">
     <!-- Downloads a file if not yet downloaded and the source URL is available -->
-    <get src="${sourcefile}" httpusecaches="${trydownload.httpusecaches}" dest="${destfile}" />
+    <get src="${sourcefile}" dest="${destfile}" />
   </target>
 
   <!-- ============================ IDE Support ============================ -->