rpm/aqute-bnd
SHA256
1
0
Fork 0
forked from pool/aqute-bnd
Code Pull Requests Activity

Accepting request 1199718 from Java:packages

Browse Source 
6.4.1

OBS-URL: https://build.opensuse.org/request/show/1199718
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aqute-bnd?expand=0&rev=12
This commit is contained in:
Ana Guerrero 2024-09-10 19:13:18 +00:00 committed by Git OBS Bridge
commit faa877f6fc
21 changed files with 203 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
0001-Disable-removed-commands.patch
View File

@ -1,8 +1,17 @@
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 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 @@ index a787c32..fc241a2 100644
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 @@ index a787c32..fc241a2 100644
/**
* 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 @@ index a787c32..fc241a2 100644
public Workspace getWorkspace() {
return workspace;
}
@@ -4479,24 +4421,6 @@ public class bnd extends Processor {
@@ -4467,24 +4409,6 @@ public class bnd extends Processor {
}
@ -106,3 +115,6 @@ index a787c32..fc241a2 100644
@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

8
0002-Port-to-OSGI-7.0.0.patch
View File

@ -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 <mkoncek@redhat.com>
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,5 +98,5 @@ index 9c2591f..569b20e 100644
public ConsoleLogger(BundleContext context) {
--
2.20.1
2.46.0

68
0003-Remove-unmet-dependencies.patch
View File

@ -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 <mkoncek@redhat.com>
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 @@ Subject: [PATCH] Remove unmet dependencies
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 @@ index dfd4b6a..0000000
-}
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 @@ index e32c255..0000000
-
- 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 e32c255..0000000
-
- 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 e32c255..0000000
-
- }
-
- 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 @@ index e32c255..0000000
-}
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 @@ index f927de5..0000000
-}
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 @@ index a8abdb1..0000000
-}
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 @@ index 6de46b6..0000000
-
-}
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,5 +1419,5 @@ index e1ce42f..c1a3d87 100644
import aQute.lib.watcher.FileWatcher;
import aQute.lib.watcher.FileWatcher.Builder;
--
2.37.2
2.46.0

17
reproducible-timestamps.patch → 0004-reproducible-timestamps.patch
View File

@ -1,5 +1,15 @@
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 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 10ec3fd0..7dd75418 100644
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 {
@ -12,7 +22,7 @@ index 10ec3fd0..7dd75418 100644
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 e9ecd39e..f7f83d83 100644
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 {
@ -38,3 +48,6 @@ index e9ecd39e..f7f83d83 100644
return now;
}
--
2.46.0

14
reproducible-packages-list.patch → 0005-reproducible-packages-list.patch
View File

@ -1,5 +1,14 @@
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 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 b127fc68..679a1051 100644
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 @@
@ -27,3 +36,6 @@ index b127fc68..679a1051 100644
}
@Override
--
2.46.0

2
_service
View File

@ -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>

4
aQute.libg-6.3.1.pom → aQute.libg-6.4.1.pom
View File

@ -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:git@github.com:bndtools/bnd.git</developerConnection>
<tag>6.3.1</tag>
<tag>6.4.1</tag>
</scm>
<developers>
<developer>

22
aqute-bnd.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Mon Sep 9 13:48:12 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>
@ -94,6 +110,12 @@ Wed Jun 26 15:29:03 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Add aliases for the aqute-bnd artifact
-------------------------------------------------------------------
Wed Apr 3 09:33:04 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of the bnd-maven-plugin distributed as a part
of aqute-bnd 3.5.0
-------------------------------------------------------------------
Thu Mar 14 10:43:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>

6
aqute-bnd.spec
View File

@ -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 @@ 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: 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

20
biz.aQute.bnd-6.3.1.pom → biz.aQute.bnd-6.4.1.pom
View File

@ -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:git@github.com: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>

4
biz.aQute.bnd.annotation-6.3.1.pom → biz.aQute.bnd.annotation-6.4.1.pom
View File

@ -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:git@github.com:bndtools/bnd.git</developerConnection>
<tag>6.3.1</tag>
<tag>6.4.1</tag>
</scm>
<developers>
<developer>

8
biz.aQute.bnd.ant-6.3.1.pom → biz.aQute.bnd.ant-6.4.1.pom
View File

@ -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:git@github.com: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>

14
biz.aQute.bnd.exporters-6.3.1.pom → biz.aQute.bnd.exporters-6.4.1.pom
View File

@ -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:git@github.com: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>

4
biz.aQute.bnd.util-6.3.1.pom → biz.aQute.bnd.util-6.4.1.pom
View File

@ -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:git@github.com:bndtools/bnd.git</developerConnection>
<tag>6.3.1</tag>
<tag>6.4.1</tag>
</scm>
<developers>
<developer>

6
biz.aQute.bndlib-6.3.1.pom → biz.aQute.bndlib-6.4.1.pom
View File

@ -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:git@github.com: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>

BIN
bnd-6.3.1-build_xml.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

BIN
bnd-6.3.1.tar.xz (Stored with Git LFS)
View File

Binary file not shown.

3
bnd-6.4.1-build_xml.tar.xz Normal file
View 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
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:80ea002d28da631f2eea734679a740ee3fb7c887c3f7119693f600047e7c4e59
size 3266872

42
bnd-maven-plugin.changes
View File

@ -1,5 +1,21 @@
-------------------------------------------------------------------
Tue Feb 20 13:31:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
Mon Sep 9 13:48:12 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- 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 <fstrba@suse.com>
- Use %patch -P N instead of deprecated %patchN.
@ -35,6 +51,12 @@ Sat Sep 16 10:08:36 UTC 2023 - Fridrich Strba <fstrba@suse.com>
* reproducible-packages-list.patch
+ make the order of packages to import/export deterministic
-------------------------------------------------------------------
Thu May 4 14:25:12 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
- Add _multibuild to define 2nd spec file as additional flavor.
Eliminates the need for source package links in OBS.
-------------------------------------------------------------------
Wed Apr 26 17:47:47 UTC 2023 - Fridrich Strba <fstrba@suse.com>
@ -83,8 +105,26 @@ Wed Apr 1 08:09:22 UTC 2020 - Fridrich Strba <fstrba@suse.com>
* 0001-Port-to-OSGI-7.0.0.patch
+ Port to OSGI 7.0.0
-------------------------------------------------------------------
Wed Jun 26 15:29:03 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Add aliases for the aqute-bnd artifact
-------------------------------------------------------------------
Wed Apr 3 09:33:04 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of the bnd-maven-plugin distributed as a part
of aqute-bnd 3.5.0
-------------------------------------------------------------------
Thu Mar 14 10:43:20 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Correct error with duplicate identical aliases for two different
artifacts
-------------------------------------------------------------------
Tue Feb 12 08:34:57 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Initial packaging of aqute-bnd 3.5.0
- Add ant build.xml files in order to build without having to use
gradle

7
bnd-maven-plugin.spec
View File

@ -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 @@ Source0: bnd-%{version}.tar.xz
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 @@ pushd maven
%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