diff --git a/maven-osgi.changes b/maven-osgi.changes index 0fbb86f..105e8ac 100644 --- a/maven-osgi.changes +++ b/maven-osgi.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Nov 24 17:06:36 UTC 2019 - Fridrich Strba + +- Specify maven.compiler.release to fix build with jdk9+ and newer + maven-javadoc-plugin + ------------------------------------------------------------------- Fri May 3 15:03:52 UTC 2019 - Fridrich Strba diff --git a/maven-osgi.spec b/maven-osgi.spec index 1ad37ac..c40d36a 100644 --- a/maven-osgi.spec +++ b/maven-osgi.spec @@ -1,7 +1,7 @@ # # spec file for package maven-osgi # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -31,11 +31,11 @@ Source0: %{name}-%{version}.tar.xz Source1: http://www.apache.org/licenses/LICENSE-2.0.txt BuildRequires: fdupes BuildRequires: maven-local +BuildRequires: xz BuildRequires: mvn(biz.aQute:bndlib) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildRequires: mvn(org.apache.maven:maven-project) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) -BuildRequires: xz BuildArch: noarch %description @@ -61,8 +61,10 @@ 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 -# Tests depend on binary JARs which were removed from sources -%{mvn_build} -f +%{mvn_build} -f \ +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} + -- -Dmaven.compiler.release=6 +%endif %install %mvn_install