diff --git a/aggregator.pom b/aggregator.pom new file mode 100644 index 0000000..a8c9044 --- /dev/null +++ b/aggregator.pom @@ -0,0 +1,44 @@ + + + 4.0.0 + org.fedoraproject.xmvn.aqute-bnd + aggregator + any + pom + + UTF-8 + + + aQute.libg + biz.aQute.bndlib + biz.aQute.bnd + biz.aQute.bnd.annotation + biz.aQute.bnd.ant + biz.aQute.bnd.util + maven + + + src + + + src/ + + **/*.java + **/packageinfo + + + + + + org.apache.maven.plugins + maven-compiler-plugin + any + + 1.8 + 1.8 + + + + + diff --git a/aqute-bnd.spec b/aqute-bnd.spec index 0187837..19599e9 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -23,7 +23,7 @@ Source0: %{name}-%{version}.tar.gz Source1: generate-tarball.sh # Auxiliary parent pom, packager-written -Source2: parent.pom +Source2: aggregator.pom Source3: https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom Source4: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{version}/biz.aQute.bnd-%{version}.pom Source5: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/%{version}/biz.aQute.bndlib-%{version}.pom @@ -109,7 +109,6 @@ API documentation for %{name}. rm biz.aQute.bnd/src/aQute/bnd/main/{ExportReportCommand,MbrCommand,RemoteCommand,ReporterLogger,ResolveCommand,Shell}.java cp %SOURCE2 pom.xml -%pom_xpath_set "pom:project/pom:version" "%{version}" sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info %if %{without bnd_maven_plugin} @@ -119,14 +118,14 @@ sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd # libg pushd aQute.libg cp -p %{SOURCE3} pom.xml -%pom_add_parent biz.aQute.bnd:parent:%{version} +%pom_add_parent org.fedoraproject.xmvn.aqute-bnd:aggregator:any %pom_add_dep org.osgi:osgi.cmpn popd # bnd.annotation pushd biz.aQute.bnd.annotation cp -p %{SOURCE6} pom.xml -%pom_add_parent biz.aQute.bnd:parent:%{version} +%pom_add_parent org.fedoraproject.xmvn.aqute-bnd:aggregator:any %pom_add_dep org.osgi:osgi.core %pom_add_dep org.osgi:osgi.cmpn popd @@ -134,7 +133,7 @@ popd # bndlib pushd biz.aQute.bndlib cp -p %{SOURCE5} pom.xml -%pom_add_parent biz.aQute.bnd:parent:%{version} +%pom_add_parent org.fedoraproject.xmvn.aqute-bnd:aggregator:any %pom_add_dep org.osgi:osgi.cmpn %pom_add_dep biz.aQute.bnd:aQute.libg:%{version} %pom_add_dep biz.aQute.bnd:biz.aQute.bnd.annotation:%{version} @@ -143,14 +142,14 @@ popd # bnd.ant pushd biz.aQute.bnd.ant cp -p %{SOURCE7} pom.xml -%pom_add_parent biz.aQute.bnd:parent:%{version} +%pom_add_parent org.fedoraproject.xmvn.aqute-bnd:aggregator:any popd # bnd cp -r biz.aQute.bnd.exporters/src/aQute/bnd/exporter biz.aQute.bnd/src/aQute/bnd/ pushd biz.aQute.bnd cp -p %{SOURCE4} pom.xml -%pom_add_parent biz.aQute.bnd:parent:%{version} +%pom_add_parent org.fedoraproject.xmvn.aqute-bnd:aggregator:any %pom_remove_dep :biz.aQute.resolve %pom_remove_dep :biz.aQute.repository %pom_remove_dep :biz.aQute.bnd.exporters @@ -165,7 +164,7 @@ popd # bnd.util pushd biz.aQute.bnd.util cp -p %{SOURCE8} pom.xml -%pom_add_parent biz.aQute.bnd:parent:%{version} +%pom_add_parent org.fedoraproject.xmvn.aqute-bnd:aggregator:any %pom_add_dep biz.aQute.bnd:aQute.libg:%{version} popd @@ -211,7 +210,7 @@ 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:parent __noinstall +%mvn_package org.fedoraproject.xmvn.aqute-bnd:aggregator __noinstall %mvn_package biz.aQute.bnd:bnd-plugin-parent __noinstall %if %{with bnd_maven_plugin} %mvn_package biz.aQute.bnd:bnd-maven-plugin maven diff --git a/parent.pom b/parent.pom deleted file mode 100644 index fde3bca..0000000 --- a/parent.pom +++ /dev/null @@ -1,203 +0,0 @@ - - - 4.0.0 - - biz.aQute.bnd - parent - - - pom - - Parent project for bnd tool suite - Project information for bnd. - http://www.aQute.biz/Code/Bnd - - - aQute SARL - http://www.aQute.biz - - - - - Apache Software License 2.0 - http://www.opensource.org/licenses/apache2.0.php - repo - - - - - UTF-8 - - - - - bnd - Peter Kriens - aQute SARL - - Primary Developer - - - - bjhargrave - BJ Hargrave - - - mcculls - Stuart McCulloch - - - njbartlett - Neil Bartlett - Paremus - - - fhuberts - Ferry Huberts - Pelagic - - - psoreide - PK Søreide - Comactivity AB - - - - - - Carter Smithhart - - - - Chabanois Cédric - Entropysoft - - - - Paul Bakker - Luminis Technologies - - - - David Jencks - - - - Rafał Krzewski - Caltha - Krzewski, Mach, Potempski Sp. J. - - - - Xavier Fournet - - - - Casey Crabb - - - - David Bosschaert - - - - Harald Wellmann - - - - Jan Willem Janssen - - - - Marcel Offermans - - - - Marian Grigoras - - - - Markus Wolf - - - - Nicolas Lalevée - - - - Pierre Labiausse - - - - Raymond Auge - - - - Tim Ward - - - - Bram de Kruijff - - - - Tang Yong - - - - Gregory Amerson - - - - Guillaume Nodet - - - - Marc de Jonge - - - - Roman Shevchenko - - - - - https://github.com/bndtools/bnd - scm:git:git://github.com/bndtools/bnd.git - scm:git:ssh://github.com/bndtools/bnd.git - - - - aQute.libg - biz.aQute.bndlib - biz.aQute.bnd - biz.aQute.bnd.annotation - biz.aQute.bnd.ant - biz.aQute.bnd.util - maven - - - - src - - - src/ - - **/*.java - **/packageinfo - - - - - - org.apache.maven.plugins - maven-compiler-plugin - any - - 1.8 - 1.8 - - - - -