Accepting request 765850 from Java:packages

Restore the capacity to build with jdk 9+

OBS-URL: https://build.opensuse.org/request/show/765850
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/tomcat?expand=0&rev=61

tomcat.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Jan 20 13:36:39 UTC 2020 - Fridrich Strba <fstrba@suse.com>
+
+- 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 <malbu@suse.com>
 

tomcat.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package tomcat
 #
-# Copyright (c) 2020 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
@@ -77,8 +77,10 @@ Patch1:         %{name}-%{major_version}.%{minor_version}-tomcat-users-webapp.pa
 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
 Patch3:         %{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
+# PATCH-FIX-OPENSUSE: include all necessary aqute-bnd jars
-Patch4:         tomcat-9.0-disable-osgi-build.patch
+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
@@ -96,9 +98,8 @@ BuildRequires:  geronimo-jaxrpc-1_1-api
 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:  log4j12
 BuildRequires:  sed
@@ -256,6 +257,7 @@ find . -type f \( -name "*.bat" -o -name "*.class" -o -name Thumbs.db -o -name "
 %patch2
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 # remove date from docs
 sed -i -e '/build-date/ d' webapps/docs/tomcat-docs.xsl