---- apache-tomcat-7.0.70-src/build.xml~ 2016-07-19 15:43:44.000000000 +0200
-+++ apache-tomcat-7.0.70-src/build.xml 2016-07-19 15:48:19.615551746 +0200
-@@ -1836,7 +1836,7 @@ Apache Tomcat ${version} native binaries
+--- apache-tomcat-7.0.100-src/build.xml~ 2020-02-29 19:29:03.000000000 +0100
++++ apache-tomcat-7.0.100-src/build.xml 2020-02-29 19:30:10.956020378 +0100
+@@ -1981,7 +1981,7 @@ Apache Tomcat ${version} native binaries
+ encoding="UTF-8"
+ docencoding="UTF-8"
+ charset="UTF-8"
+- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
++ additionalparam="-Xdoclint:none -breakiterator -notimestamp ${java9.javadoc.options}"
+ source="${compile.source}"
+ maxmemory="512m"
+ failonerror="true">
+@@ -2002,7 +2002,7 @@ Apache Tomcat ${version} native binaries
encoding="ISO-8859-1"
docencoding="ISO-8859-1"
charset="ISO-8859-1"
-- additionalparam="-breakiterator -notimestamp"
-+ additionalparam="-Xdoclint:none -breakiterator -notimestamp"
+- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
++ additionalparam="-Xdoclint:none -breakiterator -notimestamp ${java9.javadoc.options}"
+ source="${compile.source}"
maxmemory="512m"
failonerror="true"
- executable="${java.7.home}/bin/javadoc">
---- apache-tomcat-7.0.70-src/build.xml~ 2016-07-19 15:48:55.000000000 +0200
-+++ apache-tomcat-7.0.70-src/build.xml 2016-07-19 15:52:07.842156930 +0200
-@@ -1857,7 +1857,7 @@ Apache Tomcat ${version} native binaries
+@@ -2024,7 +2024,7 @@ Apache Tomcat ${version} native binaries
encoding="ISO-8859-1"
docencoding="ISO-8859-1"
charset="ISO-8859-1"
-- additionalparam="-breakiterator -notimestamp"
-+ additionalparam="-Xdoclint:none -breakiterator -notimestamp"
+- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
++ additionalparam="-Xdoclint:none -breakiterator -notimestamp ${java9.javadoc.options}"
+ source="${compile.source}"
maxmemory="512m"
failonerror="true"
- executable="${java.7.home}/bin/javadoc">
---- apache-tomcat-7.0.70-src/build.xml~ 2016-07-19 15:52:27.000000000 +0200
-+++ apache-tomcat-7.0.70-src/build.xml 2016-07-19 15:53:28.337957151 +0200
-@@ -1919,7 +1919,7 @@ Apache Tomcat ${version} native binaries
+@@ -2046,7 +2046,7 @@ Apache Tomcat ${version} native binaries
encoding="ISO-8859-1"
docencoding="ISO-8859-1"
charset="ISO-8859-1"
-- additionalparam="-breakiterator -notimestamp"
-+ additionalparam="-Xdoclint:none -breakiterator -notimestamp"
+- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
++ additionalparam="-Xdoclint:none -breakiterator -notimestamp ${java9.javadoc.options}"
+ source="${compile.source}"
maxmemory="512m"
failonerror="true"
- executable="${java.7.home}/bin/javadoc">
---- apache-tomcat-7.0.81-src/build.xml~ 2017-10-04 11:16:30.000000000 +0200
-+++ apache-tomcat-7.0.81-src/build.xml 2017-10-04 11:48:42.218524719 +0200
-@@ -1932,7 +1932,7 @@ Apache Tomcat ${version} native binaries
+@@ -2068,7 +2068,7 @@ Apache Tomcat ${version} native binaries
encoding="ISO-8859-1"
docencoding="ISO-8859-1"
charset="ISO-8859-1"
-- additionalparam="-breakiterator -notimestamp"
-+ additionalparam="-Xdoclint:none -breakiterator -notimestamp"
+- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options}"
++ additionalparam="-Xdoclint:none -breakiterator -notimestamp ${java9.javadoc.options}"
+ source="${compile.source}"
maxmemory="512m"
failonerror="true"
- executable="${java.7.home}/bin/javadoc">
---- apache-tomcat-7.0.94-src/build.xml~ 2019-05-08 09:40:51.000000000 +0200
-+++ apache-tomcat-7.0.94-src/build.xml 2019-05-08 09:42:01.675738032 +0200
-@@ -2559,7 +2559,7 @@ Apache Tomcat ${version} native binaries
-
- <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"
---- apache-tomcat-7.0.94-src/build.xml~ 2019-05-08 09:42:27.000000000 +0200
-+++ apache-tomcat-7.0.94-src/build.xml 2019-05-08 09:52:06.183789472 +0200
-@@ -1955,7 +1955,7 @@ Apache Tomcat ${version} native binaries
+@@ -2089,7 +2089,7 @@ Apache Tomcat ${version} native binaries
encoding="ISO-8859-1"
docencoding="ISO-8859-1"
charset="ISO-8859-1"
-- additionalparam="-breakiterator -notimestamp"
-+ additionalparam="-Xdoclint:none -breakiterator -notimestamp"
+- additionalparam="-breakiterator -notimestamp ${java9.javadoc.options} -J-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 -XDignore.symbol.file"
++ additionalparam="-Xdoclint:none -breakiterator -notimestamp ${java9.javadoc.options} -J-Dhttps.protocols=TLSv1,TLSv1.1,TLSv1.2 -XDignore.symbol.file"
+ source="${compile.source}"
maxmemory="512m"
failonerror="true"
- executable="${java.7.home}/bin/javadoc">
---- 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
-@@ -655,7 +655,7 @@
+--- 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"
<!-- 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">
-@@ -1556,67 +1556,10 @@
+@@ -1681,67 +1681,10 @@
<mkdir dir="${tomcat.extras}/webservices"/>
</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}" />
-@@ -1660,24 +1660,6 @@
+@@ -1842,24 +1786,6 @@
depends="extras-prepare"
description="Prepare to build web services extras package">
<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"