pool/aqute-bnd
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/aqute-bnd?expand=0&rev=31

Browse Source
This commit is contained in:
Fridrich Strba 2023-09-17 17:15:21 +00:00 committed by Git OBS Bridge
parent a6cacbe783
commit 9c2a93e420
4 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aqute-bnd.spec
View File

@ -38,6 +38,7 @@ Patch3: aqute-bnd-java8compat.patch
Patch4: 0004-maven-plugin-dependencies.patch
Patch5: reproducible-timestamps.patch
Patch6: reproducible-packages-list.patch
Patch7: reproducible-require-capability.patch
BuildRequires: ant
BuildRequires: fdupes
BuildRequires: javapackages-local
@ -99,6 +100,7 @@ build-jar-repository -s lib \
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
# the commands pull in more dependencies than we want (felix-resolver, jetty, jtwig, javapackager)
rm biz.aQute.bnd/src/aQute/bnd/main/{RemoteCommand,ResolveCommand,ExportReportCommand,MbrCommand,ReporterLogger}.java

4
bnd-maven-plugin.changes
View File

@ -6,7 +6,9 @@ Sat Sep 16 10:08:36 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+ set "-reproducible" option to true by default
+ use SOURCE_DATE_EPOCH for timestamp if available
* reproducible-packages-list.patch
+ make the order of packages to import/export determininstic
+ make the order of packages to import/export deterministic
* reproducible-require-capability.patch
+ make the order of require-capabilities entries deterministic
-------------------------------------------------------------------
Wed Apr 26 17:47:47 UTC 2023 - Fridrich Strba <fstrba@suse.com>

2
bnd-maven-plugin.spec
View File

@ -31,6 +31,7 @@ Patch3: aqute-bnd-java8compat.patch
Patch4: 0004-maven-plugin-dependencies.patch
Patch5: reproducible-timestamps.patch
Patch6: reproducible-packages-list.patch
Patch7: reproducible-require-capability.patch
BuildRequires: fdupes
BuildRequires: maven-local
BuildRequires: mvn(biz.aQute.bnd:biz.aQute.bndlib)
@ -66,6 +67,7 @@ API documentation for %{name}.
%patch4 -p1
%patch5 -p1
%patch6 -p1
%patch7 -p1
pushd maven
%pom_remove_dep -r :biz.aQute.bnd.maven

39
reproducible-require-capability.patch Normal file
View File

@ -0,0 +1,39 @@
diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceBuilder.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceBuilder.java
index ebb8463a..e624009c 100644
--- a/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceBuilder.java
+++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/resource/ResourceBuilder.java
@@ -11,8 +11,6 @@ import java.net.URI;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -20,6 +18,7 @@ import java.util.Map.Entry;
import java.util.Optional;
import java.util.Set;
import java.util.TreeMap;
+import java.util.TreeSet;
import java.util.function.Supplier;
import java.util.jar.Manifest;
@@ -101,7 +100,7 @@ public class ResourceBuilder {
}
private static <CR> void add(Map<String, Set<CR>> map, String namespace, CR capreq) {
- map.computeIfAbsent(namespace, k -> new LinkedHashSet<>())
+ map.computeIfAbsent(namespace, k -> new TreeSet<>())
.add(capreq);
}
@@ -672,7 +671,7 @@ public class ResourceBuilder {
}
public Map<Capability, Capability> from(Resource bundle) {
- Map<Capability, Capability> mapping = new LinkedHashMap<>();
+ Map<Capability, Capability> mapping = new TreeMap<>();
addRequirements(bundle.getRequirements(null));