Hello community, here is the log from the commit of package tomcat for openSUSE:Leap:15.2 checked in at 2020-02-05 07:29:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/tomcat (Old) and /work/SRC/openSUSE:Leap:15.2/.tomcat.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Wed Feb 5 07:29:20 2020 rev:32 rq:766282 version:9.0.30 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/tomcat/tomcat.changes 2020-01-15 16:24:41.888627535 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.tomcat.new.26092/tomcat.changes 2020-02-05 07:29:26.550747294 +0100 @@ -2 +2 @@ -Thu Jul 4 16:05:14 UTC 2019 - Matei Albu <ma...@suse.com> +Mon Jan 20 13:36:39 UTC 2020 - Fridrich Strba <fst...@suse.com> @@ -4,7 +4,51 @@ -- Update to Tomcat 9.0.21. See changelog at - http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.21_(markt) - - Additional fix for CVE-2019-0199 addressing HTTP/2 connection window - exhaustion on write (bsc#1139924) -- Rebased patches: - - tomcat-9.0-disable-osgi-build.patch - - tomcat-9.0-javadoc.patch +- Change back the build to build with any Java >= 1.8 +- Added patch: + * tomcat-9.0.30-java8compat.patch + + Cast java.nio.ByteBuffer and java.nio.CharBuffer to + java.nio.Buffer in order to avoid calling Java 9+ APIs + (functions with co-variant return types) +- Renamed patch: + * tomcat-9.0-disable-osgi-build.patch + -> tomcat-9.0-osgi-build.patch + + Do not disable, but fix OSGi build since we have now + aqute-bnd + +------------------------------------------------------------------- +Fri Jan 17 14:26:15 UTC 2020 - Matei Albu <ma...@suse.com> + +- Change build to always use Java 1.8 (bsc#1161025). + +------------------------------------------------------------------- +Fri Dec 27 10:22:58 UTC 2019 - Matei Albu <ma...@suse.com> + +- Update to Tomcat 9.0.30. See changelog at + http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.30_(markt) +- Fixed CVEs: + - CVE-2019-0221 (bsc#1136085) + - CVE-2019-10072 (bsc#1139924) + - CVE-2019-12418 (bsc#1159723) + - CVE-2019-17563 (bsc#1159729) +- Removed patch: + * tomcat-9.0-JDTCompiler-java.patch + + It was not applied + +------------------------------------------------------------------- +Mon Nov 18 09:13:10 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Update to Tomcat 9.0.27. See changelog at + http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.27_(markt) +- Uset aqute-bnd to generate OSGi manifest, since we have that + package now in openSUSE:Factory +- Removed patch: + * tomcat-9.0-disable-osgi-build.patch + + not needed + +------------------------------------------------------------------- +Fri Nov 15 23:25:47 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Add maven pom files for tomcat-jni and tomcat-jaspic-api + +------------------------------------------------------------------- +Fri Oct 4 13:32:51 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Distribute the pom file also for tomcat-util-scan artifact @@ -13 +57,17 @@ -Tue May 21 14:33:37 UTC 2019 - Matei <ma...@suse.com> +Tue Oct 1 12:29:16 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Build against compatibility log4j12 package + +------------------------------------------------------------------- +Wed Sep 25 12:18:29 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Adapt to the new ecj directory layout + +------------------------------------------------------------------- +Wed Jun 12 14:50:12 UTC 2019 - Dominique Leuenberger <dims...@opensuse.org> + +- BuildRequire pkgconfig(systemd) instead of systemd: allow OBS to + shortcut the build queues by allowing usage of systemd-mini + +------------------------------------------------------------------- +Mon May 20 20:40:08 UTC 2019 - Matei <ma...@suse.com> @@ -16,0 +77,7 @@ +- increase maximum number of threads and open files for tomcat (bsc#1111966) + +------------------------------------------------------------------- +Mon Apr 22 17:01:17 UTC 2019 - ma...@suse.com + +- Update to Tomcat 9.0.19. See changelog at + http://tomcat.apache.org/tomcat-9.0-doc/changelog.html#Tomcat_9.0.19_(markt) @@ -21 +87,0 @@ -- increase maximum number of threads and open files for tomcat (bsc#1111966) @@ -24 +89,0 @@ - - CVE-2019-0221 (bsc#1136085) @@ -27,0 +93,6 @@ + +------------------------------------------------------------------- +Mon Apr 15 13:53:30 UTC 2019 - Fridrich Strba <fst...@suse.com> + +- Build classpath directly with the geronimo jars instead of with + symlinks to them Old: ---- apache-tomcat-9.0.21-src.tar.gz apache-tomcat-9.0.21-src.tar.gz.asc el-api-OSGi-MANIFEST.MF jasper-OSGi-MANIFEST.MF jasper-el-OSGi-MANIFEST.MF jsp-api-OSGi-MANIFEST.MF servlet-api-OSGi-MANIFEST.MF tomcat-9.0-JDTCompiler-java.patch tomcat-9.0-disable-osgi-build.patch tomcat-api-OSGi-MANIFEST.MF tomcat-juli-OSGi-MANIFEST.MF New: ---- apache-tomcat-9.0.30-src.tar.gz apache-tomcat-9.0.30-src.tar.gz.asc tomcat-9.0-osgi-build.patch tomcat-9.0.30-java8compat.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.QgddA9/_old 2020-02-05 07:29:27.286747604 +0100 +++ /var/tmp/diff_new_pack.QgddA9/_new 2020-02-05 07:29:27.290747605 +0100 @@ -1,7 +1,7 @@ # # spec file for package tomcat # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -22,7 +22,7 @@ %define elspec 3.0 %define major_version 9 %define minor_version 0 -%define micro_version 21 +%define micro_version 30 %define packdname apache-tomcat-%{version}-src # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/ %global basedir /srv/%{name} @@ -48,7 +48,7 @@ Summary: Apache Servlet/JSP/EL Engine, RI for Servlet 4.0/JSP 2.3/EL 3.0 API License: Apache-2.0 Group: Productivity/Networking/Web/Servers -Url: http://tomcat.apache.org +URL: http://tomcat.apache.org Source0: https://archive.apache.org/dist/tomcat/tomcat-%{major_version}/v%{version}/src/%{packdname}.tar.gz Source1: %{name}-%{major_version}.%{minor_version}.conf Source2: %{name}-%{major_version}.%{minor_version}.init @@ -57,15 +57,8 @@ Source5: %{name}-%{major_version}.%{minor_version}.logrotate Source6: %{name}-%{major_version}.%{minor_version}-digest.script Source7: %{name}-%{major_version}.%{minor_version}-tool-wrapper.script -Source8: servlet-api-OSGi-MANIFEST.MF -Source9: jsp-api-OSGi-MANIFEST.MF Source10: %{name}-%{major_version}.%{minor_version}-log4j.properties Source11: %{name}-%{major_version}.%{minor_version}.service -Source12: el-api-OSGi-MANIFEST.MF -Source13: jasper-el-OSGi-MANIFEST.MF -Source14: jasper-OSGi-MANIFEST.MF -Source15: tomcat-api-OSGi-MANIFEST.MF -Source16: tomcat-juli-OSGi-MANIFEST.MF Source20: %{name}-%{major_version}.%{minor_version}-jsvc.service Source21: tomcat-functions Source30: tomcat-preamble @@ -80,14 +73,14 @@ Patch0: %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.patch #PATCH-FIX-UPSTREAM: from jpackage.org package Patch1: %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch -# PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373 -Patch2: %{name}-%{major_version}.%{minor_version}-JDTCompiler-java.patch # PATCH-FIX-SLE: Change security manager default policies bnc#891264 -Patch3: %{name}-%{major_version}.%{minor_version}-sle.catalina.policy.patch +Patch2: %{name}-%{major_version}.%{minor_version}-sle.catalina.policy.patch # PATCH-FIX-OPENSUSE: build javadoc with the same java source level as the class files -Patch4: %{name}-%{major_version}.%{minor_version}-javadoc.patch -# PATCH-FIX-OPENSUSE: disable adding OSGi metadata to JAR files because bndtools is not avalable in SLES/OpenSUSE -Patch5: tomcat-9.0-disable-osgi-build.patch +Patch3: %{name}-%{major_version}.%{minor_version}-javadoc.patch +# PATCH-FIX-OPENSUSE: include all necessary aqute-bnd jars +Patch4: tomcat-9.0-osgi-build.patch +# PATCH-FIX-OPENSUSE: cast ByteBuffer to Buffer in cases where there is a risk of using Java 9+ apis +Patch5: tomcat-9.0.30-java8compat.patch BuildRequires: ant >= 1.8.1 BuildRequires: ant-antlr @@ -95,6 +88,8 @@ BuildRequires: apache-commons-daemon BuildRequires: apache-commons-dbcp >= 2.0 BuildRequires: apache-commons-pool2 +BuildRequires: aqute-bnd +BuildRequires: aqute-bndlib BuildRequires: ecj >= 4.4.0 BuildRequires: fdupes BuildRequires: findutils @@ -103,24 +98,23 @@ BuildRequires: geronimo-qname-1_1-api BuildRequires: geronimo-saaj-1_1-api BuildRequires: jakarta-taglibs-standard >= 1.1 -BuildRequires: java-devel >= 1.8.0 +BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: javapackages-tools BuildRequires: junit -BuildRequires: log4j +BuildRequires: log4j12 BuildRequires: sed -BuildRequires: systemd BuildRequires: systemd-rpm-macros BuildRequires: unzip BuildRequires: wsdl4j BuildRequires: zip +BuildRequires: pkgconfig(systemd) Requires: %{name}-lib = %{version}-%{release} Requires: apache-commons-daemon Requires: apache-commons-dbcp Requires: apache-commons-logging Requires: apache-commons-pool2 Requires: java >= 1.8 -Requires: log4j +Requires: log4j12 Requires(post): %fillup_prereq Requires(pre): %{_sbindir}/groupadd Requires(pre): %{_sbindir}/useradd @@ -260,8 +254,8 @@ -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -print -delete %patch0 %patch1 -%patch2 -p1 -%patch3 +%patch2 +%patch3 -p1 %patch4 -p1 %patch5 -p1 @@ -284,20 +278,26 @@ touch HACKDIR/build.xml ant -Dbase.path="." \ + -Dadd.osgi.jar.metadata="true" \ -Djava.7.home="%{java_home}" \ -Dbuild.compiler="modern" \ -Dcommons-collections.jar="$(build-classpath commons-collections)" \ -Dcommons-daemon.jar="$(build-classpath commons-daemon)" \ -Dcommons-daemon.native.src.tgz="HACK" \ - -Djasper-jdt.jar="$(build-classpath ecj)" \ - -Djdt.jar="$(build-classpath ecj)" \ + -Djasper-jdt.jar="$(build-classpath ecj/ecj)" \ + -Djdt.jar="$(build-classpath ecj/ecj)" \ -Dtomcat-native.tar.gz="HACK" \ -Dtomcat-native.home="." \ -Dcommons-daemon.native.win.mgr.exe="HACK" \ -Dnsis.exe="HACK" \ - -Djaxrpc-lib.jar="$(build-classpath jaxrpc)" \ + -Djaxrpc-lib.jar="$(build-classpath geronimo-jaxrpc-1.1-api)" \ -Dwsdl4j-lib.jar="$(build-classpath wsdl4j)" \ - -Dsaaj-api.jar="$(build-classpath geronimo-saaj-1_1-api)" \ + -Dsaaj-api.jar="$(build-classpath geronimo-saaj-1.1-api)" \ + -Dbnd.jar="$(build-classpath aqute-bnd/biz.aQute.bnd)" \ + -Dbndlib.jar="$(build-classpath aqute-bnd/biz.aQute.bndlib)" \ + -Dbndlibg.jar="$(build-classpath aqute-bnd/aQute.libg)" \ + -Dbndannotation.jar="$(build-classpath aqute-bnd/biz.aQute.bnd.annotation)" \ + -Dslf4j-api.jar="$(build-classpath slf4j/slf4j-api)" \ -Dcommons-pool.home="$(build-classpath commons-pool2)" \ -Dcommons-dbcp.home="$(build-classpath commons-dbcp2)" \ -Dno.build.dbcp=true \ @@ -317,15 +317,6 @@ popd popd -# inject OSGi manifests -jar ufm output/build/lib/servlet-api.jar %{SOURCE8} -jar ufm output/build/lib/jsp-api.jar %{SOURCE9} -jar ufm output/build/lib/el-api.jar %{SOURCE12} -jar ufm output/build/lib/jasper-el.jar %{SOURCE13} -jar ufm output/build/lib/jasper.jar %{SOURCE14} -jar ufm output/build/lib/tomcat-api.jar %{SOURCE15} -jar ufm output/build/bin/tomcat-juli.jar %{SOURCE16} - pushd %{_builddir}/tomcat-serverxml-tool javac -source %{javac_target} -target %{javac_target} com/suse/tcserverxml/ApplyStylesheet.java jar cfe serverxmltool.jar com.suse.tcserverxml.ApplyStylesheet com/suse/tcserverxml/ApplyStylesheet.class com/suse/tcserverxml/add-context.xslt com/suse/tcserverxml/remove-context.xslt @@ -428,7 +419,7 @@ pushd output/build %{_bindir}/build-jar-repository lib commons-collections \ - commons-dbcp2 commons-pool2 ecj 2>&1 + commons-dbcp2 commons-pool2 ecj/ecj 2>&1 # need to use -p here with b-j-r otherwise the examples webapp fails to # load with a java.io.IOException %{_bindir}/build-jar-repository -p webapps/examples/WEB-INF/lib \ @@ -444,8 +435,8 @@ rm -f commons-dbcp.jar ln -s $(build-classpath commons-dbcp2) commons-dbcp2.jar ln -s $(build-classpath commons-pool2) commons-pool2.jar - ln -s $(build-classpath log4j) log4j.jar - ln -s $(build-classpath ecj) jasper-jdt.jar + ln -s $(build-classpath log4j12/log4j-12) log4j.jar + ln -s $(build-classpath ecj/ecj) jasper-jdt.jar # Temporary copy the juli jar here from %%{_datadir}/java/tomcat (for maven depmap) cp -a %{buildroot}%{bindir}/tomcat-juli.jar ./ @@ -492,7 +483,7 @@ done # we won't install dbcp, juli-adapters and juli-extras pom files -for libname in annotations-api catalina jasper-el jasper catalina-ha; do +for libname in annotations-api catalina jasper-el jasper catalina-ha jaspic-api; do cp -a %{name}-$libname.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-$libname.pom %add_maven_depmap JPP.%{name}-$libname.pom %{name}/$libname.jar done @@ -517,6 +508,9 @@ cp -a tomcat-coyote.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-coyote.pom %add_maven_depmap JPP.%{name}-tomcat-coyote.pom %{name}/tomcat-coyote.jar +cp -a tomcat-jni.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-jni.pom +%add_maven_depmap JPP.%{name}-tomcat-jni.pom %{name}/tomcat-jni.jar + cp -a tomcat-juli.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-juli.pom %add_maven_depmap JPP.%{name}-tomcat-juli.pom %{name}/tomcat-juli.jar @@ -532,6 +526,9 @@ cp -a tomcat-util.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-util.pom %add_maven_depmap JPP.%{name}-tomcat-util.pom %{name}/tomcat-util.jar +cp -a tomcat-util-scan.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-util-scan.pom +%add_maven_depmap JPP.%{name}-tomcat-util-scan.pom %{name}/tomcat-util-scan.jar + cp -a tomcat-websocket-api.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-websocket-api.pom %add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar @@ -547,8 +544,6 @@ cp -a tomcat-embed-jasper.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom %add_maven_depmap JPP.%{name}-tomcat-embed-jasper.pom %{name}/tomcat-embed-jasper.jar -f embed -%add_maven_depmap JPP.%{name}-websocket-api.pom %{name}/websocket-api.jar - cp -a tomcat-embed-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-websocket.pom %add_maven_depmap JPP.%{name}-tomcat-embed-websocket.pom %{name}/tomcat-embed-websocket.jar -f embed ++++++ apache-tomcat-9.0.21-src.tar.gz -> apache-tomcat-9.0.30-src.tar.gz ++++++ ++++ 43506 lines of diff (skipped) ++++++ tomcat-9.0-javadoc.patch ++++++ --- /var/tmp/diff_new_pack.QgddA9/_old 2020-02-05 07:29:28.414748079 +0100 +++ /var/tmp/diff_new_pack.QgddA9/_new 2020-02-05 07:29:28.414748079 +0100 @@ -1,13 +1,7 @@ -Index: apache-tomcat-9.0.21-src/build.xml -=================================================================== ---- apache-tomcat-9.0.21-src.orig/build.xml -+++ apache-tomcat-9.0.21-src/build.xml -@@ -1851,10 +1851,11 @@ Apache Tomcat ${version} native binaries - encoding="UTF-8" - docencoding="UTF-8" - charset="UTF-8" -+ source="${compile.source}" - additionalparam="-breakiterator -notimestamp" +--- apache-tomcat-9.0.27-src/build.xml 2019-10-07 12:01:06.000000000 +0200 ++++ apache-tomcat-9.0.27-src/build.xml 2019-11-16 00:52:57.833495494 +0100 +@@ -1859,7 +1859,7 @@ + source="${compile.source}" maxmemory="512m" failonerror="true" - failonwarning="true"> @@ -15,13 +9,8 @@ <classpath> <path refid="compile.classpath"/> <path location="${ant.core.lib}"/> -@@ -1870,11 +1871,12 @@ Apache Tomcat ${version} native binaries - bottom="Copyright &#169; 2000-${year} Apache Software Foundation. All Rights Reserved." - encoding="UTF-8" - docencoding="UTF-8" -+ source="${compile.source}" - charset="UTF-8" - additionalparam="-breakiterator -notimestamp" +@@ -1881,7 +1881,7 @@ + source="${compile.source}" maxmemory="512m" failonerror="true" - failonwarning="true"> @@ -29,12 +18,8 @@ <classpath> <path refid="compile.classpath"/> <path location="${ant.core.lib}"/> -@@ -1891,10 +1893,11 @@ Apache Tomcat ${version} native binaries - encoding="UTF-8" - docencoding="UTF-8" - charset="UTF-8" -+ source="${compile.source}" - additionalparam="-breakiterator -notimestamp" +@@ -1902,7 +1902,7 @@ + source="${compile.source}" maxmemory="512m" failonerror="true" - failonwarning="true"> @@ -42,12 +27,29 @@ <classpath> <path refid="compile.classpath"/> <path location="${ant.core.lib}"/> -@@ -1911,10 +1914,11 @@ Apache Tomcat ${version} native binaries - encoding="UTF-8" +@@ -1923,7 +1923,7 @@ + source="${compile.source}" + maxmemory="512m" + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + <classpath> + <path refid="compile.classpath"/> + <path location="${ant.core.lib}"/> +@@ -1944,7 +1944,7 @@ + source="${compile.source}" + maxmemory="512m" + failonerror="true" +- failonwarning="true"> ++ failonwarning="false"> + <classpath> + <path refid="compile.classpath"/> + <path location="${ant.core.lib}"/> +@@ -1962,9 +1962,10 @@ docencoding="UTF-8" charset="UTF-8" -+ source="${compile.source}" additionalparam="-breakiterator -notimestamp" ++ source="${compile.source}" maxmemory="512m" failonerror="true" - failonwarning="true"> @@ -55,13 +57,8 @@ <classpath> <path refid="compile.classpath"/> <path location="${ant.core.lib}"/> -@@ -1930,10 +1934,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" +@@ -1984,7 +1985,7 @@ + source="${compile.source}" maxmemory="512m" failonerror="true" - failonwarning="true"> @@ -69,12 +66,11 @@ <classpath> <path refid="compile.classpath"/> <path location="${ant.core.lib}"/> -@@ -1942,9 +1947,6 @@ Apache Tomcat ${version} native binaries - <link href="../jspapi"/> +@@ -1995,8 +1996,6 @@ <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="../jaspicapi"/> +- <link href="https://docs.oracle.com/javase/8/docs/api/"/> - <link href="https://javaee.github.io/javaee-spec/javadocs/"/> <packageset dir="${tomcat.dist}/src/java/"> <include name="org/**"/> ++++++ tomcat-9.0-disable-osgi-build.patch -> tomcat-9.0-osgi-build.patch ++++++ --- /work/SRC/openSUSE:Leap:15.2/tomcat/tomcat-9.0-disable-osgi-build.patch 2020-01-15 16:24:41.304627206 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.tomcat.new.26092/tomcat-9.0-osgi-build.patch 2020-02-05 07:29:26.406747233 +0100 @@ -1,40 +1,14 @@ -Index: apache-tomcat-9.0.21-src/build.xml +Index: apache-tomcat-9.0.12-src/build.xml =================================================================== ---- apache-tomcat-9.0.21-src.orig/build.xml -+++ apache-tomcat-9.0.21-src/build.xml -@@ -730,7 +730,7 @@ - </target> - - <target name="build-bnd" unless="bnd.uptodate" -- depends="setup-bnd,build-prepare"> -+ depends="setup-bnd,build-prepare" if="add.osgi.jar.metadata"> - - <mkdir dir="${tomcat.bnd}" /> - <copy todir="${tomcat.bnd}" overwrite="yes" filtering="yes" -@@ -3199,7 +3199,7 @@ Read the Building page on the Apache Tom - - <!-- ======================= Macros, Taskdefs etc ======================== --> - -- <target name="download-bnd" > -+ <target name="download-bnd" if="add.osgi.jar.metadata"> - <!-- Download bnd --> - <antcall target="downloadfile"> - <param name="sourcefile" value="${bnd.loc}"/> -@@ -3221,7 +3221,7 @@ Read the Building page on the Apache Tom - </antcall> - </target> - -- <target name="setup-bnd" depends="download-bnd"> -+ <target name="setup-bnd" depends="download-bnd" if="add.osgi.jar.metadata"> - <!-- Add bnd tasks to project --> +--- apache-tomcat-9.0.12-src.orig/build.xml ++++ apache-tomcat-9.0.12-src/build.xml +@@ -2989,6 +2989,9 @@ Read the Building page on the Apache Tom <path id="bndlib.classpath"> <fileset file="${bnd.jar}" /> -@@ -3261,7 +3261,7 @@ Read the Building page on the Apache Tom - <zipfileset file="@{notice}" fullpath="META-INF/NOTICE" /> - <zipfileset file="@{license}" fullpath="META-INF/LICENSE" /> - </jar> -- <antcall target="add-osgi" > -+ <antcall target="add-osgi" if:set="add.osgi.jar.metadata"> - <param name="jarfile" value="@{jarfile}" /> - <param name="addOSGi" value="@{addOSGi}" /> - </antcall> + <fileset file="${bndlib.jar}" /> ++ <fileset file="${bndlibg.jar}" /> ++ <fileset file="${bndannotation.jar}" /> ++ <fileset file="${slf4j-api.jar}" /> + </path> + + <taskdef resource="aQute/bnd/ant/taskdef.properties" classpathref="bndlib.classpath" /> ++++++ tomcat-9.0.30-java8compat.patch ++++++ ++++ 3341 lines (skipped)
