diff --git a/0001-Disable-removed-commands.patch b/0001-Disable-removed-commands.patch index cf646aa..6c2a91d 100644 --- a/0001-Disable-removed-commands.patch +++ b/0001-Disable-removed-commands.patch @@ -1,6 +1,6 @@ -From 8e83ad4866fd9afa54f22bd54ae3f23b8bfa85fb Mon Sep 17 00:00:00 2001 +From 07018362979d754c0f169fab529b3dffef8a5846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Mon, 9 Sep 2024 10:02:58 +0200 +Date: Mon, 9 Sep 2024 09:45:16 +0200 Subject: [PATCH 1/5] Disable removed commands --- diff --git a/0002-Port-to-OSGI-7.0.0.patch b/0002-Port-to-OSGI-7.0.0.patch index 063e9ab..9aaec70 100644 --- a/0002-Port-to-OSGI-7.0.0.patch +++ b/0002-Port-to-OSGI-7.0.0.patch @@ -1,4 +1,4 @@ -From 7839ea6b3a2928725f2161fe8a8ecef4e812a2bc Mon Sep 17 00:00:00 2001 +From cc7ef245b7d3f7e59753941c3486a305efaf1e2b Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 11 Jul 2019 14:29:26 +0200 Subject: [PATCH 2/5] Port to OSGI 7.0.0 diff --git a/0003-Remove-unmet-dependencies.patch b/0003-Remove-unmet-dependencies.patch index 2b2aea0..d2881ee 100644 --- a/0003-Remove-unmet-dependencies.patch +++ b/0003-Remove-unmet-dependencies.patch @@ -1,16 +1,16 @@ -From 700b8c65c7b05142386672d8f6969b0f51ab5fa4 Mon Sep 17 00:00:00 2001 +From eb69b1fbbbac79a99456648c655e17ffd9743dca Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Fri, 24 Jun 2022 14:55:51 +0200 Subject: [PATCH 3/5] Remove unmet dependencies --- .../src/aQute/lib/bundles/BundleIdentity.java | 65 -- - .../startlevel/StartLevelRuntimeHandler.java | 305 --------- + .../startlevel/StartLevelRuntimeHandler.java | 325 --------- aQute.libg/src/aQute/libg/dtos/DTOMap.java | 143 ---- aQute.libg/src/aQute/libg/dtos/DTOs.java | 211 ------ aQute.libg/src/aQute/libg/dtos/DTOsImpl.java | 615 ------------------ .../src/aQute/bnd/build/ProjectLauncher.java | 1 - - 6 files changed, 1340 deletions(-) + 6 files changed, 1360 deletions(-) delete mode 100644 aQute.libg/src/aQute/lib/bundles/BundleIdentity.java delete mode 100644 aQute.libg/src/aQute/lib/startlevel/StartLevelRuntimeHandler.java delete mode 100644 aQute.libg/src/aQute/libg/dtos/DTOMap.java @@ -90,10 +90,10 @@ index dfd4b6af1..000000000 -} diff --git a/aQute.libg/src/aQute/lib/startlevel/StartLevelRuntimeHandler.java b/aQute.libg/src/aQute/lib/startlevel/StartLevelRuntimeHandler.java deleted file mode 100644 -index e32c25500..000000000 +index 94dfc350b..000000000 --- a/aQute.libg/src/aQute/lib/startlevel/StartLevelRuntimeHandler.java +++ /dev/null -@@ -1,305 +0,0 @@ +@@ -1,325 +0,0 @@ -package aQute.lib.startlevel; - -import java.io.Closeable; @@ -254,15 +254,33 @@ index e32c25500..000000000 - - String defaultStartlevelString = outerConfiguration.get(LAUNCH_STARTLEVEL_DEFAULT); - if (defaultStartlevelString == null) { -- logger.trace("startlevel: not handled"); +- logger.trace("startlevel: not handled because %s not set", LAUNCH_STARTLEVEL_DEFAULT); - return absent(); - } - -- int defaultStartlevel = toInt(defaultStartlevelString, 1); +- int tmp = toInt(defaultStartlevelString, 1); +- if (tmp == 0) { +- logger.trace("startlevel: disabled because property %s==%s", LAUNCH_STARTLEVEL_DEFAULT, +- defaultStartlevelString); +- return absent(); +- } +- +- +- int defaultStartlevel; +- boolean manageAll; +- if (tmp > 0) { +- manageAll = !Boolean.getBoolean("biz.aQute.launcher.scoped"); +- defaultStartlevel = tmp; +- } else { +- manageAll = false; +- defaultStartlevel = -tmp; +- } +- - int beginningStartlevel = toInt(outerConfiguration.get(Constants.FRAMEWORK_BEGINNING_STARTLEVEL), 1); - outerConfiguration.put(Constants.FRAMEWORK_BEGINNING_STARTLEVEL, "1"); - -- logger.trace("startlevel: handled begin=%s default=%s", beginningStartlevel, defaultStartlevel); +- logger.trace("startlevel: handled begin=%s default=%s managed=%s", beginningStartlevel, defaultStartlevel, +- manageAll ? "all" : "narrow"); - - // - // We need to remove it otherwise the framework reacts to it @@ -281,15 +299,8 @@ index e32c25500..000000000 - - this.systemBundle = systemBundle; - -- for (Bundle bundle : systemBundle.getBundleContext() -- .getBundles()) { -- if (bundle.getBundleId() == 0) { -- continue; -- } -- if (bundle.getSymbolicName() == null) { -- continue; -- } -- installed.put(bundle, new BundleIdentity(bundle)); +- if (manageAll) { +- manageAll(systemBundle); - } - - updateConfiguration(outerConfiguration); @@ -318,6 +329,15 @@ index e32c25500..000000000 - - } - +- private void manageAll(Framework systemBundle) { +- for (Bundle bundle : systemBundle.getBundleContext() +- .getBundles()) { +- if (bundle.getBundleId() != 0 && bundle.getSymbolicName() != null) { +- installed.put(bundle, new BundleIdentity(bundle)); +- } +- } +- } +- - @Override - public void afterStart() { - setFrameworkStartLevel(systemBundle, beginningStartlevel, event -> { diff --git a/_service b/_service index f1a196a..20ee6b3 100644 --- a/_service +++ b/_service @@ -2,7 +2,7 @@ git https://github.com/bndtools/bnd.git - 6.4.0 + 6.4.1 @PARENT_TAG@ gradlew* docs diff --git a/aQute.libg-6.4.0.pom b/aQute.libg-6.4.1.pom similarity index 98% rename from aQute.libg-6.4.0.pom rename to aQute.libg-6.4.1.pom index 75eead6..640e1bf 100644 --- a/aQute.libg-6.4.0.pom +++ b/aQute.libg-6.4.1.pom @@ -3,7 +3,7 @@ 4.0.0 biz.aQute.bnd aQute.libg - 6.4.0 + 6.4.1 A library to be statically linked. Contains many small utilities. This bundle should not be installed in a framework, it is compile only. aQute.libg https://bnd.bndtools.org/ @@ -23,7 +23,7 @@ https://github.com/bndtools/bnd scm:git:https://github.com/bndtools/bnd.git scm:git:git@github.com:bndtools/bnd.git - 6.4.0 + 6.4.1 diff --git a/aqute-bnd.spec b/aqute-bnd.spec index ebaefe4..627565b 100644 --- a/aqute-bnd.spec +++ b/aqute-bnd.spec @@ -17,7 +17,7 @@ Name: aqute-bnd -Version: 6.4.0 +Version: 6.4.1 Release: 0 Summary: BND Tool # Part of jpm is under BSD, but jpm is not included in binary RPM diff --git a/biz.aQute.bnd-6.4.0.pom b/biz.aQute.bnd-6.4.1.pom similarity index 95% rename from biz.aQute.bnd-6.4.0.pom rename to biz.aQute.bnd-6.4.1.pom index c21ee93..f832014 100644 --- a/biz.aQute.bnd-6.4.0.pom +++ b/biz.aQute.bnd-6.4.1.pom @@ -3,7 +3,7 @@ 4.0.0 biz.aQute.bnd biz.aQute.bnd - 6.4.0 + 6.4.1 This command line utility is the Swiss army knife of OSGi. It provides you with a breadth of tools to understand and manage OSGi based systems. This project basically uses bndlib. biz.aQute.bnd https://bnd.bndtools.org/ @@ -23,7 +23,7 @@ https://github.com/bndtools/bnd scm:git:https://github.com/bndtools/bnd.git scm:git:git@github.com:bndtools/bnd.git - 6.4.0 + 6.4.1 @@ -127,49 +127,49 @@ biz.aQute.bnd biz.aQute.bnd.util - 6.4.0 + 6.4.1 provided biz.aQute.bnd biz.aQute.bndlib - 6.4.0 + 6.4.1 provided biz.aQute.bnd biz.aQute.bnd.ant - 6.4.0 + 6.4.1 provided biz.aQute.bnd biz.aQute.resolve - 6.4.0 + 6.4.1 provided biz.aQute.bnd biz.aQute.repository - 6.4.0 + 6.4.1 provided biz.aQute.bnd biz.aQute.bnd.exporters - 6.4.0 + 6.4.1 provided biz.aQute.bnd biz.aQute.bnd.reporter - 6.4.0 + 6.4.1 provided biz.aQute.bnd biz.aQute.remote.api - 6.4.0 + 6.4.1 provided diff --git a/biz.aQute.bnd.annotation-6.4.0.pom b/biz.aQute.bnd.annotation-6.4.1.pom similarity index 98% rename from biz.aQute.bnd.annotation-6.4.0.pom rename to biz.aQute.bnd.annotation-6.4.1.pom index 4aa862e..1ae11b3 100644 --- a/biz.aQute.bnd.annotation-6.4.0.pom +++ b/biz.aQute.bnd.annotation-6.4.1.pom @@ -3,7 +3,7 @@ 4.0.0 biz.aQute.bnd biz.aQute.bnd.annotation - 6.4.0 + 6.4.1 bnd Annotations Library biz.aQute.bnd.annotation https://bnd.bndtools.org/ @@ -23,7 +23,7 @@ https://github.com/bndtools/bnd scm:git:https://github.com/bndtools/bnd.git scm:git:git@github.com:bndtools/bnd.git - 6.4.0 + 6.4.1 diff --git a/biz.aQute.bnd.ant-6.4.0.pom b/biz.aQute.bnd.ant-6.4.1.pom similarity index 96% rename from biz.aQute.bnd.ant-6.4.0.pom rename to biz.aQute.bnd.ant-6.4.1.pom index 01c0b21..e7ebc32 100644 --- a/biz.aQute.bnd.ant-6.4.0.pom +++ b/biz.aQute.bnd.ant-6.4.1.pom @@ -3,7 +3,7 @@ 4.0.0 biz.aQute.bnd biz.aQute.bnd.ant - 6.4.0 + 6.4.1 Bnd Ant Tasks biz.aQute.bnd.ant https://bnd.bndtools.org/ @@ -23,7 +23,7 @@ https://github.com/bndtools/bnd scm:git:https://github.com/bndtools/bnd.git scm:git:git@github.com:bndtools/bnd.git - 6.4.0 + 6.4.1 @@ -73,13 +73,13 @@ biz.aQute.bnd biz.aQute.bnd.util - 6.4.0 + 6.4.1 compile biz.aQute.bnd biz.aQute.bndlib - 6.4.0 + 6.4.1 compile diff --git a/biz.aQute.bnd.exporters-6.4.0.pom b/biz.aQute.bnd.exporters-6.4.1.pom similarity index 91% rename from biz.aQute.bnd.exporters-6.4.0.pom rename to biz.aQute.bnd.exporters-6.4.1.pom index 4108df0..e8ee163 100644 --- a/biz.aQute.bnd.exporters-6.4.0.pom +++ b/biz.aQute.bnd.exporters-6.4.1.pom @@ -3,7 +3,7 @@ 4.0.0 biz.aQute.bnd biz.aQute.bnd.exporters - 6.4.0 + 6.4.1 biz.aQute.bnd.exporters biz.aQute.bnd.exporters https://bnd.bndtools.org/ @@ -23,7 +23,7 @@ https://github.com/bndtools/bnd scm:git:https://github.com/bndtools/bnd.git scm:git:git@github.com:bndtools/bnd.git - 6.4.0 + 6.4.1 @@ -79,13 +79,13 @@ biz.aQute.bnd biz.aQute.bnd.util - 6.4.0 + 6.4.1 compile biz.aQute.bnd biz.aQute.bndlib - 6.4.0 + 6.4.1 compile @@ -94,5 +94,11 @@ 1.7.25 compile + + biz.aQute.bnd + biz.aQute.bnd.annotation + 6.4.1 + compile + diff --git a/biz.aQute.bnd.util-6.4.0.pom b/biz.aQute.bnd.util-6.4.1.pom similarity index 98% rename from biz.aQute.bnd.util-6.4.0.pom rename to biz.aQute.bnd.util-6.4.1.pom index 082f633..98d7e49 100644 --- a/biz.aQute.bnd.util-6.4.0.pom +++ b/biz.aQute.bnd.util-6.4.1.pom @@ -3,7 +3,7 @@ 4.0.0 biz.aQute.bnd biz.aQute.bnd.util - 6.4.0 + 6.4.1 Util classes biz.aQute.bnd.util https://bnd.bndtools.org/ @@ -23,7 +23,7 @@ https://github.com/bndtools/bnd scm:git:https://github.com/bndtools/bnd.git scm:git:git@github.com:bndtools/bnd.git - 6.4.0 + 6.4.1 diff --git a/biz.aQute.bndlib-6.4.0.pom b/biz.aQute.bndlib-6.4.1.pom similarity index 98% rename from biz.aQute.bndlib-6.4.0.pom rename to biz.aQute.bndlib-6.4.1.pom index a6af613..f12111d 100644 --- a/biz.aQute.bndlib-6.4.0.pom +++ b/biz.aQute.bndlib-6.4.1.pom @@ -3,7 +3,7 @@ 4.0.0 biz.aQute.bnd biz.aQute.bndlib - 6.4.0 + 6.4.1 bndlib: A Swiss Army Knife for OSGi biz.aQute.bndlib https://bnd.bndtools.org/ @@ -23,7 +23,7 @@ https://github.com/bndtools/bnd scm:git:https://github.com/bndtools/bnd.git scm:git:git@github.com:bndtools/bnd.git - 6.4.0 + 6.4.1 @@ -145,7 +145,7 @@ biz.aQute.bnd biz.aQute.bnd.util - 6.4.0 + 6.4.1 compile diff --git a/bnd-6.4.0-build_xml.tar.xz b/bnd-6.4.0-build_xml.tar.xz deleted file mode 100644 index a6855b7..0000000 --- a/bnd-6.4.0-build_xml.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4d8a8d681e440394d887745cbfb64dff5349a5c9274c5117cb941d8543653583 -size 2488 diff --git a/bnd-6.4.0.tar.xz b/bnd-6.4.0.tar.xz deleted file mode 100644 index 37e453f..0000000 --- a/bnd-6.4.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c056723d685ead6a1c37281ca47b7750fb9ededf063cd56d62ab69c1cad0bf6b -size 3267164 diff --git a/bnd-6.4.1-build_xml.tar.xz b/bnd-6.4.1-build_xml.tar.xz new file mode 100644 index 0000000..cfbf891 --- /dev/null +++ b/bnd-6.4.1-build_xml.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34ba419f12c257b3c8bbe5e8cb5a361301652250db5fa5e1608aa2d7416b97a2 +size 2504 diff --git a/bnd-6.4.1.tar.xz b/bnd-6.4.1.tar.xz new file mode 100644 index 0000000..fbd80f6 --- /dev/null +++ b/bnd-6.4.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:80ea002d28da631f2eea734679a740ee3fb7c887c3f7119693f600047e7c4e59 +size 3266872 diff --git a/bnd-maven-plugin.spec b/bnd-maven-plugin.spec index 14f1d9c..0dc7654 100644 --- a/bnd-maven-plugin.spec +++ b/bnd-maven-plugin.spec @@ -17,7 +17,7 @@ Name: bnd-maven-plugin -Version: 6.4.0 +Version: 6.4.1 Release: 0 Summary: BND Maven plugin # Part of jpm is under BSD, but jpm is not included in binary RPM diff --git a/reproducible-packages-list.patch b/reproducible-packages-list.patch index 3d9ac0b..396e944 100644 --- a/reproducible-packages-list.patch +++ b/reproducible-packages-list.patch @@ -1,6 +1,6 @@ -From 187b3d39bbd1e07ce98c74e701be7802d332cd2f Mon Sep 17 00:00:00 2001 +From 2b2d6e760e70dba6157b9296147d29d05dc590b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Mon, 9 Sep 2024 10:04:04 +0200 +Date: Mon, 9 Sep 2024 09:46:40 +0200 Subject: [PATCH 5/5] reproducible packages list --- diff --git a/reproducible-timestamps.patch b/reproducible-timestamps.patch index e41c55c..61da81a 100644 --- a/reproducible-timestamps.patch +++ b/reproducible-timestamps.patch @@ -1,6 +1,6 @@ -From d2a9dcd63ca39133471c2ea05da7c83185a44372 Mon Sep 17 00:00:00 2001 +From 057827a1473330389aa0756caa7d38f47f4a8366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= -Date: Mon, 9 Sep 2024 10:03:36 +0200 +Date: Mon, 9 Sep 2024 09:46:11 +0200 Subject: [PATCH 4/5] reproducible timestamps ---