pool/javapackages-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=132

Browse Source
This commit is contained in:
Fridrich Strba 2023-09-12 04:46:36 +00:00 committed by Git OBS Bridge
parent f5c20004b2
commit 97fd2b2129
2 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
0003-Reproducible-exclusions-order-in-maven-metadata.patch
View File

@ -1,39 +0,0 @@
From db5bcee5c902bc1979f46978e7f5032f134d24fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Mon, 11 Sep 2023 18:43:28 +0200
Subject: [PATCH 3/3] Reproducible exclusions order in maven metadata
---
python/javapackages/maven/dependency.py | 2 +-
python/javapackages/metadata/dependency.py | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/python/javapackages/maven/dependency.py b/python/javapackages/maven/dependency.py
index 8b92327c..534a631e 100644
--- a/python/javapackages/maven/dependency.py
+++ b/python/javapackages/maven/dependency.py
@@ -100,7 +100,7 @@ class Dependency(AbstractArtifact):
if self.exclusions:
exc_root = Element("exclusions")
- for exc in self.exclusions:
+ for exc in sorted(self.exclusions):
exc_root.insert(len(exc_root), exc.get_xml_element())
xml_root.insert(len(root), exc_root)
diff --git a/python/javapackages/metadata/dependency.py b/python/javapackages/metadata/dependency.py
index 1709e1fb..d5082215 100644
--- a/python/javapackages/metadata/dependency.py
+++ b/python/javapackages/metadata/dependency.py
@@ -137,7 +137,7 @@ class MetadataDependency(ObjectBinding):
@classmethod
def from_mvn_dependency(cls, mvn_dep):
exclusions = set()
- for e in mvn_dep.exclusions:
+ for e in sorted(mvn_dep.exclusions):
exclusions.add(MetadataExclusion.from_mvn_exclusion(e))
return cls(mvn_dep.groupId, mvn_dep.artifactId,
--
2.42.0

2
javapackages-tools.spec
View File

@ -49,8 +49,6 @@ Patch2: suse-no-epoch.patch
Patch3: 0001-Make-maven_depmap-order-of-aliases-reproducible.patch
#PATCH-FIX-UPSTREAM: Do not bomb on <relativePath/> construct
Patch4: 0002-Do-not-bomb-on-relativePath-construct.patch
#PATCH-FIX-UPSTREAM: Sort exclusions when writing out metadata
Patch5: 0003-Reproducible-exclusions-order-in-maven-metadata.patch
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: perl