Accepting request 963027 from Java:packages

Build with source/target levels 8

OBS-URL: https://build.opensuse.org/request/show/963027
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/servletapi5?expand=0&rev=22
This commit is contained in:
Dominique Leuenberger 2022-03-28 14:59:14 +00:00 committed by Git OBS Bridge
commit 32bf0ef073
2 changed files with 11 additions and 6 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sat Mar 19 10:31:58 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with java source/target levels 8
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 4 14:29:48 UTC 2021 - Stefan Bluhm <stefan.bluhm@clacee.eu> Wed Aug 4 14:29:48 UTC 2021 - Stefan Bluhm <stefan.bluhm@clacee.eu>

View File

@ -1,7 +1,7 @@
# #
# spec file for package servletapi5 # spec file for package servletapi5
# #
# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2022 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via https://bugs.opensuse.org/
# #
@ -24,12 +24,12 @@ Release: 0
Summary: Java servlet and JSP implementation classes Summary: Java servlet and JSP implementation classes
License: Apache-2.0 License: Apache-2.0
Group: Development/Libraries/Java Group: Development/Libraries/Java
Url: http://jakarta.apache.org/tomcat/ URL: http://jakarta.apache.org/tomcat/
Source: %{full_name}-5-src.tar.gz Source: %{full_name}-5-src.tar.gz
#!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 xml-commons-apis #!BuildIgnore: xml-commons xml-commons-resolver xerces-j2 xml-commons-apis
#!BuildIgnore: xml-commons-jaxp-1.3-apis #!BuildIgnore: xml-commons-jaxp-1.3-apis
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel BuildRequires: java-devel >= 1.8
%if !0%{?rhel} %if !0%{?rhel}
Requires(post): update-alternatives Requires(post): update-alternatives
%endif %endif
@ -53,11 +53,11 @@ cd jakarta-tomcat-%{version}-src/jakarta-servletapi-5
find . -type f -name "*.jar" -exec rm -f {} \; find . -type f -name "*.jar" -exec rm -f {} \;
pushd . pushd .
cd jsr154 cd jsr154
ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8
popd popd
pushd . pushd .
cd jsr152 cd jsr152
ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist -Dant.build.javac.source=1.6 -Dant.build.javac.target=1.6 ant jar examples -Dservletapi.build=build -Dservletapi.dist=dist -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8
popd popd
%install %install