From 543774112982a90bb3a583724373ee8d728f9d9a Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 20 Feb 2024 16:58:47 +0100 Subject: [PATCH 01/18] Port to OpenJDK 21 --- 0004-Port-to-OpenJDK-21.patch | 64 +++++++++++++++++++++++++++++++++++ aqute-bnd.spec | 13 ++++--- 2 files changed, 73 insertions(+), 4 deletions(-) create mode 100644 0004-Port-to-OpenJDK-21.patch 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..b8766f1 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -8,7 +8,7 @@ Name: aqute-bnd Version: 6.3.1 -Release: 8%{?dist} +Release: 9%{?dist} 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 @@ -34,6 +34,7 @@ Source8: https://repo1.maven.org/maven2/biz/aQute/bnd/biz.aQute.bnd.util/ Patch1: 0001-Disable-removed-commands.patch Patch2: 0002-Port-to-OSGI-7.0.0.patch Patch3: 0003-Remove-unmet-dependencies.patch +Patch4: 0004-Port-to-OpenJDK-21.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -101,9 +102,10 @@ API documentation for %{name}. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%patch 1 -p1 +%patch 2 -p1 +%patch 3 -p1 +%patch 4 -p1 # 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 @@ -244,6 +246,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium %license LICENSE %changelog +* 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 From e9ec8ce19e674479d4556523dc68d6ef2b36af8a Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 14:53:47 +0100 Subject: [PATCH 02/18] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- aqute-bnd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aqute-bnd.spec b/aqute-bnd.spec index b8766f1..545d8c9 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -8,7 +8,7 @@ Name: aqute-bnd Version: 6.3.1 -Release: 9%{?dist} +Release: 10%{?dist} 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 @@ -246,6 +246,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium %license LICENSE %changelog +* 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 From 54d66588ce1ed6b5a1faf2327a586e5b283771ed Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Jun 2024 13:08:32 +0200 Subject: [PATCH 03/18] Extract smoke tests out of test plan We want tests to be stored directly in the file system instead of being embedded into tests plans. --- plans/smoke.fmf | 13 +------------ tests/Sanity/smoke/main.fmf | 6 ++++++ tests/Sanity/smoke/runtest.sh | 24 ++++++++++++++++++++++++ tests/main.fmf | 4 ++++ 4 files changed, 35 insertions(+), 12 deletions(-) create mode 100644 tests/Sanity/smoke/main.fmf create mode 100755 tests/Sanity/smoke/runtest.sh create mode 100644 tests/main.fmf 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 From 45584cfb5c2ef915dbedb9e115acd00b3f7e0f22 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 17:20:08 +0000 Subject: [PATCH 04/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- aqute-bnd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/aqute-bnd.spec b/aqute-bnd.spec index 545d8c9..0a940eb 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -8,7 +8,7 @@ Name: aqute-bnd Version: 6.3.1 -Release: 10%{?dist} +Release: 11%{?dist} 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 @@ -246,6 +246,9 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium %license LICENSE %changelog +* 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 From 7e4145ae7c7b9e6a32a0134aab6c5ca67aec90ce Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 05/18] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From 26b4ed818ef6ef4230a73b4583ddbd3ac8446dcb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 06/18] Switch from %setup to %autosetup --- aqute-bnd.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/aqute-bnd.spec b/aqute-bnd.spec index 0a940eb..7bc67fa 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -100,12 +100,8 @@ Summary: Javadoc for %{name} API documentation for %{name}. %prep -%setup -q +%autosetup -p1 -C -%patch 1 -p1 -%patch 2 -p1 -%patch 3 -p1 -%patch 4 -p1 # 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 From cbaa22e017f5503fbcb65d6429aa0b09c64207fe Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:18 +0200 Subject: [PATCH 07/18] Switch to non-numdered patches --- aqute-bnd.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aqute-bnd.spec b/aqute-bnd.spec index 7bc67fa..266dc87 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -31,10 +31,10 @@ 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 -Patch4: 0004-Port-to-OpenJDK-21.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 From 981c766eee37625bae623796d296e7c69faebaba Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:02 +0200 Subject: [PATCH 08/18] Convert to %autorelease and %autochangelog --- aqute-bnd.spec | 259 +------------------------------------------------ changelog | 256 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 258 insertions(+), 257 deletions(-) create mode 100644 changelog diff --git a/aqute-bnd.spec b/aqute-bnd.spec index 266dc87..98703b5 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -8,7 +8,7 @@ Name: aqute-bnd Version: 6.3.1 -Release: 11%{?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 @@ -242,259 +242,4 @@ echo "aqute-bnd slf4j/api slf4j/simple osgi-annotation osgi-core osgi-compendium %license LICENSE %changelog -* 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) +%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) From c01dab56915bdbf696fd1a3e46ae032de1440dd9 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 28 Nov 2024 07:49:39 +0100 Subject: [PATCH 09/18] Drop explicit requires on javapackages-tools --- aqute-bnd.spec | 4 ---- plans/javapackages.fmf | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/aqute-bnd.spec b/aqute-bnd.spec index 98703b5..44534b0 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -62,10 +62,6 @@ 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 - %description The bnd tool helps you create and diagnose OSGi bundles. The key functions are: diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From a09fbcc9d1d063b4dbcafe42dff1f683bcead023 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 11:26:09 +0000 Subject: [PATCH 10/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3d4acc14cbda4b297eaf6fa8c228951e1400f527 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 Mar 2025 10:59:21 +0100 Subject: [PATCH 11/18] Drop javadoc package --- aqute-bnd.spec | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/aqute-bnd.spec b/aqute-bnd.spec index 44534b0..0943779 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -62,6 +62,9 @@ BuildRequires: mvn(org.eclipse.aether:aether-api) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) %endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 6.3.1-23 + %description The bnd tool helps you create and diagnose OSGi bundles. The key functions are: @@ -89,16 +92,9 @@ Summary: BND Maven plugin %{summary}. %endif -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -API documentation for %{name}. - %prep %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 @@ -212,7 +208,7 @@ popd %endif %build -%mvn_build +%mvn_build -j %install %mvn_install @@ -234,8 +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 %autochangelog From 3a48bb218914f7a804b1c1237ea9bfbc72b94a5e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:18 +0100 Subject: [PATCH 12/18] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 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 + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 33a828e1c173244fa61c949f8407a0f53cd5a0fb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 13/18] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From e64c8ad09be189bd56393096684ec71236b8976f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 14/18] Build with OpenJDK 25 --- aqute-bnd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aqute-bnd.spec b/aqute-bnd.spec index 0943779..f08c74d 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -39,7 +39,7 @@ 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:) From 845e07a6bda4f5839213c55a7b4e99467788b4cf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:10:57 +0000 Subject: [PATCH 15/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 9c5343ff3d76b25478e747d8c7c893c02bd0ea6a Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 19:45:15 +0200 Subject: [PATCH 16/18] Rebuilt for java-25-openjdk as preffered jdk https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk Note, that since f43, you should be always explicit on what jdk to use. This commit should do exactly that. From af657f0a176decfe696c236f074a2e45478c1b72 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Thu, 4 Sep 2025 12:13:49 +0200 Subject: [PATCH 17/18] manual bodhi update for jdk25 needed on selected pkgs From 9d5127adb88d9335a7355c51efafe1e1124ab560 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:51:53 +0000 Subject: [PATCH 18/18] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild