forked from pool/aqute-bnd
This commit is contained in:
parent
6f42764e37
commit
d3e4307aa6
@ -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?= <fridrich.strba@bluewin.ch>
|
||||
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
|
||||
|
||||
---
|
||||
|
@ -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 <mkoncek@redhat.com>
|
||||
Date: Thu, 11 Jul 2019 14:29:26 +0200
|
||||
Subject: [PATCH 2/5] Port to OSGI 7.0.0
|
||||
|
@ -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 <mkoncek@redhat.com>
|
||||
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 -> {
|
||||
|
2
_service
2
_service
@ -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.4.0</param>
|
||||
<param name="revision">6.4.1</param>
|
||||
<param name="versionformat">@PARENT_TAG@</param>
|
||||
<param name="exclude">gradlew*</param>
|
||||
<param name="exclude">docs</param>
|
||||
|
@ -3,7 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>aQute.libg</artifactId>
|
||||
<version>6.4.0</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:git@github.com:bndtools/bnd.git</developerConnection>
|
||||
<tag>6.4.0</tag>
|
||||
<tag>6.4.1</tag>
|
||||
</scm>
|
||||
<developers>
|
||||
<developer>
|
@ -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
|
||||
|
@ -3,7 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bnd</artifactId>
|
||||
<version>6.4.0</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:git@github.com:bndtools/bnd.git</developerConnection>
|
||||
<tag>6.4.0</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.4.0</version>
|
||||
<version>6.4.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bndlib</artifactId>
|
||||
<version>6.4.0</version>
|
||||
<version>6.4.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bnd.ant</artifactId>
|
||||
<version>6.4.0</version>
|
||||
<version>6.4.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.resolve</artifactId>
|
||||
<version>6.4.0</version>
|
||||
<version>6.4.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.repository</artifactId>
|
||||
<version>6.4.0</version>
|
||||
<version>6.4.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bnd.exporters</artifactId>
|
||||
<version>6.4.0</version>
|
||||
<version>6.4.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bnd.reporter</artifactId>
|
||||
<version>6.4.0</version>
|
||||
<version>6.4.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.remote.api</artifactId>
|
||||
<version>6.4.0</version>
|
||||
<version>6.4.1</version>
|
||||
<scope>provided</scope>
|
||||
</dependency>
|
||||
<dependency>
|
@ -3,7 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bnd.annotation</artifactId>
|
||||
<version>6.4.0</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:git@github.com:bndtools/bnd.git</developerConnection>
|
||||
<tag>6.4.0</tag>
|
||||
<tag>6.4.1</tag>
|
||||
</scm>
|
||||
<developers>
|
||||
<developer>
|
@ -3,7 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bnd.ant</artifactId>
|
||||
<version>6.4.0</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:git@github.com:bndtools/bnd.git</developerConnection>
|
||||
<tag>6.4.0</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.4.0</version>
|
||||
<version>6.4.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bndlib</artifactId>
|
||||
<version>6.4.0</version>
|
||||
<version>6.4.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
@ -3,7 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bnd.exporters</artifactId>
|
||||
<version>6.4.0</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:git@github.com:bndtools/bnd.git</developerConnection>
|
||||
<tag>6.4.0</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.4.0</version>
|
||||
<version>6.4.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bndlib</artifactId>
|
||||
<version>6.4.0</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>
|
@ -3,7 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bnd.util</artifactId>
|
||||
<version>6.4.0</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:git@github.com:bndtools/bnd.git</developerConnection>
|
||||
<tag>6.4.0</tag>
|
||||
<tag>6.4.1</tag>
|
||||
</scm>
|
||||
<developers>
|
||||
<developer>
|
@ -3,7 +3,7 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
<groupId>biz.aQute.bnd</groupId>
|
||||
<artifactId>biz.aQute.bndlib</artifactId>
|
||||
<version>6.4.0</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:git@github.com:bndtools/bnd.git</developerConnection>
|
||||
<tag>6.4.0</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.4.0</version>
|
||||
<version>6.4.1</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4d8a8d681e440394d887745cbfb64dff5349a5c9274c5117cb941d8543653583
|
||||
size 2488
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c056723d685ead6a1c37281ca47b7750fb9ededf063cd56d62ab69c1cad0bf6b
|
||||
size 3267164
|
3
bnd-6.4.1-build_xml.tar.xz
Normal file
3
bnd-6.4.1-build_xml.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:34ba419f12c257b3c8bbe5e8cb5a361301652250db5fa5e1608aa2d7416b97a2
|
||||
size 2504
|
3
bnd-6.4.1.tar.xz
Normal file
3
bnd-6.4.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:80ea002d28da631f2eea734679a740ee3fb7c887c3f7119693f600047e7c4e59
|
||||
size 3266872
|
@ -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
|
||||
|
@ -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?= <fridrich.strba@bluewin.ch>
|
||||
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
|
||||
|
||||
---
|
||||
|
@ -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?= <fridrich.strba@bluewin.ch>
|
||||
Date: Mon, 9 Sep 2024 10:03:36 +0200
|
||||
Date: Mon, 9 Sep 2024 09:46:11 +0200
|
||||
Subject: [PATCH 4/5] reproducible timestamps
|
||||
|
||||
---
|
||||
|
Loading…
Reference in New Issue
Block a user