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

tomcat.spec

@@ -13,7 +13,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via https://bugs.opensuse.org/
+# Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 
@@ -22,7 +22,7 @@
 %define elspec 3.0
 %define major_version 9
 %define minor_version 0
-%define micro_version 14
+%define micro_version 19
 %define packdname apache-tomcat-%{version}-src
 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
 %global basedir /srv/%{name}
@@ -260,7 +260,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
           -name "*.jar" -o -name "*.war" -o -name "*.zip" \) -print -delete
 %patch0
 %patch1
-%patch2
+%patch2 -p1
 %patch3
 %patch4 -p1
 %patch5 -p1
@@ -303,7 +303,7 @@ ant -Dbase.path="." \
     -Dno.build.dbcp=true \
     -Dversion="%{version}" \
     -Dversion.build="%{micro_version}" \
-    deploy dist-prepare dist-source javadoc package embed-jars extras-jmx-remote
+    deploy dist-prepare dist-source javadoc package embed-jars
 
 # remove some jars that we'll replace with symlinks later
 rm output/build/bin/commons-daemon.jar \
@@ -376,11 +376,6 @@ pushd output/embed
     cp -a *.jar %{buildroot}%{libdir}
 popd
 
-# tomcat extras
-pushd output/extras
-    cp -a *.jar %{buildroot}%{libdir}
-popd
-
 # javadoc
 cp -a output/dist/webapps/docs/api/* %{buildroot}%{_javadocdir}/%{name}