From 62602785bea662cc492ddcfd70462e047267a355 Mon Sep 17 00:00:00 2001
From: Coty Sutherland <csutherl@redhat.com>
Date: Thu, 15 Mar 2018 13:52:10 -0400
Subject: [PATCH] Disable failOnWarning so that javadoc won't fail the build

---
 disableJavadocFailOnWarning.patch | 47 +++++++++++++++++++++++++++++++
 tomcat.spec                       |  2 ++
 2 files changed, 49 insertions(+)
 create mode 100644 disableJavadocFailOnWarning.patch

diff --git a/disableJavadocFailOnWarning.patch b/disableJavadocFailOnWarning.patch
new file mode 100644
index 0000000..03d03c5
--- /dev/null
+++ b/disableJavadocFailOnWarning.patch
@@ -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"/>
diff --git a/tomcat.spec b/tomcat.spec
index 0e3d384..e19394c 100644
--- a/tomcat.spec
+++ b/tomcat.spec
@@ -93,6 +93,7 @@ Source32:      tomcat-named.service
 Patch0:        %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch
 Patch1:        %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
 Patch2:        %{name}-8.0.36-CompilerOptionsV9.patch
+Patch3:        disableJavadocFailOnWarning.patch
 
 BuildArch:     noarch
 
@@ -250,6 +251,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch0 -p0
 %patch1 -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-compat) webapps/examples/WEB-INF/lib/standard.jar