From c12c8087bcdd1ce5c87d9872bb182cefb9a93849 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
Date: Fri, 13 Aug 2021 11:45:14 +0100
Subject: [PATCH] reenable bnd-maven-plugin

---
 aqute-bnd.spec | 44 +++++++++++++++++++++++++++++++++++++++++++-
 parent.pom     |  1 +
 2 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/aqute-bnd.spec b/aqute-bnd.spec
index 5fcb6ad..9853760 100644
--- a/aqute-bnd.spec
+++ b/aqute-bnd.spec
@@ -2,7 +2,7 @@
 
 Name:           aqute-bnd
 Version:        5.2.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        BND Tool
 # Part of jpm is under BSD, but jpm is not included in binary RPM
 License:        ASL 2.0 or EPL-2.0
@@ -28,11 +28,21 @@ BuildRequires:  maven-local
 %if %{with bootstrap}
 BuildRequires:  javapackages-bootstrap
 %else
+BuildRequires:  mvn(org.apache.maven.plugin-tools:maven-plugin-annotations)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.apache.maven.shared:maven-mapping)
+BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-compat)
+BuildRequires:  mvn(org.apache.maven:maven-core)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
+BuildRequires:  mvn(org.eclipse.aether:aether-api)
 BuildRequires:  mvn(org.osgi:osgi.annotation)
 BuildRequires:  mvn(org.osgi:osgi.cmpn)
 BuildRequires:  mvn(org.osgi:osgi.core)
 BuildRequires:  mvn(org.slf4j:slf4j-api)
 BuildRequires:  mvn(org.slf4j:slf4j-simple)
+BuildRequires:  mvn(org.sonatype.plexus:plexus-build-api)
 %endif
 
 # Explicit javapackages-tools requires since bnd script uses
@@ -58,6 +68,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}
 
@@ -128,12 +144,33 @@ popd
 
 %pom_xpath_remove -r pom:project/pom:dependencies/pom:dependency/pom:scope
 
+# maven-plugins
+cp -r biz.aQute.bnd.maven/src/aQute/bnd/maven/lib/configuration maven/bnd-maven-plugin/src/main/java/aQute/bnd/maven/lib
+pushd maven
+%pom_remove_dep -r :biz.aQute.bnd.maven
+# Unavailable reactor dependency - org.osgi.impl.bundle.repoindex.cli
+%pom_disable_module bnd-indexer-maven-plugin
+# Requires unbuilt parts of bnd
+%pom_disable_module bnd-export-maven-plugin
+%pom_disable_module bnd-reporter-maven-plugin
+%pom_disable_module bnd-resolver-maven-plugin
+%pom_disable_module bnd-run-maven-plugin
+%pom_disable_module bnd-testing-maven-plugin
+# Integration tests require Internet access
+%pom_remove_plugin -r :maven-invoker-plugin
+%pom_remove_plugin -r :maven-javadoc-plugin
+
+%pom_remove_plugin -r :flatten-maven-plugin
+popd
+
 %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_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
 
@@ -156,10 +193,15 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium
 %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
+* Tue Aug 10 2021 Sérgio Basto <sergio@serjux.com> - 5.2.0-5
+- reenable bnd-maven-plugin
+
 * Mon Aug 02 2021 Mattias Ellert <mattias.ellert@physics.uu.se> - 5.2.0-4
 - Add parent to biz.aQute.bnd/pom.xml (fixes [WARNING] JAR will be
   empty - no content was marked for inclusion!)
diff --git a/parent.pom b/parent.pom
index fbff4e5..e637e27 100644
--- a/parent.pom
+++ b/parent.pom
@@ -168,6 +168,7 @@
         <module>biz.aQute.bndlib</module>
         <module>biz.aQute.bnd</module>
         <module>biz.aQute.bnd.annotation</module>
+        <module>maven</module>
     </modules>
 
     <build>