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=128

Browse Source
This commit is contained in:
Fridrich Strba 2023-09-11 16:46:53 +00:00 committed by Git OBS Bridge
parent 54f43c0377
commit ccc8f25d37
3 changed files with 34 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
0003-Reproducible-exclusions-order-in-maven-metadata.patch Normal file
View File

@ -0,0 +1,25 @@
From 790780dfcce03b998ba20f9ef19a8a1222a71295 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 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/python/javapackages/maven/dependency.py b/python/javapackages/maven/dependency.py
index 8b92327c..189a9ff7 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)
--
2.42.0

7
javapackages-tools.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Sep 11 16:45:42 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Added patch:
* 0003-Reproducible-exclusions-order-in-maven-metadata.patch
+ sort exclusions when writing maven metadata
-------------------------------------------------------------------
Tue Sep 5 11:40:09 UTC 2023 - Fridrich Strba <fstrba@suse.com>

2
javapackages-tools.spec
View File

@ -49,6 +49,8 @@ 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