Disable failOnWarning so that javadoc won't fail the build

This commit is contained in:
Coty Sutherland 2018-03-15 13:52:10 -04:00
parent 1f223663ca
commit 62602785be
2 changed files with 49 additions and 0 deletions

View File

@ -0,0 +1,47 @@
--- build.xml.orig 2018-03-15 13:49:03.366863009 -0400
+++ build.xml 2018-03-15 13:49:29.690870139 -0400
@@ -1777,7 +1777,7 @@ Apache Tomcat ${version} native binaries
additionalparam="-breakiterator -notimestamp"
maxmemory="512m"
failonerror="true"
- failonwarning="true">
+ failonwarning="false">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
@@ -1798,7 +1798,7 @@ Apache Tomcat ${version} native binaries
additionalparam="-breakiterator -notimestamp"
maxmemory="512m"
failonerror="true"
- failonwarning="true">
+ failonwarning="false">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
@@ -1819,7 +1819,7 @@ Apache Tomcat ${version} native binaries
additionalparam="-breakiterator -notimestamp"
maxmemory="512m"
failonerror="true"
- failonwarning="true">
+ failonwarning="false">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
@@ -1840,7 +1840,7 @@ Apache Tomcat ${version} native binaries
additionalparam="-breakiterator -notimestamp"
maxmemory="512m"
failonerror="true"
- failonwarning="true">
+ failonwarning="false">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>
@@ -1860,7 +1860,7 @@ Apache Tomcat ${version} native binaries
additionalparam="-breakiterator -notimestamp ${java9.add.modules}"
maxmemory="512m"
failonerror="true"
- failonwarning="true">
+ failonwarning="false">
<classpath>
<path refid="compile.classpath"/>
<path refid="tomcat.webservices.classpath"/>

View File

@ -93,6 +93,7 @@ Source32: tomcat-named.service
Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
Patch2: %{name}-8.0.36-CompilerOptionsV9.patch Patch2: %{name}-8.0.36-CompilerOptionsV9.patch
Patch3: disableJavadocFailOnWarning.patch
BuildArch: noarch BuildArch: noarch
@ -250,6 +251,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
%patch0 -p0 %patch0 -p0
%patch1 -p0 %patch1 -p0
%patch2 -p0 %patch2 -p0
%patch3 -p0
%{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-impl) webapps/examples/WEB-INF/lib/jstl.jar
%{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar %{__ln_s} $(build-classpath tomcat-taglibs-standard/taglibs-standard-compat) webapps/examples/WEB-INF/lib/standard.jar