Accepting request 547624 from home:mateialbu:branches:Java:packages

- Update to Tomcat 9.0.2:
  * Major update for tomcat8 from tomcat9
  * For full changelog please read upstream changes at:
    + http://tomcat.apache.org/tomcat-9.0-doc/changelog.html
  * Rename all tomcat-8.0-* files to tomcat-9.0-*
- Changed patches:
  * Deleted: tomcat-8.0-bootstrap-MANIFEST.MF.patch
  * Deleted: tomcat-8.0-sle.catalina.policy.patch
  * Deleted: tomcat-8.0-tomcat-users-webapp.patch
  * Deleted: tomcat-8.0.33-JDTCompiler-java.patch
  * Deleted: tomcat-8.0.44-javadoc.patch
  * Deleted: tomcat-8.0.9-property-build.windows.patch
  * Added: tomcat-9.0-JDTCompiler-java.patch
  * Added: tomcat-9.0-bootstrap-MANIFEST.MF.patch
  * Added: tomcat-9.0-javadoc.patch
  * Added: tomcat-9.0-sle.catalina.policy.patch
  * Added: tomcat-9.0-tomcat-users-webapp.patch
- Renamed subpackage tomcat-3_1-api to tomcat-4_0-api
- Commented out JAVA_HOME in /etc/tomcat/tomcat.conf
- Marked /usr/share/java/*.jar symlinks to /etc/alternatives
  as %ghost

OBS-URL: https://build.opensuse.org/request/show/547624
OBS-URL: https://build.opensuse.org/package/show/Java:packages/tomcat?expand=0&rev=115

apache-tomcat-8.0.47-src.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a2e34a707f1d2ab03aae194db2aed7aa525e62ee3cd648e7058bee49ac1b578c
-size 4996505

apache-tomcat-8.0.47-src.tar.gz.asc

@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
-
-iQIcBAABCgAGBQJZzlCjAAoJECCLCrHWMBHHgeAP/3BzfQpy8+glSgYJlfaVBI3v
-7+a4ZM24/ADePqjP4455HzmtZL7GFnfIWzKiTek5BYSHAVC0QkBdr0v59i2XhgmU
-HzE4WxuE91Se8Y59CQHy/TZ9ra4yJmMCCfazxSESFsHXZJ4i76cn7mhAwtGUY2kz
-YJkTV3YdH09aJ2WtLxzVAICAp3a14C3bE+mylKJ4IaQtWjhqzB1XxBnypveJPJP5
-kQ7qW61tgg/d+qqvQhlYRwBlKND86ZWgxcXJ5OrTZCSDDoule1CJDGUAyn5WuVyG
-A2iRIMpwRmT5fifDALcC3KtVhimuK/nBoa9uFTiSB0brtN8wPSavMtgA3cbU4UQP
-8Hq/t9UuQ9wMhAtmcBaKV+2dFX2IfcT6YmWZyX//1fI9JDdjiqmLOx10yhPISjdl
-8xYvcfMZ1FxIb3s+ukHGsJXVeMv3AQT4UcyZT+OaJvn1Bft74ZC9mfE8iQBhSzJ2
-vvwZ3bWf0ltcXJT06VVoG7k1QbgDjg33E+6nn2gkfBQR5iNP62rb45i3r9OG6+8P
-Kod5ilZTdKSYaEuow3HLpa78Hy+qNHHfrnSRE+QStBJhmcso/+B1IXT8MJjYLGQV
-qHMtlla6yt4z5ZbtA8brjACWimtX0n4EikvXWEyvuuhvzrBg2rn/bbSvR4+g5ibA
-z3Ao7ToPrQ3m5k/IajK4
-=tqTZ
------END PGP SIGNATURE-----

apache-tomcat-9.0.2-src.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:50e37122a87875b41b79743140ad808feecd55f5787a847dc0fd6083bf4d9598
+size 5047832

apache-tomcat-9.0.2-src.tar.gz.asc

@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iEYEABECAAYFAloZ3J0ACgkQb7IeiTPGAkOHRQCfZKihZnMkrUsWAcNpyYiHMXXG
+pOIAn0OwbvwlLYkyF5ij1EycuBdjg5zd
+=C16n
+-----END PGP SIGNATURE-----

tomcat-8.0.44-javadoc.patch

@@ -1,42 +0,0 @@
---- apache-tomcat-8.0.44-src/build.xml	2017-05-10 19:27:41.000000000 +0200
-+++ apache-tomcat-8.0.44-src/build.xml	2017-09-19 11:04:39.650918739 +0200
-@@ -1952,6 +1952,7 @@
-       encoding="UTF-8"
-       docencoding="UTF-8"
-       charset="UTF-8"
-+      source="${compile.source}"
-       additionalparam="-breakiterator -notimestamp"
-       maxmemory="512m"
-       failonerror="true">
-@@ -1972,6 +1973,7 @@
-       encoding="UTF-8"
-       docencoding="UTF-8"
-       charset="UTF-8"
-+      source="${compile.source}"
-       additionalparam="-breakiterator -notimestamp"
-       maxmemory="512m"
-       failonerror="true">
-@@ -1992,6 +1994,7 @@
-       encoding="UTF-8"
-       docencoding="UTF-8"
-       charset="UTF-8"
-+      source="${compile.source}"
-       additionalparam="-breakiterator -notimestamp"
-       maxmemory="512m"
-       failonerror="true">
-@@ -2012,6 +2015,7 @@
-       encoding="UTF-8"
-       docencoding="UTF-8"
-       charset="UTF-8"
-+      source="${compile.source}"
-       additionalparam="-breakiterator -notimestamp"
-       maxmemory="512m"
-       failonerror="true">
-@@ -2031,6 +2035,7 @@
-       encoding="UTF-8"
-       docencoding="UTF-8"
-       charset="UTF-8"
-+      source="${compile.source}"
-       additionalparam="-breakiterator -notimestamp"
-       maxmemory="512m"
-       failonerror="true">

tomcat-8.0.9-property-build.windows.patch

@@ -1,27 +0,0 @@
-Index: apache-tomcat-8.0.32-src/build.properties.default
-===================================================================
---- apache-tomcat-8.0.32-src.orig/build.properties.default
-+++ apache-tomcat-8.0.32-src/build.properties.default
-@@ -58,6 +58,9 @@ execute.findbugs=false
- # multicast tests to work
- java.net.preferIPv4Stack=false
- 
-+# ----- Build on Windows ----
-+build.windows=false
-+
- # Location of GPG executable (used only for releases)
- gpg.exec=/path/to/gpg
- 
-Index: apache-tomcat-8.0.32-src/build.xml
-===================================================================
---- apache-tomcat-8.0.32-src.orig/build.xml
-+++ apache-tomcat-8.0.32-src/build.xml
-@@ -2844,7 +2844,7 @@ skip.installer property in build.propert
-   </target>
- 
-   <target name="download-dist"
--          description="Download additional components for a distribution" >
-+          description="Download additional components for a distribution" if="${build.windows}">
- 
-     <antcall target="downloadzip-2">
-       <param name="sourcefile.1" value="${tomcat-native.win.1}"/>

tomcat-9.0-JDTCompiler-java.patch

@@ -1,6 +1,11 @@
---- java/org/apache/jasper/compiler/JDTCompiler.java.orig	2016-04-22 11:13:13.194743602 +0200
+Index: java/org/apache/jasper/compiler/JDTCompiler.java
-+++ java/org/apache/jasper/compiler/JDTCompiler.java	2016-04-22 11:17:02.457841335 +0200
+IDEA additional info:
-@@ -311,10 +311,10 @@ public class JDTCompiler extends org.apa
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- java/org/apache/jasper/compiler/JDTCompiler.java	(date 1506521372000)
++++ java/org/apache/jasper/compiler/JDTCompiler.java	(revision )
+@@ -312,10 +312,10 @@
                               CompilerOptions.VERSION_1_7);
              } else if(opt.equals("1.8")) {
                  settings.put(CompilerOptions.OPTION_Source,
@@ -13,7 +18,7 @@
              } else {
                  log.warn("Unknown source VM " + opt + " ignored.");
                  settings.put(CompilerOptions.OPTION_Source,
-@@ -358,14 +358,14 @@ public class JDTCompiler extends org.apa
+@@ -359,14 +359,14 @@
                          CompilerOptions.VERSION_1_7);
              } else if(opt.equals("1.8")) {
                  settings.put(CompilerOptions.OPTION_TargetPlatform,

tomcat-9.0-digest.script

@@ -34,7 +34,7 @@ export CLASSPATH
 MAIN_CLASS="org.apache.catalina.startup.Tool"
 BASE_FLAGS="-Dcatalina.home=\"$CATALINA_HOME\""
 BASE_OPTIONS=""
-BASE_JARS="commons-daemon tomcat/catalina servlet tomcat/tomcat-util tomcat/api"
+BASE_JARS="commons-daemon tomcat/catalina servlet"
 
 # Set parameters
 set_classpath $BASE_JARS

tomcat-9.0-javadoc.patch

@@ -0,0 +1,72 @@
+Index: build.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+--- build.xml	(date 1511643656000)
++++ build.xml	(revision )
+@@ -1772,10 +1772,11 @@
+       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 refid="tomcat.webservices.classpath"/>
+@@ -1793,10 +1794,11 @@
+       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 refid="tomcat.webservices.classpath"/>
+@@ -1814,10 +1816,11 @@
+       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 refid="tomcat.webservices.classpath"/>
+@@ -1835,10 +1838,11 @@
+       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 refid="tomcat.webservices.classpath"/>
+@@ -1855,10 +1859,11 @@
+       encoding="UTF-8"
+       docencoding="UTF-8"
+       charset="UTF-8"
++      source="${compile.source}"
+       additionalparam="-breakiterator -notimestamp ${java9.add.modules}"
+       maxmemory="512m"
+       failonerror="true"
+-      failonwarning="true">
++      failonwarning="false">
+       <classpath>
+         <path refid="compile.classpath"/>
+         <path refid="tomcat.webservices.classpath"/>

tomcat-9.0-sle.catalina.policy.patch

@@ -1,24 +1,11 @@
 Index: conf/catalina.policy
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
 ===================================================================
---- conf/catalina.policy.orig
+--- conf/catalina.policy	(revision Local version)
-+++ conf/catalina.policy
++++ conf/catalina.policy	(revision Shelved version)
-@@ -100,6 +100,7 @@ grant codeBase "file:${catalina.home}/bi
+@@ -167,6 +167,9 @@
-         //  ${file.separator}classes${file.separator}logging.properties", "read";
- };
- 
-+
- // These permissions apply to the server startup code
- grant codeBase "file:${catalina.home}/bin/bootstrap.jar" {
-         permission java.security.AllPermission;
-@@ -112,7 +113,6 @@ grant codeBase "file:${catalina.home}/li
-         permission java.security.AllPermission;
- };
- 
--
- // If using a per instance lib directory, i.e. ${catalina.base}/lib,
- // then the following permission will need to be uncommented
- // grant codeBase "file:${catalina.base}/lib/-" {
-@@ -167,6 +167,9 @@ grant {
      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.tomcat";
  
      // Precompiled JSPs need access to these packages.
@@ -28,7 +15,7 @@ Index: conf/catalina.policy
      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.el";
      permission java.lang.RuntimePermission "accessClassInPackage.org.apache.jasper.runtime";
      permission java.lang.RuntimePermission
-@@ -233,6 +236,15 @@ grant codeBase "file:${catalina.home}/we
+@@ -230,6 +233,15 @@
  };
  
  
@@ -44,11 +31,3 @@ Index: conf/catalina.policy
  // You can assign additional permissions to particular web applications by
  // adding additional "grant" entries here, based on the code base for that
  // application, /WEB-INF/classes/, or /WEB-INF/lib/ jar files.
-@@ -264,7 +276,6 @@ grant codeBase "file:${catalina.home}/we
- // grant codeBase "jar:file:${catalina.base}/webapps/examples/WEB-INF/lib/scrape.jar!/-" {
- //      permission java.net.SocketPermission "*.noaa.gov:80", "connect";
- // };
--
- // To grant permissions for web applications using packed WAR files, use the
- // Tomcat specific WAR url scheme.
- //

tomcat-9.0.conf

@@ -20,7 +20,7 @@ TOMCAT_CFG_LOADED="1"
 TOMCATS_BASE="/var/lib/tomcats/"
 
 # Where your java installation lives
-JAVA_HOME="/usr/lib/jvm/jre"
+#JAVA_HOME="/usr/libi64/jvm/jre"
 
 # Where your tomcat installation lives
 CATALINA_HOME="@@@TCHOME@@@"

tomcat.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Fri Dec  1 21:46:18 UTC 2017 - malbu@suse.com
+
+- Update to Tomcat 9.0.2:
+  * Major update for tomcat8 from tomcat9
+  * For full changelog please read upstream changes at:
+    + http://tomcat.apache.org/tomcat-9.0-doc/changelog.html
+  * Rename all tomcat-8.0-* files to tomcat-9.0-*
+- Changed patches:
+  * Deleted: tomcat-8.0-bootstrap-MANIFEST.MF.patch
+  * Deleted: tomcat-8.0-sle.catalina.policy.patch
+  * Deleted: tomcat-8.0-tomcat-users-webapp.patch
+  * Deleted: tomcat-8.0.33-JDTCompiler-java.patch
+  * Deleted: tomcat-8.0.44-javadoc.patch
+  * Deleted: tomcat-8.0.9-property-build.windows.patch
+  * Added: tomcat-9.0-JDTCompiler-java.patch
+  * Added: tomcat-9.0-bootstrap-MANIFEST.MF.patch
+  * Added: tomcat-9.0-javadoc.patch
+  * Added: tomcat-9.0-sle.catalina.policy.patch
+  * Added: tomcat-9.0-tomcat-users-webapp.patch
+- Renamed subpackage tomcat-3_1-api to tomcat-4_0-api
+- Commented out JAVA_HOME in /etc/tomcat/tomcat.conf
+- Marked /usr/share/java/*.jar symlinks to /etc/alternatives
+  as %ghost
+
 -------------------------------------------------------------------
 Thu Nov 23 13:50:29 UTC 2017 - rbrown@suse.com
 

tomcat.spec

@@ -23,11 +23,11 @@
 %endif
 
 %define jspspec 2.3
-%define servletspec 3.1
+%define servletspec 4.0
 %define elspec 3.0
-%define major_version 8
+%define major_version 9
 %define minor_version 0
-%define micro_version 47
+%define micro_version 2
 %define packdname apache-tomcat-%{version}-src
 # FHS 2.3 compliant tree structure - http://www.pathname.com/fhs/2.3/
 %global basedir /srv/%{name}
@@ -43,7 +43,7 @@
 Name:           tomcat
 Version:        %{major_version}.%{minor_version}.%{micro_version}
 Release:        0
-Summary:        Apache Servlet/JSP/EL Engine, RI for Servlet 3.1/JSP 2.3/EL 3.0 API
+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
@@ -77,13 +77,13 @@ Patch0:         %{name}-%{major_version}.%{minor_version}-bootstrap-MANIFEST.MF.
 #PATCH-FIX-UPSTREAM: from jpackage.org package
 Patch1:         %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.patch
 #PATCH-FIX-OPENSUSE: skip few windows specific parts of build
-Patch2:         tomcat-8.0.9-property-build.windows.patch
+#Patch2:         %{name}-%{major_version}.%{minor_version}-property-build.windows.patch
 # PATCH-FIX-UPSTREAM: https://issues.apache.org/bugzilla/show_bug.cgi?id=56373
-Patch3:         tomcat-8.0.33-JDTCompiler-java.patch
+Patch2:         %{name}-%{major_version}.%{minor_version}-JDTCompiler-java.patch
 # PATCH-FIX-SLE: Change security manager default policies bnc#891264                                                                                                        
-Patch4:         tomcat-8.0-sle.catalina.policy.patch
+Patch3:         %{name}-%{major_version}.%{minor_version}-sle.catalina.policy.patch  
 # PATCH-FIX-OPENSUSE: build javadoc with the same java source level as the class files
-Patch5:         tomcat-8.0.44-javadoc.patch
+Patch4:         %{name}-%{major_version}.%{minor_version}-javadoc.patch
 BuildRequires:  ant >= 1.8.1
 BuildRequires:  ant-antlr
 BuildRequires:  apache-commons-collections
@@ -218,7 +218,7 @@ Obsoletes:      jakarta-commons-dbcp-tomcat5 < 1.4
 %description lib
 Libraries required to successfully run the Tomcat Web container
 
-%package servlet-3_1-api
+%package servlet-4_0-api
 Summary:        Apache Tomcat Servlet API implementation classes
 Group:          Productivity/Networking/Web/Servers
 Requires(post): update-alternatives
@@ -229,8 +229,9 @@ Provides:       servlet31
 Provides:       servlet7
 Obsoletes:      servlet < %{servletspec}
 Obsoletes:      tomcat-servlet-3_0-api
+Obsoletes:      tomcat-servlet-3_1-api
 
-%description servlet-3_1-api
+%description servlet-4_0-api
 Apache Tomcat Servlet API implementation classes version 3.1
 
 %package webapps
@@ -249,10 +250,9 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
           -name "*.jar" -o -name "*.war" -o -name "*.zip" \) | xargs -t rm -f
 %patch0
 %patch1
-%patch2 -p1
+%patch2
 %patch3
 %patch4
-%patch5 -p1
 
 # remove date from docs
 sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl
@@ -545,10 +545,6 @@ cp -a tomcat-embed-el.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-e
 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
 
-cp -a tomcat-embed-logging-juli.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-logging-juli.pom
-%add_maven_depmap JPP.%{name}-tomcat-embed-logging-juli.pom %{name}/tomcat-embed-logging-juli.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
 
 cp -a tomcat-embed-websocket.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-tomcat-embed-websocket.pom
@@ -569,6 +565,13 @@ echo "%{name}/catalina-ant" > %{buildroot}/%{_sysconfdir}/ant.d/catalina-ant
 #bnc#565901
 ln -sf %{_sbindir}/%{name} %{buildroot}/%{bindir}/catalina.sh
 
+# Install update-alternatives content                                              
+mkdir -p %{buildroot}%{_sysconfdir}/alternatives              
+ln -s %{_sysconfdir}/alternatives/el_api %{buildroot}%{_javadir}/el_api.jar        
+ln -s %{_sysconfdir}/alternatives/el_1_0_api %{buildroot}%{_javadir}/el_1_0_api.jar
+ln -s %{_sysconfdir}/alternatives/jsp %{buildroot}%{_javadir}/jsp.jar      
+ln -s %{_sysconfdir}/alternatives/servlet %{buildroot}%{_javadir}/servlet.jar
+
 mkdir -p %{buildroot}%{_tmpfilesdir}
 cat > %{buildroot}%{_tmpfilesdir}/%{name}.conf <<EOF
 f %{_localstatedir}/run/%{name}.pid 0644 tomcat tomcat -
@@ -624,11 +627,11 @@ if [ $1 -eq 0 ] ; then
         %{_javadir}/%{name}-jsp-%{jspspec}-api.jar
 fi
 
-%post servlet-3_1-api
+%post servlet-4_0-api
 update-alternatives --install %{_javadir}/servlet.jar servlet \
     %{_javadir}/%{name}-servlet-%{servletspec}-api.jar 30000
 
-%postun servlet-3_1-api
+%postun servlet-4_0-api
 if [ $1 -eq 0 ] ; then
     update-alternatives --remove servlet \
         %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
@@ -681,6 +684,7 @@ rm -f \
 %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/server.xml
 %attr(0660,tomcat,tomcat) %config(noreplace) %{confdir}/tomcat-users.xml
 %attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/web.xml
+%attr(0664,tomcat,tomcat) %config(noreplace) %{confdir}/jaspic-providers.xml
 %dir %{homedir}
 %{_tmpfilesdir}/%{name}.conf
 %{bindir}/bootstrap.jar
@@ -764,9 +768,8 @@ rm -f \
 %{_mavenpomdir}/JPP.%{name}-tomcat-embed-core.pom
 %{_mavenpomdir}/JPP.%{name}-tomcat-embed-el.pom
 %{_mavenpomdir}/JPP.%{name}-tomcat-embed-jasper.pom
-%{_mavenpomdir}/JPP.%{name}-tomcat-embed-logging-juli.pom
 
-%files servlet-3_1-api
+%files servlet-4_0-api
 %doc LICENSE
 %{_javadir}/%{name}-servlet-%{servletspec}-api.jar
 %{_javadir}/%{name}-servlet-api.jar