Hello community, here is the log from the commit of package tomcat for openSUSE:Factory checked in at 2019-11-18 20:11:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/tomcat (Old) and /work/SRC/openSUSE:Factory/.tomcat.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tomcat" Mon Nov 18 20:11:09 2019 rev:58 rq:749212 version:9.0.27 Changes: -------- --- /work/SRC/openSUSE:Factory/tomcat/tomcat.changes 2019-10-07 13:42:04.924167494 +0200 +++ /work/SRC/openSUSE:Factory/.tomcat.new.26869/tomcat.changes 2019-11-18 20:11:18.657563857 +0100 @@ -1,0 +2,16 @@ +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 + +------------------------------------------------------------------- Old: ---- apache-tomcat-9.0.20-src.tar.gz apache-tomcat-9.0.20-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-api-OSGi-MANIFEST.MF tomcat-juli-OSGi-MANIFEST.MF New: ---- apache-tomcat-9.0.27-src.tar.gz apache-tomcat-9.0.27-src.tar.gz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tomcat.spec ++++++ --- /var/tmp/diff_new_pack.qz2o8u/_old 2019-11-18 20:11:20.177563082 +0100 +++ /var/tmp/diff_new_pack.qz2o8u/_new 2019-11-18 20:11:20.181563081 +0100 @@ -1,7 +1,7 @@ # # spec file for package tomcat # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 20 +%define micro_version 27 %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 @@ -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 @@ -260,7 +255,7 @@ -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -print -delete %patch0 %patch1 -%patch2 -p1 +#%patch2 -p1 %patch3 %patch4 -p1 %patch5 -p1 @@ -284,6 +279,7 @@ 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)" \ @@ -298,6 +294,11 @@ -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)" \ + -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 +318,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 @@ -492,7 +484,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 +509,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 ++++++ apache-tomcat-9.0.20-src.tar.gz -> apache-tomcat-9.0.27-src.tar.gz ++++++ ++++ 38133 lines of diff (skipped) ++++++ tomcat-9.0-disable-osgi-build.patch ++++++ --- /var/tmp/diff_new_pack.qz2o8u/_old 2019-11-18 20:11:21.209562556 +0100 +++ /var/tmp/diff_new_pack.qz2o8u/_new 2019-11-18 20:11:21.213562554 +0100 @@ -2,39 +2,13 @@ =================================================================== --- apache-tomcat-9.0.12-src.orig/build.xml +++ apache-tomcat-9.0.12-src/build.xml -@@ -740,7 +740,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" -@@ -3178,7 +3178,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}"/> -@@ -3200,7 +3200,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 --> +@@ -2989,6 +2989,9 @@ Read the Building page on the Apache Tom <path id="bndlib.classpath"> <fileset file="${bnd.jar}" /> -@@ -3240,7 +3240,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-javadoc.patch ++++++ --- /var/tmp/diff_new_pack.qz2o8u/_old 2019-11-18 20:11:21.221562550 +0100 +++ /var/tmp/diff_new_pack.qz2o8u/_new 2019-11-18 20:11:21.225562548 +0100 @@ -1,13 +1,7 @@ -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" +--- 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}"/> -@@ -1830,11 +1831,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}"/> -@@ -1851,10 +1853,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}"/> -@@ -1871,10 +1874,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}"/> -@@ -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" +@@ -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}"/> -@@ -1902,9 +1907,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/**"/>
