Accepting request 963952 from Java:packages

Build with source/target levels 8

OBS-URL: https://build.opensuse.org/request/show/963952
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-osgi?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2022-03-22 18:40:48 +00:00 committed by Git OBS Bridge
commit 01d08cfb4d
2 changed files with 11 additions and 4 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Mar 22 13:32:28 UTC 2022 - Fridrich Strba <fstrba@suse.com>
- Build with java source and target levels 8
-------------------------------------------------------------------
Sun Nov 24 17:06:36 UTC 2019 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package maven-osgi
#
# Copyright (c) 2019 SUSE LLC
# 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,7 +22,7 @@ Release: 0
Summary: Library for Maven-OSGi integration
License: Apache-2.0
Group: Development/Libraries/Java
URL: http://maven.apache.org/shared/maven-osgi
URL: https://maven.apache.org/shared/maven-osgi
# svn export http://svn.apache.org/repos/asf/maven/shared/tags/maven-osgi-0.2.0 maven-osgi-0.2.0
# find -name *.jar -delete
# tar caf maven-osgi-0.2.0.tar.xz maven-osgi-0.2.0/
@ -30,6 +30,7 @@ Source0: %{name}-%{version}.tar.xz
# ASL mandates that the licence file be included in redistributed source
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildRequires: fdupes
BuildRequires: java-devel >= 1.8
BuildRequires: maven-local
BuildRequires: xz
BuildRequires: mvn(biz.aQute:bndlib)
@ -61,10 +62,11 @@ sed -i 's/import aQute\.lib\.osgi/import aQute.bnd.osgi/g' src/main/java/org/apa
%pom_xpath_set "pom:artifactId[text()='plexus-maven-plugin']" plexus-component-metadata
%build
%{mvn_build} -f \
%{mvn_build} -f -- \
%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0}
-- -Dmaven.compiler.release=6
-Dmaven.compiler.release=8 \
%endif
-Dsource=8
%install
%mvn_install