Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package aqute-bnd for openSUSE:Factory checked in at 2024-09-10 21:13:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/aqute-bnd (Old) and /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aqute-bnd" Tue Sep 10 21:13:18 2024 rev:12 rq:1199718 version:6.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/aqute-bnd/aqute-bnd.changes 2024-02-21 17:56:29.099452183 +0100 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aqute-bnd.changes 2024-09-10 21:14:33.101333220 +0200 @@ -1,0 +2,16 @@ +Mon Sep 9 13:48:12 UTC 2024 - Fridrich Strba <[email protected]> + +- Update to aqute-bnd 6.4.1 + * https://github.com/bndtools/bnd/wiki/Changes-in-6.4.0 + * https://github.com/bndtools/bnd/wiki/Changes-in-6.4.1-classic +- Modified patches: + * 0001-Disable-removed-commands.patch + * 0002-Port-to-OSGI-7.0.0.patch + * 0003-Remove-unmet-dependencies.patch + * reproducible-timestamps.patch -> + 0004-reproducible-timestamps.patch + * reproducible-packages-list.patch -> + 0005-reproducible-packages-list.patch + + rebase + +------------------------------------------------------------------- @@ -95,0 +112,6 @@ + +------------------------------------------------------------------- +Wed Apr 3 09:33:04 UTC 2019 - Fridrich Strba <[email protected]> + +- Initial packaging of the bnd-maven-plugin distributed as a part + of aqute-bnd 3.5.0 --- /work/SRC/openSUSE:Factory/aqute-bnd/bnd-maven-plugin.changes 2024-02-21 17:56:29.275458547 +0100 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/bnd-maven-plugin.changes 2024-09-10 21:14:33.489349386 +0200 @@ -2 +2,17 @@ -Tue Feb 20 13:31:04 UTC 2024 - Fridrich Strba <[email protected]> +Mon Sep 9 13:48:12 UTC 2024 - Fridrich Strba <[email protected]> + +- Update to aqute-bnd 6.4.1 + * https://github.com/bndtools/bnd/wiki/Changes-in-6.4.0 + * https://github.com/bndtools/bnd/wiki/Changes-in-6.4.1-classic +- Modified patches: + * 0001-Disable-removed-commands.patch + * 0002-Port-to-OSGI-7.0.0.patch + * 0003-Remove-unmet-dependencies.patch + * reproducible-timestamps.patch -> + 0004-reproducible-timestamps.patch + * reproducible-packages-list.patch -> + 0005-reproducible-packages-list.patch + + rebase + +------------------------------------------------------------------- +Tue Feb 20 13:31:03 UTC 2024 - Fridrich Strba <[email protected]> @@ -38,0 +55,6 @@ +Thu May 4 14:25:12 UTC 2023 - Dominique Leuenberger <[email protected]> + +- Add _multibuild to define 2nd spec file as additional flavor. + Eliminates the need for source package links in OBS. + +------------------------------------------------------------------- @@ -86,0 +109,5 @@ +Wed Jun 26 15:29:03 UTC 2019 - Fridrich Strba <[email protected]> + +- Add aliases for the aqute-bnd artifact + +------------------------------------------------------------------- @@ -90,0 +118,13 @@ + +------------------------------------------------------------------- +Thu Mar 14 10:43:20 UTC 2019 - Fridrich Strba <[email protected]> + +- Correct error with duplicate identical aliases for two different + artifacts + +------------------------------------------------------------------- +Tue Feb 12 08:34:57 UTC 2019 - Fridrich Strba <[email protected]> + +- Initial packaging of aqute-bnd 3.5.0 +- Add ant build.xml files in order to build without having to use + gradle Old: ---- aQute.libg-6.3.1.pom biz.aQute.bnd-6.3.1.pom biz.aQute.bnd.annotation-6.3.1.pom biz.aQute.bnd.ant-6.3.1.pom biz.aQute.bnd.exporters-6.3.1.pom biz.aQute.bnd.util-6.3.1.pom biz.aQute.bndlib-6.3.1.pom bnd-6.3.1-build_xml.tar.xz bnd-6.3.1.tar.xz reproducible-packages-list.patch reproducible-timestamps.patch New: ---- 0004-reproducible-timestamps.patch 0005-reproducible-packages-list.patch aQute.libg-6.4.1.pom biz.aQute.bnd-6.4.1.pom biz.aQute.bnd.annotation-6.4.1.pom biz.aQute.bnd.ant-6.4.1.pom biz.aQute.bnd.exporters-6.4.1.pom biz.aQute.bnd.util-6.4.1.pom biz.aQute.bndlib-6.4.1.pom bnd-6.4.1-build_xml.tar.xz bnd-6.4.1.tar.xz BETA DEBUG BEGIN: Old:/work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aqute-bnd.changes- 0004-reproducible-timestamps.patch /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aqute-bnd.changes: * reproducible-packages-list.patch -> /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aqute-bnd.changes- 0005-reproducible-packages-list.patch -- /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/bnd-maven-plugin.changes- 0004-reproducible-timestamps.patch /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/bnd-maven-plugin.changes: * reproducible-packages-list.patch -> /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/bnd-maven-plugin.changes- 0005-reproducible-packages-list.patch Old:/work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aqute-bnd.changes- * 0003-Remove-unmet-dependencies.patch /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aqute-bnd.changes: * reproducible-timestamps.patch -> /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aqute-bnd.changes- 0004-reproducible-timestamps.patch -- /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/bnd-maven-plugin.changes- * 0003-Remove-unmet-dependencies.patch /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/bnd-maven-plugin.changes: * reproducible-timestamps.patch -> /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/bnd-maven-plugin.changes- 0004-reproducible-timestamps.patch BETA DEBUG END: BETA DEBUG BEGIN: New:/work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aqute-bnd.changes- * reproducible-timestamps.patch -> /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aqute-bnd.changes: 0004-reproducible-timestamps.patch /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aqute-bnd.changes- * reproducible-packages-list.patch -> -- /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/bnd-maven-plugin.changes- * reproducible-timestamps.patch -> /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/bnd-maven-plugin.changes: 0004-reproducible-timestamps.patch /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/bnd-maven-plugin.changes- * reproducible-packages-list.patch -> New:/work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aqute-bnd.changes- * reproducible-packages-list.patch -> /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aqute-bnd.changes: 0005-reproducible-packages-list.patch /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aqute-bnd.changes- + rebase -- /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/bnd-maven-plugin.changes- * reproducible-packages-list.patch -> /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/bnd-maven-plugin.changes: 0005-reproducible-packages-list.patch /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/bnd-maven-plugin.changes- + rebase BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aqute-bnd.spec ++++++ --- /var/tmp/diff_new_pack.GJ0rY4/_old 2024-09-10 21:14:34.637397219 +0200 +++ /var/tmp/diff_new_pack.GJ0rY4/_new 2024-09-10 21:14:34.641397385 +0200 @@ -17,7 +17,7 @@ Name: aqute-bnd -Version: 6.3.1 +Version: 6.4.1 Release: 0 Summary: BND Tool # Part of jpm is under BSD, but jpm is not included in binary RPM @@ -36,8 +36,8 @@ Patch1: 0001-Disable-removed-commands.patch Patch2: 0002-Port-to-OSGI-7.0.0.patch Patch3: 0003-Remove-unmet-dependencies.patch -Patch4: reproducible-timestamps.patch -Patch5: reproducible-packages-list.patch +Patch4: 0004-reproducible-timestamps.patch +Patch5: 0005-reproducible-packages-list.patch BuildRequires: ant BuildRequires: fdupes BuildRequires: javapackages-local >= 6 ++++++ bnd-maven-plugin.spec ++++++ --- /var/tmp/diff_new_pack.GJ0rY4/_old 2024-09-10 21:14:34.685399219 +0200 +++ /var/tmp/diff_new_pack.GJ0rY4/_new 2024-09-10 21:14:34.685399219 +0200 @@ -17,7 +17,7 @@ Name: bnd-maven-plugin -Version: 6.3.1 +Version: 6.4.1 Release: 0 Summary: BND Maven plugin # Part of jpm is under BSD, but jpm is not included in binary RPM @@ -28,8 +28,8 @@ Patch1: 0001-Disable-removed-commands.patch Patch2: 0002-Port-to-OSGI-7.0.0.patch Patch3: 0003-Remove-unmet-dependencies.patch -Patch4: reproducible-timestamps.patch -Patch5: reproducible-packages-list.patch +Patch4: 0004-reproducible-timestamps.patch +Patch5: 0005-reproducible-packages-list.patch BuildRequires: fdupes BuildRequires: maven-local BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib) >= %{version} @@ -65,6 +65,7 @@ %pom_disable_module bnd-indexer-maven-plugin # Requires unbuilt parts of bnd %pom_disable_module bnd-export-maven-plugin +%pom_disable_module bnd-generate-maven-plugin %pom_disable_module bnd-reporter-maven-plugin %pom_disable_module bnd-resolver-maven-plugin %pom_disable_module bnd-run-maven-plugin ++++++ 0001-Disable-removed-commands.patch ++++++ --- /var/tmp/diff_new_pack.GJ0rY4/_old 2024-09-10 21:14:34.705400052 +0200 +++ /var/tmp/diff_new_pack.GJ0rY4/_new 2024-09-10 21:14:34.709400219 +0200 @@ -1,8 +1,17 @@ +From 07018362979d754c0f169fab529b3dffef8a5846 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> +Date: Mon, 9 Sep 2024 09:45:16 +0200 +Subject: [PATCH 1/5] Disable removed commands + +--- + biz.aQute.bnd/src/aQute/bnd/main/bnd.java | 76 ----------------------- + 1 file changed, 76 deletions(-) + diff --git a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java -index a787c32..fc241a2 100644 +index 17530921d..513aed5a3 100644 --- a/biz.aQute.bnd/src/aQute/bnd/main/bnd.java +++ b/biz.aQute.bnd/src/aQute/bnd/main/bnd.java -@@ -110,7 +110,6 @@ import aQute.bnd.osgi.Resource; +@@ -108,7 +108,6 @@ import aQute.bnd.osgi.Resource; import aQute.bnd.osgi.Verifier; import aQute.bnd.osgi.eclipse.EclipseClasspath; import aQute.bnd.print.JarPrinter; @@ -10,7 +19,7 @@ import aQute.bnd.result.Result; import aQute.bnd.service.Actionable; import aQute.bnd.service.RepositoryPlugin; -@@ -3921,54 +3920,6 @@ public class bnd extends Processor { +@@ -3909,54 +3908,6 @@ public class bnd extends Processor { getInfo(profiles); } @@ -65,7 +74,7 @@ /** * Export a bndrun file */ -@@ -4424,15 +4375,6 @@ public class bnd extends Processor { +@@ -4412,15 +4363,6 @@ public class bnd extends Processor { } } @@ -81,7 +90,7 @@ public Workspace getWorkspace() { return workspace; } -@@ -4479,24 +4421,6 @@ public class bnd extends Processor { +@@ -4467,24 +4409,6 @@ public class bnd extends Processor { } @@ -106,4 +115,7 @@ @Description("Shows the differences between two XML resource repositories") public void _xmlrepodiff(XmlRepoDiffOptions options) throws Exception { try (XmlRepoDiffCommand cmd = new XmlRepoDiffCommand(this)) { +-- +2.46.0 + ++++++ 0002-Port-to-OSGI-7.0.0.patch ++++++ --- /var/tmp/diff_new_pack.GJ0rY4/_old 2024-09-10 21:14:34.725400885 +0200 +++ /var/tmp/diff_new_pack.GJ0rY4/_new 2024-09-10 21:14:34.729401052 +0200 @@ -1,14 +1,14 @@ -From 64a36cbc8d7c8234dfa2af8670c2e1ea4a5c3909 Mon Sep 17 00:00:00 2001 +From cc7ef245b7d3f7e59753941c3486a305efaf1e2b Mon Sep 17 00:00:00 2001 From: Marian Koncek <[email protected]> Date: Thu, 11 Jul 2019 14:29:26 +0200 -Subject: [PATCH] Port to OSGI 7.0.0 +Subject: [PATCH 2/5] Port to OSGI 7.0.0 --- .../src/aQute/bnd/junit/ConsoleLogger.java | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java b/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java -index 9c2591f..569b20e 100644 +index 9c2591f36..569b20ed3 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java +++ b/biz.aQute.bndlib/src/aQute/bnd/junit/ConsoleLogger.java @@ -15,9 +15,11 @@ import org.osgi.framework.ServiceFactory; @@ -98,6 +98,6 @@ public ConsoleLogger(BundleContext context) { -- -2.20.1 +2.46.0 ++++++ 0003-Remove-unmet-dependencies.patch ++++++ --- /var/tmp/diff_new_pack.GJ0rY4/_old 2024-09-10 21:14:34.745401719 +0200 +++ /var/tmp/diff_new_pack.GJ0rY4/_new 2024-09-10 21:14:34.749401885 +0200 @@ -1,16 +1,16 @@ -From d1702cae9e19a8b9dc2ad538777e51a0680cc605 Mon Sep 17 00:00:00 2001 +From eb69b1fbbbac79a99456648c655e17ffd9743dca Mon Sep 17 00:00:00 2001 From: Marian Koncek <[email protected]> Date: Fri, 24 Jun 2022 14:55:51 +0200 -Subject: [PATCH] Remove unmet dependencies +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 @@ -19,7 +19,7 @@ diff --git a/aQute.libg/src/aQute/lib/bundles/BundleIdentity.java b/aQute.libg/src/aQute/lib/bundles/BundleIdentity.java deleted file mode 100644 -index dfd4b6a..0000000 +index dfd4b6af1..000000000 --- a/aQute.libg/src/aQute/lib/bundles/BundleIdentity.java +++ /dev/null @@ -1,65 +0,0 @@ @@ -90,10 +90,10 @@ -} 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 e32c255..0000000 +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 @@ - - 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 @@ - - 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 @@ - - } - +- 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 -> { @@ -401,7 +421,7 @@ -} diff --git a/aQute.libg/src/aQute/libg/dtos/DTOMap.java b/aQute.libg/src/aQute/libg/dtos/DTOMap.java deleted file mode 100644 -index f927de5..0000000 +index f927de5f7..000000000 --- a/aQute.libg/src/aQute/libg/dtos/DTOMap.java +++ /dev/null @@ -1,143 +0,0 @@ @@ -550,7 +570,7 @@ -} diff --git a/aQute.libg/src/aQute/libg/dtos/DTOs.java b/aQute.libg/src/aQute/libg/dtos/DTOs.java deleted file mode 100644 -index a8abdb1..0000000 +index a8abdb148..000000000 --- a/aQute.libg/src/aQute/libg/dtos/DTOs.java +++ /dev/null @@ -1,211 +0,0 @@ @@ -767,7 +787,7 @@ -} diff --git a/aQute.libg/src/aQute/libg/dtos/DTOsImpl.java b/aQute.libg/src/aQute/libg/dtos/DTOsImpl.java deleted file mode 100644 -index 6de46b6..0000000 +index 6de46b60d..000000000 --- a/aQute.libg/src/aQute/libg/dtos/DTOsImpl.java +++ /dev/null @@ -1,615 +0,0 @@ @@ -1387,7 +1407,7 @@ - -} diff --git a/biz.aQute.bndlib/src/aQute/bnd/build/ProjectLauncher.java b/biz.aQute.bndlib/src/aQute/bnd/build/ProjectLauncher.java -index e1ce42f..c1a3d87 100644 +index e1ce42ffc..c1a3d87d5 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/build/ProjectLauncher.java +++ b/biz.aQute.bndlib/src/aQute/bnd/build/ProjectLauncher.java @@ -43,7 +43,6 @@ import aQute.bnd.osgi.Processor; @@ -1399,6 +1419,6 @@ import aQute.lib.watcher.FileWatcher; import aQute.lib.watcher.FileWatcher.Builder; -- -2.37.2 +2.46.0 ++++++ 0004-reproducible-timestamps.patch ++++++ >From 057827a1473330389aa0756caa7d38f47f4a8366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> Date: Mon, 9 Sep 2024 09:46:11 +0200 Subject: [PATCH 4/5] reproducible timestamps --- biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java | 2 +- biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java index 10ec3fd0f..7dd754187 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Jar.java @@ -114,7 +114,7 @@ public class Jar implements Closeable { private String lastModifiedReason; private boolean doNotTouchManifest; private boolean nomanifest; - private boolean reproducible; + private boolean reproducible = true; private Compression compression = Compression.DEFLATE; private boolean closed; private String[] algorithms; diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java index 197f18016..8eabdf962 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Macro.java @@ -904,6 +904,10 @@ public class Macro { reporter.warning("Too many arguments for tstamp: %s", Arrays.toString(args)); } + if (System.getenv("SOURCE_DATE_EPOCH") != null) { + now = 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")); + } + SimpleDateFormat sdf = new SimpleDateFormat(format, Locale.US); sdf.setTimeZone(tz); return sdf.format(new Date(now)); @@ -922,6 +926,11 @@ public class Macro { } else { now = System.currentTimeMillis(); } + + if (System.getenv("SOURCE_DATE_EPOCH") != null) { + now = 1000 * Long.parseLong(System.getenv("SOURCE_DATE_EPOCH")); + } + return now; } -- 2.46.0 ++++++ 0005-reproducible-packages-list.patch ++++++ >From 2b2d6e760e70dba6157b9296147d29d05dc590b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <[email protected]> Date: Mon, 9 Sep 2024 09:46:40 +0200 Subject: [PATCH 5/5] reproducible packages list --- biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java index b127fc682..679a10514 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/Packages.java @@ -1,9 +1,9 @@ package aQute.bnd.osgi; import java.util.Collection; -import java.util.LinkedHashMap; import java.util.Map; import java.util.Set; +import java.util.TreeMap; import aQute.bnd.header.Attrs; import aQute.bnd.osgi.Descriptors.PackageRef; @@ -21,11 +21,11 @@ public class Packages implements Map<PackageRef, Attrs> { } public Packages(Packages other) { - map = new LinkedHashMap<>(other.map); + map = new TreeMap<>(other.map); } public Packages() { - map = new LinkedHashMap<>(); + map = new TreeMap<>(); } @Override -- 2.46.0 ++++++ _service ++++++ --- /var/tmp/diff_new_pack.GJ0rY4/_old 2024-09-10 21:14:34.813404552 +0200 +++ /var/tmp/diff_new_pack.GJ0rY4/_new 2024-09-10 21:14:34.817404718 +0200 @@ -2,7 +2,7 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/bndtools/bnd.git</param> - <param name="revision">6.3.1</param> + <param name="revision">6.4.1</param> <param name="versionformat">@PARENT_TAG@</param> <param name="exclude">gradlew*</param> <param name="exclude">docs</param> ++++++ aQute.libg-6.3.1.pom -> aQute.libg-6.4.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/aQute.libg-6.3.1.pom 2023-09-20 13:32:07.268946866 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/aQute.libg-6.4.1.pom 2024-09-10 21:14:33.053331220 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>aQute.libg</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <description>A library to be statically linked. Contains many small utilities. This bundle should not be installed in a framework, it is compile only.</description> <name>aQute.libg</name> <url>https://bnd.bndtools.org/</url> @@ -23,7 +23,7 @@ <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:[email protected]:bndtools/bnd.git</developerConnection> - <tag>6.3.1</tag> + <tag>6.4.1</tag> </scm> <developers> <developer> ++++++ biz.aQute.bnd-6.3.1.pom -> biz.aQute.bnd-6.4.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd-6.3.1.pom 2023-09-20 13:32:07.296947870 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/biz.aQute.bnd-6.4.1.pom 2024-09-10 21:14:33.125334220 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <description>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.</description> <name>biz.aQute.bnd</name> <url>https://bnd.bndtools.org/</url> @@ -23,7 +23,7 @@ <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:[email protected]:bndtools/bnd.git</developerConnection> - <tag>6.3.1</tag> + <tag>6.4.1</tag> </scm> <developers> <developer> @@ -127,49 +127,49 @@ <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.util</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.ant</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.resolve</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.repository</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.exporters</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.reporter</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <scope>provided</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.remote.api</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <scope>provided</scope> </dependency> <dependency> ++++++ biz.aQute.bnd.annotation-6.3.1.pom -> biz.aQute.bnd.annotation-6.4.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd.annotation-6.3.1.pom 2023-09-20 13:32:07.304948156 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/biz.aQute.bnd.annotation-6.4.1.pom 2024-09-10 21:14:33.137334720 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.annotation</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <description>bnd Annotations Library</description> <name>biz.aQute.bnd.annotation</name> <url>https://bnd.bndtools.org/</url> @@ -23,7 +23,7 @@ <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:[email protected]:bndtools/bnd.git</developerConnection> - <tag>6.3.1</tag> + <tag>6.4.1</tag> </scm> <developers> <developer> ++++++ biz.aQute.bnd.ant-6.3.1.pom -> biz.aQute.bnd.ant-6.4.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd.ant-6.3.1.pom 2023-09-20 13:32:07.316948586 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/biz.aQute.bnd.ant-6.4.1.pom 2024-09-10 21:14:33.149335220 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.ant</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <description>Bnd Ant Tasks</description> <name>biz.aQute.bnd.ant</name> <url>https://bnd.bndtools.org/</url> @@ -23,7 +23,7 @@ <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:[email protected]:bndtools/bnd.git</developerConnection> - <tag>6.3.1</tag> + <tag>6.4.1</tag> </scm> <developers> <developer> @@ -73,13 +73,13 @@ <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.util</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <scope>compile</scope> </dependency> <dependency> ++++++ biz.aQute.bnd.exporters-6.3.1.pom -> biz.aQute.bnd.exporters-6.4.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd.exporters-6.3.1.pom 2023-09-20 13:32:07.328949016 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/biz.aQute.bnd.exporters-6.4.1.pom 2024-09-10 21:14:33.169336053 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.exporters</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <description>biz.aQute.bnd.exporters</description> <name>biz.aQute.bnd.exporters</name> <url>https://bnd.bndtools.org/</url> @@ -23,7 +23,7 @@ <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:[email protected]:bndtools/bnd.git</developerConnection> - <tag>6.3.1</tag> + <tag>6.4.1</tag> </scm> <developers> <developer> @@ -79,13 +79,13 @@ <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.util</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <scope>compile</scope> </dependency> <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <scope>compile</scope> </dependency> <dependency> @@ -94,5 +94,11 @@ <version>1.7.25</version> <scope>compile</scope> </dependency> + <dependency> + <groupId>biz.aQute.bnd</groupId> + <artifactId>biz.aQute.bnd.annotation</artifactId> + <version>6.4.1</version> + <scope>compile</scope> + </dependency> </dependencies> </project> ++++++ biz.aQute.bnd.util-6.3.1.pom -> biz.aQute.bnd.util-6.4.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bnd.util-6.3.1.pom 2023-09-20 13:32:07.344949590 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/biz.aQute.bnd.util-6.4.1.pom 2024-09-10 21:14:33.233338720 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.util</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <description>Util classes</description> <name>biz.aQute.bnd.util</name> <url>https://bnd.bndtools.org/</url> @@ -23,7 +23,7 @@ <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:[email protected]:bndtools/bnd.git</developerConnection> - <tag>6.3.1</tag> + <tag>6.4.1</tag> </scm> <developers> <developer> ++++++ biz.aQute.bndlib-6.3.1.pom -> biz.aQute.bndlib-6.4.1.pom ++++++ --- /work/SRC/openSUSE:Factory/aqute-bnd/biz.aQute.bndlib-6.3.1.pom 2023-09-20 13:32:07.356950019 +0200 +++ /work/SRC/openSUSE:Factory/.aqute-bnd.new.17570/biz.aQute.bndlib-6.4.1.pom 2024-09-10 21:14:33.345343387 +0200 @@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bndlib</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <description>bndlib: A Swiss Army Knife for OSGi</description> <name>biz.aQute.bndlib</name> <url>https://bnd.bndtools.org/</url> @@ -23,7 +23,7 @@ <url>https://github.com/bndtools/bnd</url> <connection>scm:git:https://github.com/bndtools/bnd.git</connection> <developerConnection>scm:git:[email protected]:bndtools/bnd.git</developerConnection> - <tag>6.3.1</tag> + <tag>6.4.1</tag> </scm> <developers> <developer> @@ -145,7 +145,7 @@ <dependency> <groupId>biz.aQute.bnd</groupId> <artifactId>biz.aQute.bnd.util</artifactId> - <version>6.3.1</version> + <version>6.4.1</version> <scope>compile</scope> </dependency> <dependency> ++++++ bnd-6.3.1-build_xml.tar.xz -> bnd-6.4.1-build_xml.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/build.xml new/build.xml --- old/build.xml 2023-09-18 08:51:49.668510499 +0200 +++ new/build.xml 2024-09-09 10:36:14.088221530 +0200 @@ -2,7 +2,7 @@ <project name="parent" default="package" basedir="."> - <property name="project.version" value="6.3.1"/> + <property name="project.version" value="6.4.1"/> <property name="compiler.source" value="8"/> <property name="compiler.target" value="${compiler.source}"/> <property name="compiler.release" value="${compiler.source}"/> ++++++ bnd-6.3.1-build_xml.tar.xz -> bnd-6.4.1.tar.xz ++++++ ++++ 661129 lines of diff (skipped)
