---- apache-tomcat-7.0.63-src/build.xml~ 2015-06-30 11:15:44.000000000 +0300
-+++ apache-tomcat-7.0.63-src/build.xml 2015-07-26 21:31:46.613106110 +0300
-@@ -632,7 +574,7 @@
- <target name="compile" depends="compile-java6,check-java7,compile-java7" />
+--- apache-tomcat-7.0.100-src/build.xml.org 2020-02-11 09:39:54.000000000 +0100
++++ apache-tomcat-7.0.100-src/build.xml 2020-02-29 19:19:42.236875428 +0100
+@@ -683,7 +683,7 @@
+ <target name="compile" depends="compile-java6, check-java7, compile-java7" />
<target name="compile-java6"
-- depends="build-prepare,download-compile,compile-prepare,validate">
+- depends="build-prepare, download-compile, compile-prepare, validate">
+ depends="build-prepare">
<!-- Compile internal server components -->
<javac srcdir="java" destdir="${tomcat.classes}"
debug="${compile.debug}"
-@@ -1198,7 +1198,7 @@
+@@ -1409,7 +1409,7 @@
</target>
<mkdir dir="${test.classes}"/>
<!-- Compile -->
<javac srcdir="test" destdir="${test.classes}"
-@@ -1371,7 +1310,7 @@
- </path>
+@@ -1621,7 +1621,7 @@
</target>
-- <target name="cobertura-instrument" depends="compile,download-cobertura,cobertura-disabled"
-+ <target name="cobertura-instrument" depends="compile,cobertura-disabled"
- if="${test.cobertura}"
+ <target name="cobertura-instrument"
+- depends="compile,download-cobertura,cobertura-disabled,cobertura-disabled-log"
++ depends="compile,cobertura-disabled,cobertura-disabled-log"
+ if="${cobertura.enabled}"
description="Adds Cobertura instrumentation to the compiled bytecode">
-@@ -1430,52 +1369,10 @@
+@@ -1667,66 +1667,10 @@
<mkdir dir="${tomcat.extras}/webservices"/>
</target>
- depends="extras-prepare"
- description="Prepare to build web services extras package">
-
-- <antcall target="downloadfile-2">
-- <param name="sourcefile.1" value="${commons-logging-src.loc.1}"/>
-- <param name="sourcefile.2" value="${commons-logging-src.loc.2}"/>
+- <antcall target="downloadfile">
+- <param name="sourcefile" value="${commons-logging-src.loc}"/>
- <param name="destfile" value="${commons-logging-src.tar.gz}"/>
- <param name="destdir" value="${commons-logging.home}"/>
+- <param name="checksum.enabled" value="${commons-logging-src.checksum.enabled}"/>
+- <param name="checksum.algorithm" value="${commons-logging-src.checksum.algorithm}"/>
+- <param name="checksum.value" value="${commons-logging-src.checksum.value}"/>
- </antcall>
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${avalon-framework.loc}"/>
- <param name="destfile" value="${avalon-framework.jar}"/>
- <param name="destdir" value="${avalon-framework.home}"/>
+- <param name="checksum.enabled" value="${avalon-framework.checksum.enabled}"/>
+- <param name="checksum.algorithm" value="${avalon-framework.checksum.algorithm}"/>
+- <param name="checksum.value" value="${avalon-framework.checksum.value}"/>
- </antcall>
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${log4j.loc}"/>
- <param name="destfile" value="${log4j.jar}"/>
- <param name="destdir" value="${log4j.home}"/>
+- <param name="checksum.enabled" value="${log4j.checksum.enabled}"/>
+- <param name="checksum.algorithm" value="${log4j.checksum.algorithm}"/>
+- <param name="checksum.value" value="${log4j.checksum.value}"/>
- </antcall>
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${logkit.loc}"/>
- <param name="destfile" value="${logkit.jar}"/>
- <param name="destdir" value="${logkit.home}"/>
+- <param name="checksum.enabled" value="${logkit.checksum.enabled}"/>
+- <param name="checksum.algorithm" value="${logkit.checksum.algorithm}"/>
+- <param name="checksum.value" value="${logkit.checksum.value}"/>
- </antcall>
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${servletapi.loc}"/>
- <param name="destfile" value="${servletapi.jar}"/>
- <param name="destdir" value="${servletapi.home}"/>
+- <param name="checksum.enabled" value="${servletapi.checksum.enabled}"/>
+- <param name="checksum.algorithm" value="${servletapi.checksum.algorithm}"/>
+- <param name="checksum.value" value="${servletapi.checksum.value}"/>
- </antcall>
-
- </target>
<replace dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java/org/apache/commons"
encoding="ISO-8859-1">
<replacefilter token="org.apache.commons"
-@@ -1497,7 +1394,8 @@
+@@ -1763,7 +1706,8 @@
file="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/build.xml" />
<copy todir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src">
<fileset file="${log4j.jar}" />
<fileset file="${logkit.jar}" />
<fileset file="${servletapi.jar}" />
-@@ -1577,18 +1475,6 @@
+@@ -1842,24 +1786,6 @@
depends="extras-prepare"
description="Prepare to build web services extras package">
- <param name="sourcefile" value="${jaxrpc-lib.loc}"/>
- <param name="destfile" value="${jaxrpc-lib.jar}"/>
- <param name="destdir" value="${jaxrpc-lib.home}"/>
+- <param name="checksum.enabled" value="${jaxrpc-lib.checksum.enabled}"/>
+- <param name="checksum.algorithm" value="${jaxrpc-lib.checksum.algorithm}"/>
+- <param name="checksum.value" value="${jaxrpc-lib.checksum.value}"/>
- </antcall>
-
- <antcall target="downloadfile">
- <param name="sourcefile" value="${wsdl4j-lib.loc}"/>
- <param name="destfile" value="${wsdl4j-lib.jar}"/>
- <param name="destdir" value="${wsdl4j-lib.home}"/>
+- <param name="checksum.enabled" value="${wsdl4j-lib.checksum.enabled}"/>
+- <param name="checksum.algorithm" value="${wsdl4j-lib.checksum.algorithm}"/>
+- <param name="checksum.value" value="${wsdl4j-lib.checksum.value}"/>
- </antcall>
-
<copy file="${jaxrpc-lib.jar}"
tofile="${tomcat.extras}/webservices/jaxrpc.jar" />
<copy file="${wsdl4j-lib.jar}"
-@@ -1694,7 +1580,7 @@
+@@ -1961,7 +1887,7 @@
</target>
<mkdir dir="${tomcat.dist}"/>
<mkdir dir="${tomcat.dist}/bin"/>
<mkdir dir="${tomcat.dist}/conf"/>
-@@ -1832,13 +1832,6 @@
+@@ -2034,13 +1960,6 @@
</fileset>
</copy>
<echo append="false" file="${tomcat.dist}/bin/x64/README">
Apache Tomcat ${version} native binaries for Win64 AMD64/EMT64 platform.
</echo>
-
+@@ -2791,7 +2791,7 @@ skip.installer property in build.propert
+
+ <target name="download-deps"
+ description="Download the dependencies required to build and test"
+- depends="download-compile, download-dist, download-test-compile, download-validate, download-cobertura, extras-commons-logging-prepare, extras-webservices-prepare" />
++ depends="download-compile, download-dist, download-test-compile, download-validate, download-cobertura, extras-webservices-prepare" />
+
+ <target name="download-validate"
+ description="Download components necessary to validate source"
projects / packages / tomcat.git / blobdiff