diff --git a/3.5.0.REL.tar.gz b/3.5.0.REL.tar.gz index ec7d7bd..458f3c5 100644 Binary files a/3.5.0.REL.tar.gz and b/3.5.0.REL.tar.gz differ diff --git a/aqute-bnd.spec b/aqute-bnd.spec index cb8befd..a04cfbd 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -1,11 +1,11 @@ Name: aqute-bnd Version: 3.5.0 -Release: 7 +Release: 8 Summary: BND Tool License: ASL 2.0 -URL: http://bnd.bndtools.org/ -Source0: %{version}.REL.tar.gz -Source1: parent.pom +URL: https://github.com/bndtools/bnd/ +Source0: https://github.com/bndtools/bnd/archive/%{version}.REL.tar.gz +Source1: https://repo1.maven.org/maven2/biz/aQute/bnd/parent/2.4.0/parent-2.4.0.pom#/parent.pom Source2: https://repo1.maven.org/maven2/biz/aQute/bnd/aQute.libg/%{version}/aQute.libg-%{version}.pom Source3: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd/%{version}/biz.aQute.bnd-%{version}.pom Source4: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/%{version}/biz.aQute.bndlib-%{version}.pom @@ -42,6 +42,41 @@ Documentation for aqute-bnd api. %autosetup -n bnd-%{version}.REL -p1 rm gradlew* rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand}.java +sed -i 's/2.4.0/@VERSION@/' %{SOURCE1} +sed -i '$d' %{SOURCE1} +echo " + aQute.libg + biz.aQute.bndlib + biz.aQute.bnd + biz.aQute.bnd.annotation + maven + + + + src + + + src/ + + **/*.java + **/packageinfo + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.5.1 + + 1.7 + 1.7 + + + + + +" >> %{SOURCE1} sed 's/@VERSION@/%{version}/' %SOURCE1 > pom.xml sed -i 's|${Bundle-Version}|%{version}|' biz.aQute.bndlib/src/aQute/bnd/osgi/bnd.info cd aQute.libg @@ -117,6 +152,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium %files help -f .mfiles-javadoc %changelog +* Wed Dec 23 2020 Ge Wang - 3.5.0-8 +- Modify homepage url and source url + * Sat Sep 12 2020 yanan li - 3.5.0-7 - fix build fail diff --git a/parent.pom b/parent.pom index e8bc7b0..ce827d6 100644 --- a/parent.pom +++ b/parent.pom @@ -1,198 +1,166 @@ - 4.0.0 + xsi:schemaLocation='http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd'> + 4.0.0 - biz.aQute.bnd - parent - @VERSION@ + biz.aQute.bnd + parent + 2.4.0 - pom + pom - Parent project for bnd tool suite - Project information for bnd. - http://www.aQute.biz/Code/Bnd + Parent project for bnd tool suite + Project information for bnd. + http://www.aQute.biz/Code/Bnd - - aQute SARL - http://www.aQute.biz - + + aQute SARL + http://www.aQute.biz + - - - Apache Software License 2.0 - http://www.opensource.org/licenses/apache2.0.php - repo - - + + + Apache Software License 2.0 + http://www.opensource.org/licenses/apache2.0.php + repo + + - - - 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 - - + + + 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 - maven - - - - src - - - src/ - - **/*.java - **/packageinfo - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.5.1 - - 1.7 - 1.7 - - - - + + https://github.com/bndtools/bnd + scm:git:git://github.com/bndtools/bnd.git + scm:git:ssh://github.com/bndtools/bnd.git +