From 0591b91a20a6755172f1abbaa803fd94e397c730a96a77140d7a7b389167d7b4 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 22 Mar 2022 09:19:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-jsp?expand=0&rev=4 --- glassfish-jsp.changes | 5 +++++ glassfish-jsp.spec | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/glassfish-jsp.changes b/glassfish-jsp.changes index 58c9028..28bb216 100644 --- a/glassfish-jsp.changes +++ b/glassfish-jsp.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 22 09:19:40 UTC 2022 - Fridrich Strba + +- Build with java source and target levels 8 + ------------------------------------------------------------------- Fri Nov 1 09:35:50 UTC 2019 - Fridrich Strba diff --git a/glassfish-jsp.spec b/glassfish-jsp.spec index 5c8dfa7..58fca7b 100644 --- a/glassfish-jsp.spec +++ b/glassfish-jsp.spec @@ -1,7 +1,7 @@ # # spec file for package glassfish-jsp # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,9 +22,9 @@ Name: glassfish-jsp Version: 2.3.4 Release: 0 Summary: Glassfish J2EE JSP API implementation -License: (CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0) AND Apache-2.0 +License: Apache-2.0 AND (CDDL-1.1 OR GPL-2.0-only WITH Classpath-exception-2.0) Group: Development/Libraries/Java -URL: http://glassfish.org +URL: https://glassfish.org Source0: %{artifactId}-%{version}.tar.xz Source1: https://raw.githubusercontent.com/javaee/javaee-jsp-api/%{artifactId}-%{version}/LICENSE Source2: http://www.apache.org/licenses/LICENSE-2.0 @@ -32,6 +32,7 @@ Patch0: %{name}-build-eclipse-compilers.patch Patch1: %{name}-port-to-servlet-3.1.patch Patch2: Tag.patch BuildRequires: fdupes +BuildRequires: java-devel >= 1.8 BuildRequires: maven-local BuildRequires: xmvn-subst BuildRequires: mvn(javax.servlet.jsp:javax.servlet.jsp-api) @@ -83,7 +84,7 @@ cp -p %{SOURCE2} . %{mvn_file} : %{name}/javax.servlet.jsp %{name} %build -%{mvn_build} -f -- -Dsource=6 +%{mvn_build} -f -- -Dsource=8 %install %mvn_install