diff --git a/0004-Port-to-OpenJDK-21.patch b/0004-Port-to-OpenJDK-21.patch new file mode 100644 index 0000000..ec61e2f --- /dev/null +++ b/0004-Port-to-OpenJDK-21.patch @@ -0,0 +1,64 @@ +From e5cf5ee78f8504ccdd5af0a05ef7739a99f31059 Mon Sep 17 00:00:00 2001 +From: Marian Koncek +Date: Tue, 20 Feb 2024 16:56:44 +0100 +Subject: [PATCH] Port to OpenJDK 21 + +--- + .../src/aQute/lib/collections/SortedList.java | 36 +++++++++++++++++++ + 1 file changed, 36 insertions(+) + +diff --git a/aQute.libg/src/aQute/lib/collections/SortedList.java b/aQute.libg/src/aQute/lib/collections/SortedList.java +index ed33e7f..f584e57 100644 +--- a/aQute.libg/src/aQute/lib/collections/SortedList.java ++++ b/aQute.libg/src/aQute/lib/collections/SortedList.java +@@ -3,6 +3,7 @@ package aQute.lib.collections; + import java.lang.reflect.Array; + import java.util.Arrays; + import java.util.Collection; ++import java.util.Collections; + import java.util.Comparator; + import java.util.Iterator; + import java.util.List; +@@ -510,4 +511,39 @@ public class SortedList implements SortedSet, List { + public Spliterator spliterator() { + return SortedSet.super.spliterator(); + } ++ ++ @Override ++ public SortedList reversed() { ++ return new SortedList(this.list, this.start, this.end, Collections.reverseOrder(this.comparator)); ++ } ++ ++ @Override ++ public T removeFirst() { ++ return List.super.removeFirst(); ++ } ++ ++ @Override ++ public T removeLast() { ++ return List.super.removeLast(); ++ } ++ ++ @Override ++ public T getFirst() { ++ return List.super.getFirst(); ++ } ++ ++ @Override ++ public T getLast() { ++ return List.super.getLast(); ++ } ++ ++ @Override ++ public void addFirst(T v) { ++ add(v); ++ } ++ ++ @Override ++ public void addLast(T v) { ++ add(v); ++ } + } +-- +2.43.0 + diff --git a/aqute-bnd.spec b/aqute-bnd.spec index 1505e50..f08c74d 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -8,7 +8,7 @@ Name: aqute-bnd Version: 6.3.1 -Release: 8%{?dist} +Release: %autorelease Summary: BND Tool # Part of jpm is under BSD, but jpm is not included in binary RPM License: Apache-2.0 OR EPL-2.0 @@ -31,14 +31,15 @@ Source6: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.annot Source7: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.ant/%{version}/biz.aQute.bnd.ant-%{version}.pom Source8: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/%{version}/biz.aQute.bnd.util-%{version}.pom -Patch1: 0001-Disable-removed-commands.patch -Patch2: 0002-Port-to-OSGI-7.0.0.patch -Patch3: 0003-Remove-unmet-dependencies.patch +Patch: 0001-Disable-removed-commands.patch +Patch: 0002-Port-to-OSGI-7.0.0.patch +Patch: 0003-Remove-unmet-dependencies.patch +Patch: 0004-Port-to-OpenJDK-21.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: maven-local +BuildRequires: maven-local-openjdk25 BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.codehaus.plexus:plexus-component-metadata) BuildRequires: mvn(org.junit:junit-bom:pom:) @@ -61,9 +62,8 @@ BuildRequires: mvn(org.eclipse.aether:aether-api) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) %endif -# Explicit javapackages-tools requires since bnd script uses -# /usr/share/java-utils/java-functions -Requires: javapackages-tools +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 6.3.1-23 %description The bnd tool helps you create and diagnose OSGi bundles. @@ -92,18 +92,8 @@ Summary: BND Maven plugin %{summary}. %endif -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -API documentation for %{name}. - %prep -%setup -q - -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 -C # the commands pull in more dependencies than we want (felix-resolver, jetty) rm biz.aQute.bnd/src/aQute/bnd/main/{ExportReportCommand,MbrCommand,RemoteCommand,ReporterLogger,ResolveCommand,Shell}.java @@ -218,7 +208,7 @@ popd %endif %build -%mvn_build +%mvn_build -j %install %mvn_install @@ -240,254 +230,5 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium %files -n bnd-maven-plugin -f .mfiles-maven %endif -%files javadoc -f .mfiles-javadoc -%license LICENSE - %changelog -* Mon Jan 22 2024 Fedora Release Engineering - 6.3.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Jan 19 2024 Fedora Release Engineering - 6.3.1-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Fri Sep 01 2023 Mikolaj Izdebski - 6.3.1-6 -- Convert License tag to SPDX format - -* Wed Jul 19 2023 Fedora Release Engineering - 6.3.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Jun 07 2023 Mikolaj Izdebski - 6.3.1-4 -- Conditionally disable bnd-maven-plugin - -* Wed Jan 18 2023 Fedora Release Engineering - 6.3.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Tue Nov 08 2022 Stephen Gallagher - 6.3.1-2 -- Re-enable maven plugin for RHEL 10+ - -* Wed Sep 07 2022 Marian Koncek - 6.3.1-1 -- Update to upstream version 6.3.1 - -* Wed Jul 20 2022 Fedora Release Engineering - 6.2.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue May 03 2022 Marian Koncek - 6.2.0-1 -- Update to upstream version 6.2.0 - -* Sat Feb 05 2022 Jiri Vanek - 5.2.0-9 -- Rebuilt for java-17-openjdk as system jdk - -* Wed Jan 19 2022 Fedora Release Engineering - 5.2.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Mon Nov 22 2021 Didik Supriadi - 5.2.0-7 -- Enable biz.aQute.bnd.ant - -* Fri Sep 24 2021 Mikolaj Izdebski - 5.2.0-6 -- Rename maven_plugin build conditional to bnd_maven_plugin - -* Tue Aug 10 2021 Sérgio Basto - 5.2.0-5 -- reenable bnd-maven-plugin - -* Mon Aug 02 2021 Mattias Ellert - 5.2.0-4 -- Add parent to biz.aQute.bnd/pom.xml (fixes [WARNING] JAR will be - empty - no content was marked for inclusion!) -- Remove scope from dependencies in pom.xml files (fixes missing - dependencies, dependencies marked with scope provided are ignored by - the rpm dependency generator) -- Drop some more commands: shell, exportreport, mbr (uses parts that - are not packaged) -- Resolves: rhbz#1985566 - -* Wed Jul 21 2021 Fedora Release Engineering - 5.2.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Mon May 17 2021 Mikolaj Izdebski - 5.2.0-2 -- Bootstrap build -- Non-bootstrap build - -* Tue Jan 26 2021 Fedora Release Engineering - 4.3.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Jan 20 2021 Marian Koncek - 5.2.0-1 -- Update to upstream version 5.2.0 - -* Mon Dec 14 2020 Jerry James - 4.3.1-3 -- Update jansi path for jansi 1.x and jline path for jline 2.x - -* Wed Nov 25 2020 Mat Booth - 4.3.1-2 -- Add OSGi metadata - -* Tue Sep 29 2020 Marian Koncek - 5.1.2-1 -- Update to upstream version 5.1.2 - -* Tue Jul 28 2020 Mat Booth - 4.3.1-1 -- Update to latest 4.x release - -* Mon Jul 27 2020 Mat Booth - 4.3.0-1 -- Update to upstream version 4.3.0 - -* Mon Jul 27 2020 Fedora Release Engineering - 3.5.0-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jul 21 2020 Mat Booth - 3.5.0-10 -- Fix NIO linkage error when running on Java 8 due to incorrect cross-compilation - -* Fri Jul 10 2020 Jiri Vanek - 3.5.0-9 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Tue Jun 23 2020 Marian Koncek - 5.1.1-1 -- Update to upstream version 5.1.1 - -* Fri Apr 24 2020 Mikolaj Izdebski - 5.0.0-2 -- Disable bnd-maven-plugin - -* Wed Jan 29 2020 Marian Koncek - 5.0.0-1 -- Update to upstream version 5.0.0 - -* Tue Jan 28 2020 Fedora Release Engineering - 3.5.0-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Tue Nov 05 2019 Mikolaj Izdebski - 4.3.0-2 -- Mass rebuild for javapackages-tools 201902 - -* Wed Oct 09 2019 Marian Koncek - 4.3.0-1 -- Update to upstream version 4.3.0 - -* Wed Jul 24 2019 Fedora Release Engineering - 3.5.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Thu Jul 04 2019 Marian Koncek - 4.2.0-1 -- Update to upstream version 4.2.0 - -* Fri May 24 2019 Mikolaj Izdebski - 3.5.0-6 -- Mass rebuild for javapackages-tools 201901 - -* Fri Apr 12 2019 Marian Koncek - 3.5.0-6 -- Port to OSGI 7.0.0 - -* Fri Apr 12 2019 Marian Koncek - 3.5.0-5 -- Port to OSGI 7.0.0 - -* Thu Jan 31 2019 Fedora Release Engineering - 3.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jul 30 2018 Severin Gehwolf - 3.5.0-4 -- Add requirement on javapackages-tools for bnd script. - -* Thu Jul 12 2018 Fedora Release Engineering - 3.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 3.5.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Fri Oct 13 2017 Michael Simacek - 3.5.0-1 -- Update to upstream version 3.5.0 - -* Mon Oct 02 2017 Troy Dawson - 3.4.0-3 -- Cleanup spec file conditionals - -* Sat Sep 23 2017 Mikolaj Izdebski - 3.4.0-2 -- Remove unneeded javadoc plugin - -* Tue Sep 12 2017 Michael Simacek - 3.4.0-1 -- Update to upstream version 3.4.0 - -* Wed Jul 26 2017 Fedora Release Engineering - 3.3.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 3.3.0-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Oct 10 2016 Mikolaj Izdebski - 3.3.0-5 -- Don't use legacy Ant artifact coordinates - -* Mon Oct 10 2016 Mikolaj Izdebski - 3.3.0-4 -- Allow conditional builds without Ant tasks - -* Mon Oct 10 2016 Mikolaj Izdebski - 3.3.0-3 -- Allow conditional builds without Maven plugin - -* Thu Oct 06 2016 Michael Simacek - 3.3.0-2 -- Fix ant.d classpath - -* Thu Sep 29 2016 Michael Simacek - 3.3.0-1 -- Update to upstream version 3.3.0 -- Build against osgi-{core,compendium} - -* Tue Sep 27 2016 Mikolaj Izdebski - 3.2.0-5 -- Add felix-scr-annotations to classpath - -* Mon Sep 26 2016 Michael Simacek - 3.2.0-4 -- Use felix-annotations - -* 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 - -* Tue May 24 2016 Michael Simacek - 3.2.0-1 -- Update to upstream version 3.2.0 - -* Wed Feb 03 2016 Fedora Release Engineering - 2.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Jul 17 2015 Michael Simacek - 2.4.1-2 -- Fix Tool header generation - -* Wed Jul 08 2015 Michael Simacek - 2.4.1-1 -- Update to upstream version 2.4.1 - -* Wed Jun 17 2015 Fedora Release Engineering - 0.0.363-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Thu May 14 2015 Mikolaj Izdebski - 0.0.363-15 -- Disable javadoc doclint - -* Sat Jun 07 2014 Fedora Release Engineering - 0.0.363-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Thu May 29 2014 Mikolaj Izdebski - 0.0.363-13 -- Use .mfiles generated during build - -* Fri May 09 2014 Jaromir Capik - 0.0.363-12 -- Fixing ambiguous base64 class - -* Fri May 09 2014 Gil Cattaneo 0.0.363-11 -- fix rhbz#991985 -- add source compatibility with ant 1.9 -- remove and rebuild from source aQute.runtime.jar -- update to current packaging guidelines - -* Tue Mar 04 2014 Stanislav Ochotnicky - 0.0.363-10 -- Use Requires: java-headless rebuild (#1067528) - -* Sat Aug 03 2013 Fedora Release Engineering - 0.0.363-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 0.0.363-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 0.0.363-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Apr 25 2012 Stanislav Ochotnicky - 0.0.363-6 -- Get rid of unusable eclipse plugins to simplify dependencies - -* Fri Mar 02 2012 Jaromir Capik - 0.0.363-5 -- Fixing build failures on f16 and later - -* Thu Jan 12 2012 Fedora Release Engineering - 0.0.363-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Thu Sep 22 2011 Jaromir Capik - 0.0.363-3 -- Resurrection of bundled non-class files - -* Thu Sep 22 2011 Jaromir Capik - 0.0.363-2 -- Bundled classes removed -- jpackage-utils dependency added to the javadoc subpackage - -* Wed Sep 21 2011 Jaromir Capik - 0.0.363-1 -- Initial version (cloned from aqute-bndlib 0.0.363) +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..0898c6b --- /dev/null +++ b/changelog @@ -0,0 +1,256 @@ +* Wed Jul 17 2024 Fedora Release Engineering - 6.3.1-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 6.3.1-10 +- Rebuilt for java-21-openjdk as system jdk + +* Tue Feb 20 2024 Marian Koncek - 6.3.1-9 +- Port to OpenJDK 21 + +* Mon Jan 22 2024 Fedora Release Engineering - 6.3.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 6.3.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Sep 01 2023 Mikolaj Izdebski - 6.3.1-6 +- Convert License tag to SPDX format + +* Wed Jul 19 2023 Fedora Release Engineering - 6.3.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jun 07 2023 Mikolaj Izdebski - 6.3.1-4 +- Conditionally disable bnd-maven-plugin + +* Wed Jan 18 2023 Fedora Release Engineering - 6.3.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Nov 08 2022 Stephen Gallagher - 6.3.1-2 +- Re-enable maven plugin for RHEL 10+ + +* Wed Sep 07 2022 Marian Koncek - 6.3.1-1 +- Update to upstream version 6.3.1 + +* Wed Jul 20 2022 Fedora Release Engineering - 6.2.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Tue May 03 2022 Marian Koncek - 6.2.0-1 +- Update to upstream version 6.2.0 + +* Sat Feb 05 2022 Jiri Vanek - 5.2.0-9 +- Rebuilt for java-17-openjdk as system jdk + +* Wed Jan 19 2022 Fedora Release Engineering - 5.2.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Mon Nov 22 2021 Didik Supriadi - 5.2.0-7 +- Enable biz.aQute.bnd.ant + +* Fri Sep 24 2021 Mikolaj Izdebski - 5.2.0-6 +- Rename maven_plugin build conditional to bnd_maven_plugin + +* Tue Aug 10 2021 Sérgio Basto - 5.2.0-5 +- reenable bnd-maven-plugin + +* Mon Aug 02 2021 Mattias Ellert - 5.2.0-4 +- Add parent to biz.aQute.bnd/pom.xml (fixes [WARNING] JAR will be + empty - no content was marked for inclusion!) +- Remove scope from dependencies in pom.xml files (fixes missing + dependencies, dependencies marked with scope provided are ignored by + the rpm dependency generator) +- Drop some more commands: shell, exportreport, mbr (uses parts that + are not packaged) +- Resolves: rhbz#1985566 + +* Wed Jul 21 2021 Fedora Release Engineering - 5.2.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 5.2.0-2 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 4.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jan 20 2021 Marian Koncek - 5.2.0-1 +- Update to upstream version 5.2.0 + +* Mon Dec 14 2020 Jerry James - 4.3.1-3 +- Update jansi path for jansi 1.x and jline path for jline 2.x + +* Wed Nov 25 2020 Mat Booth - 4.3.1-2 +- Add OSGi metadata + +* Tue Sep 29 2020 Marian Koncek - 5.1.2-1 +- Update to upstream version 5.1.2 + +* Tue Jul 28 2020 Mat Booth - 4.3.1-1 +- Update to latest 4.x release + +* Mon Jul 27 2020 Mat Booth - 4.3.0-1 +- Update to upstream version 4.3.0 + +* Mon Jul 27 2020 Fedora Release Engineering - 3.5.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 21 2020 Mat Booth - 3.5.0-10 +- Fix NIO linkage error when running on Java 8 due to incorrect cross-compilation + +* Fri Jul 10 2020 Jiri Vanek - 3.5.0-9 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Tue Jun 23 2020 Marian Koncek - 5.1.1-1 +- Update to upstream version 5.1.1 + +* Fri Apr 24 2020 Mikolaj Izdebski - 5.0.0-2 +- Disable bnd-maven-plugin + +* Wed Jan 29 2020 Marian Koncek - 5.0.0-1 +- Update to upstream version 5.0.0 + +* Tue Jan 28 2020 Fedora Release Engineering - 3.5.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 4.3.0-2 +- Mass rebuild for javapackages-tools 201902 + +* Wed Oct 09 2019 Marian Koncek - 4.3.0-1 +- Update to upstream version 4.3.0 + +* Wed Jul 24 2019 Fedora Release Engineering - 3.5.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Jul 04 2019 Marian Koncek - 4.2.0-1 +- Update to upstream version 4.2.0 + +* Fri May 24 2019 Mikolaj Izdebski - 3.5.0-6 +- Mass rebuild for javapackages-tools 201901 + +* Fri Apr 12 2019 Marian Koncek - 3.5.0-6 +- Port to OSGI 7.0.0 + +* Fri Apr 12 2019 Marian Koncek - 3.5.0-5 +- Port to OSGI 7.0.0 + +* Thu Jan 31 2019 Fedora Release Engineering - 3.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jul 30 2018 Severin Gehwolf - 3.5.0-4 +- Add requirement on javapackages-tools for bnd script. + +* Thu Jul 12 2018 Fedora Release Engineering - 3.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 3.5.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Fri Oct 13 2017 Michael Simacek - 3.5.0-1 +- Update to upstream version 3.5.0 + +* Mon Oct 02 2017 Troy Dawson - 3.4.0-3 +- Cleanup spec file conditionals + +* Sat Sep 23 2017 Mikolaj Izdebski - 3.4.0-2 +- Remove unneeded javadoc plugin + +* Tue Sep 12 2017 Michael Simacek - 3.4.0-1 +- Update to upstream version 3.4.0 + +* Wed Jul 26 2017 Fedora Release Engineering - 3.3.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 3.3.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Oct 10 2016 Mikolaj Izdebski - 3.3.0-5 +- Don't use legacy Ant artifact coordinates + +* Mon Oct 10 2016 Mikolaj Izdebski - 3.3.0-4 +- Allow conditional builds without Ant tasks + +* Mon Oct 10 2016 Mikolaj Izdebski - 3.3.0-3 +- Allow conditional builds without Maven plugin + +* Thu Oct 06 2016 Michael Simacek - 3.3.0-2 +- Fix ant.d classpath + +* Thu Sep 29 2016 Michael Simacek - 3.3.0-1 +- Update to upstream version 3.3.0 +- Build against osgi-{core,compendium} + +* Tue Sep 27 2016 Mikolaj Izdebski - 3.2.0-5 +- Add felix-scr-annotations to classpath + +* Mon Sep 26 2016 Michael Simacek - 3.2.0-4 +- Use felix-annotations + +* 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 + +* Tue May 24 2016 Michael Simacek - 3.2.0-1 +- Update to upstream version 3.2.0 + +* Wed Feb 03 2016 Fedora Release Engineering - 2.4.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jul 17 2015 Michael Simacek - 2.4.1-2 +- Fix Tool header generation + +* Wed Jul 08 2015 Michael Simacek - 2.4.1-1 +- Update to upstream version 2.4.1 + +* Wed Jun 17 2015 Fedora Release Engineering - 0.0.363-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Thu May 14 2015 Mikolaj Izdebski - 0.0.363-15 +- Disable javadoc doclint + +* Sat Jun 07 2014 Fedora Release Engineering - 0.0.363-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Thu May 29 2014 Mikolaj Izdebski - 0.0.363-13 +- Use .mfiles generated during build + +* Fri May 09 2014 Jaromir Capik - 0.0.363-12 +- Fixing ambiguous base64 class + +* Fri May 09 2014 Gil Cattaneo 0.0.363-11 +- fix rhbz#991985 +- add source compatibility with ant 1.9 +- remove and rebuild from source aQute.runtime.jar +- update to current packaging guidelines + +* Tue Mar 04 2014 Stanislav Ochotnicky - 0.0.363-10 +- Use Requires: java-headless rebuild (#1067528) + +* Sat Aug 03 2013 Fedora Release Engineering - 0.0.363-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 0.0.363-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 0.0.363-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Wed Apr 25 2012 Stanislav Ochotnicky - 0.0.363-6 +- Get rid of unusable eclipse plugins to simplify dependencies + +* Fri Mar 02 2012 Jaromir Capik - 0.0.363-5 +- Fixing build failures on f16 and later + +* Thu Jan 12 2012 Fedora Release Engineering - 0.0.363-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Thu Sep 22 2011 Jaromir Capik - 0.0.363-3 +- Resurrection of bundled non-class files + +* Thu Sep 22 2011 Jaromir Capik - 0.0.363-2 +- Bundled classes removed +- jpackage-utils dependency added to the javadoc subpackage + +* Wed Sep 21 2011 Jaromir Capik - 0.0.363-1 +- Initial version (cloned from aqute-bndlib 0.0.363) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: f43 execute: how: tmt diff --git a/plans/smoke.fmf b/plans/smoke.fmf index ee615b3..a1e7bfd 100644 --- a/plans/smoke.fmf +++ b/plans/smoke.fmf @@ -1,16 +1,5 @@ summary: Basic smoke test discover: - how: shell - tests: - - name: /smoke/wrap - test: | - set -x - bnd wrap -b foo -v 1.2.3 /usr/share/java/ant/ant-bootstrap.jar - unzip ant-bootstrap.jar META-INF/MANIFEST.MF - grep ^Bundle-SymbolicName:.foo META-INF/MANIFEST.MF - grep ^Bundle-Version:.1.2.3 META-INF/MANIFEST.MF -prepare: - how: install - package: unzip + how: fmf execute: how: tmt diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf new file mode 100644 index 0000000..6dcbb69 --- /dev/null +++ b/tests/Sanity/smoke/main.fmf @@ -0,0 +1,6 @@ +summary: aqute-bnd smoke test +description: | + Test basic functionality of aqute-bnd. +require: + - aqute-bnd + - unzip diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh new file mode 100755 index 0000000..9818e97 --- /dev/null +++ b/tests/Sanity/smoke/runtest.sh @@ -0,0 +1,24 @@ +#!/bin/bash +# Author: Mikolaj Izdebski +. /usr/share/beakerlib/beakerlib.sh + +rlJournalStart + + rlPhaseStartTest "check for presence of bnd command" + rlAssertRpm aqute-bnd + rlAssertBinaryOrigin bnd aqute-bnd + rlPhaseEnd + + rlPhaseStartTest "display bnd version" + rlRun "bnd version" + rlPhaseEnd + + rlPhaseStartTest "wrap JAR file as a bundle" + rlRun "bnd wrap -b foo -v 1.2.3 /usr/share/java/ant/ant-bootstrap.jar" + rlRun "unzip ant-bootstrap.jar META-INF/MANIFEST.MF" + rlAssertGrep "^Bundle-SymbolicName:.foo" META-INF/MANIFEST.MF + rlAssertGrep "^Bundle-Version:.1.2.3" META-INF/MANIFEST.MF + rlPhaseEnd + +rlJournalEnd +rlJournalPrintText diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..99fd67e --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,4 @@ +contact: Mikolaj Izdebski +framework: beakerlib +test: ./runtest.sh +tier: 0