From 84bb950816acc05ad063715c529043ba37e08cdf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 14 Sep 2016 17:55:28 +0200 Subject: [PATCH] Build and install Maven plugins - Resolves: rhbz#1375904 --- aqute-bnd.spec | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/aqute-bnd.spec b/aqute-bnd.spec index 800860f..8f83c97 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -1,6 +1,6 @@ Name: aqute-bnd Version: 3.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: BND Tool License: ASL 2.0 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.osgi:org.osgi.annotation) 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 The bnd tool helps you create and diagnose OSGi bundles. @@ -47,6 +50,12 @@ Summary: BND library %description -n aqute-bndlib %{summary}. +%package -n bnd-maven-plugin +Summary: BND Maven plugin + +%description -n bnd-maven-plugin +%{summary}. + %package javadoc Summary: Javadoc for %{name} @@ -107,6 +116,13 @@ cp -p %{SOURCE6} pom.xml %pom_add_parent biz.aQute.bnd:parent:%{version} popd +# maven-plugins +%pom_xpath_inject pom:modules "maven" +# 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.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.bnd.annotation 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:bnd-plugin-parent __noinstall %build %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 %license LICENSE +%files -n bnd-maven-plugin -f .mfiles-maven + %files javadoc -f .mfiles-javadoc %license LICENSE %changelog +* Wed Sep 14 2016 Mikolaj Izdebski - 3.2.0-3 +- Build and install Maven plugins +- Resolves: rhbz#1375904 + * Wed Jun 1 2016 Mikolaj Izdebski - 3.2.0-2 - Install ant.d config files