rpm/maven-osgi
SHA256
1
0
Fork 0
forked from pool/maven-osgi
Code Pull Requests Activity

Accepting request 750588 from Java:packages

Browse Source 
fix build with new maven-javadoc-plugin

OBS-URL: https://build.opensuse.org/request/show/750588
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/maven-osgi?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2019-11-26 15:59:14 +00:00 committed by Git OBS Bridge
commit 444149085a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
maven-osgi.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Nov 24 17:06:36 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Specify maven.compiler.release to fix build with jdk9+ and newer
maven-javadoc-plugin
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 3 15:03:52 UTC 2019 - Fridrich Strba <fstrba@suse.com> Fri May 3 15:03:52 UTC 2019 - Fridrich Strba <fstrba@suse.com>

10
maven-osgi.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package maven-osgi # 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 # 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
@ -31,11 +31,11 @@ Source0: %{name}-%{version}.tar.xz
Source1: http://www.apache.org/licenses/LICENSE-2.0.txt Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: xz
BuildRequires: mvn(biz.aQute:bndlib) BuildRequires: mvn(biz.aQute:bndlib)
BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:) BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildRequires: mvn(org.apache.maven:maven-project) BuildRequires: mvn(org.apache.maven:maven-project)
BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata)
BuildRequires: xz
BuildArch: noarch BuildArch: noarch
%description %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 %pom_xpath_set "pom:artifactId[text()='plexus-maven-plugin']" plexus-component-metadata
%build %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 %install
%mvn_install %mvn_install