Build and install Maven plugins

- Resolves: rhbz#1375904
This commit is contained in:
Mikolaj Izdebski 2016-09-14 17:55:28 +02:00
parent ef5b91d76a
commit 84bb950816

View File

@ -1,6 +1,6 @@
Name: aqute-bnd Name: aqute-bnd
Version: 3.2.0 Version: 3.2.0
Release: 2%{?dist} Release: 3%{?dist}
Summary: BND Tool Summary: BND Tool
License: ASL 2.0 License: ASL 2.0
URL: http://www.aqute.biz/Bnd/Bnd URL: http://www.aqute.biz/Bnd/Bnd
@ -27,6 +27,9 @@ BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi)
BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi.services) BuildRequires: mvn(org.eclipse.osgi:org.eclipse.osgi.services)
BuildRequires: mvn(org.osgi:org.osgi.annotation) BuildRequires: mvn(org.osgi:org.osgi.annotation)
BuildRequires: mvn(org.slf4j:slf4j-api) BuildRequires: mvn(org.slf4j:slf4j-api)
BuildRequires: mvn(org.apache.maven.plugins:maven-plugin-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin)
BuildRequires: mvn(org.apache.maven.plugins:maven-javadoc-plugin)
%description %description
The bnd tool helps you create and diagnose OSGi bundles. The bnd tool helps you create and diagnose OSGi bundles.
@ -47,6 +50,12 @@ Summary: BND library
%description -n aqute-bndlib %description -n aqute-bndlib
%{summary}. %{summary}.
%package -n bnd-maven-plugin
Summary: BND Maven plugin
%description -n bnd-maven-plugin
%{summary}.
%package javadoc %package javadoc
Summary: Javadoc for %{name} Summary: Javadoc for %{name}
@ -107,6 +116,13 @@ cp -p %{SOURCE6} pom.xml
%pom_add_parent biz.aQute.bnd:parent:%{version} %pom_add_parent biz.aQute.bnd:parent:%{version}
popd popd
# maven-plugins
%pom_xpath_inject pom:modules "<module>maven</module>"
# Unavailable reactor dependency - org.osgi.impl.bundle.repoindex.cli
%pom_disable_module bnd-indexer-maven-plugin maven
# Integration tests require Internet access
%pom_remove_plugin -r :maven-invoker-plugin maven
%mvn_alias biz.aQute.bnd:biz.aQute.bnd :bnd biz.aQute:bnd %mvn_alias biz.aQute.bnd:biz.aQute.bnd :bnd biz.aQute:bnd
%mvn_alias biz.aQute.bnd:biz.aQute.bndlib :bndlib biz.aQute:bndlib %mvn_alias biz.aQute.bnd:biz.aQute.bndlib :bndlib biz.aQute:bndlib
@ -114,7 +130,10 @@ popd
%mvn_package biz.aQute.bnd:biz.aQute.bndlib bndlib %mvn_package biz.aQute.bnd:biz.aQute.bndlib bndlib
%mvn_package biz.aQute.bnd:biz.aQute.bnd.annotation bndlib %mvn_package biz.aQute.bnd:biz.aQute.bnd.annotation bndlib
%mvn_package biz.aQute.bnd:aQute.libg bndlib %mvn_package biz.aQute.bnd:aQute.libg bndlib
%mvn_package biz.aQute.bnd:bnd-maven-plugin maven
%mvn_package biz.aQute.bnd:bnd-baseline-maven-plugin maven
%mvn_package biz.aQute.bnd:parent __noinstall %mvn_package biz.aQute.bnd:parent __noinstall
%mvn_package biz.aQute.bnd:bnd-plugin-parent __noinstall
%build %build
%mvn_build -- -Dproject.build.sourceEncoding=UTF-8 %mvn_build -- -Dproject.build.sourceEncoding=UTF-8
@ -135,10 +154,16 @@ echo "aqute-bnd slf4j/api slf4j/simple eclipse/osgi.services" >%{buildroot}%{_sy
%files -n aqute-bndlib -f .mfiles-bndlib %files -n aqute-bndlib -f .mfiles-bndlib
%license LICENSE %license LICENSE
%files -n bnd-maven-plugin -f .mfiles-maven
%files javadoc -f .mfiles-javadoc %files javadoc -f .mfiles-javadoc
%license LICENSE %license LICENSE
%changelog %changelog
* Wed Sep 14 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-3
- Build and install Maven plugins
- Resolves: rhbz#1375904
* Wed Jun 1 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-2 * Wed Jun 1 2016 Mikolaj Izdebski <mizdebsk@redhat.com> - 3.2.0-2
- Install ant.d config files - Install ant.d config files