Fix building with jdk9
OBS-URL: https://build.opensuse.org/package/show/Java:packages/servletapi4?expand=0&rev=13
This commit is contained in:
parent
d98a47e4a2
commit
8e283fae95
@ -6,7 +6,7 @@ Index: jakarta-servletapi-4-src/build.xml
|
||||
|
||||
<!-- Java classes -->
|
||||
<javac srcdir="src/share" destdir="${servletapi.build}/classes"
|
||||
+ source="1.4" target="1.4"
|
||||
+ source="1.6" target="1.6"
|
||||
debug="${compile.debug}" deprecation="${compile.deprecation}"
|
||||
optimize="${compile.optimize}"/>
|
||||
|
||||
@ -14,7 +14,7 @@ Index: jakarta-servletapi-4-src/build.xml
|
||||
<target name="javadoc" depends="prepare">
|
||||
|
||||
<javadoc packagenames="javax.servlet.*"
|
||||
+ source="1.4"
|
||||
+ source="1.6" additionalparam="-Xdoclint:none"
|
||||
sourcepath="${basedir}/src/share"
|
||||
destdir="${servletapi.build}/docs/api"
|
||||
use="true"
|
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Sep 10 13:00:57 UTC 2017 - fstrba@suse.com
|
||||
|
||||
- Removed patch:
|
||||
* java150_build.patch
|
||||
- Added patch:
|
||||
* java160_build.patch
|
||||
+ Specify java source and target level 1.6 in order to allow
|
||||
building with jdk9
|
||||
+ Disable doclint, since errors of javadoc in jdk9 are fatal
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 29 20:07:26 UTC 2015 - dmueller@suse.com
|
||||
|
||||
|
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package servletapi4
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -26,7 +26,7 @@ License: Apache-1.1
|
||||
Group: Development/Libraries/Java
|
||||
Url: http://jakarta.apache.org/tomcat/
|
||||
Source: %{full_name}-4-src.tar.gz
|
||||
Patch150: java150_build.patch
|
||||
Patch160: java160_build.patch
|
||||
BuildRequires: ant
|
||||
BuildRequires: ant >= 1.2
|
||||
BuildRequires: java-devel >= 1.7.0
|
||||
@ -56,7 +56,7 @@ contains the javadoc documentation for the Java Servlet and JSP APIs.
|
||||
|
||||
%prep
|
||||
%setup -q -n %{full_name}-4-src
|
||||
%patch150 -p1
|
||||
%patch160 -p1
|
||||
|
||||
%build
|
||||
ant dist -Dservletapi.build=build -Dservletapi.dist=dist
|
||||
|
Loading…
Reference in New Issue
Block a user