SHA256
1
0
forked from pool/tomcat
tomcat/tomcat-9.0-javadoc.patch
Matei Albu 3e36252fe4 Accepting request 696887 from home:mateialbu:branches:Java:packages
- Update to Tomcat 9.0.19. See changelog at
  http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.19_(markt)
  Notable packaging changes:
  - File /usr/share/java/tomcat/catalina-jmx-remote.jar was removed.
    The classes contained in this jar were merged into 
    /usr/share/java/tomcat/catalina.jar.
- Fixed CVEs:
  - CVE-2019-0199 (bsc#1131055)
- Rebased patch:
  - tomcat-9.0-JDTCompiler-java.patch
  - tomcat-9.0-javadoc.patch

OBS-URL: https://build.opensuse.org/request/show/696887
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=161
2019-04-22 19:57:57 +00:00

82 lines
3.0 KiB
Diff

Index: apache-tomcat-9.0.17-src/build.xml
===================================================================
--- apache-tomcat-9.0.17-src.orig/build.xml
+++ apache-tomcat-9.0.17-src/build.xml
@@ -1811,10 +1811,11 @@ Apache Tomcat ${version} native binaries
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
+ source="${compile.source}"
additionalparam="-breakiterator -notimestamp"
maxmemory="512m"
failonerror="true"
- failonwarning="true">
+ failonwarning="false">
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
@@ -1830,11 +1831,12 @@ Apache Tomcat ${version} native binaries
bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. All Rights Reserved."
encoding="UTF-8"
docencoding="UTF-8"
+ source="${compile.source}"
charset="UTF-8"
additionalparam="-breakiterator -notimestamp"
maxmemory="512m"
failonerror="true"
- failonwarning="true">
+ failonwarning="false">
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
@@ -1851,10 +1853,11 @@ Apache Tomcat ${version} native binaries
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
+ source="${compile.source}"
additionalparam="-breakiterator -notimestamp"
maxmemory="512m"
failonerror="true"
- failonwarning="true">
+ failonwarning="false">
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
@@ -1871,10 +1874,11 @@ Apache Tomcat ${version} native binaries
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
+ source="${compile.source}"
additionalparam="-breakiterator -notimestamp"
maxmemory="512m"
failonerror="true"
- failonwarning="true">
+ failonwarning="false">
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
@@ -1890,10 +1894,11 @@ Apache Tomcat ${version} native binaries
encoding="UTF-8"
docencoding="UTF-8"
charset="UTF-8"
- additionalparam="-breakiterator -notimestamp ${java9.add.modules}"
+ source="${compile.source}"
+ additionalparam="-breakiterator -notimestamp"
maxmemory="512m"
failonerror="true"
- failonwarning="true">
+ failonwarning="false">
<classpath>
<path refid="compile.classpath"/>
<path location="${ant.core.lib}"/>
@@ -1902,9 +1907,6 @@ Apache Tomcat ${version} native binaries
<link href="../jspapi"/>
<link href="../elapi"/>
<link href="../websocketapi"/>
- <link href="http://docs.oracle.com/javase/8/docs/api/"/>
- <link href="https://commons.apache.org/proper/commons-io/javadocs/api-release/"/>
- <link href="https://javaee.github.io/javaee-spec/javadocs/"/>
<packageset dir="${tomcat.dist}/src/java/">
<include name="org/**"/>
<exclude name="org/apache/el/parser/**"/>