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

Browse Source
This commit is contained in:
Fridrich Strba 2023-09-12 04:15:23 +00:00 committed by Git OBS Bridge
parent 0639a1dbf4
commit f5c20004b2
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,8 @@ Date: Mon, 11 Sep 2023 18:43:28 +0200
Subject: [PATCH 3/3] Reproducible exclusions order in maven metadata
---
python/javapackages/maven/dependency.py | 4 ++--
python/javapackages/metadata/dependency.py | 4 ++--
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
@ -21,15 +21,6 @@ index 8b92327c..534a631e 100644
exc_root.insert(len(exc_root), exc.get_xml_element())
xml_root.insert(len(root), exc_root)
@@ -137,7 +137,7 @@ class Dependency(AbstractArtifact):
version=parts["version"],
scope=parts["scope"],
optional=parts["optional"],
- exclusions=exclusions)
+ exclusions=sorted(exclusions))
@classmethod
def from_mvn_str(cls, mvnstr):
diff --git a/python/javapackages/metadata/dependency.py b/python/javapackages/metadata/dependency.py
index 1709e1fb..d5082215 100644
--- a/python/javapackages/metadata/dependency.py
@ -43,12 +34,6 @@ index 1709e1fb..d5082215 100644
exclusions.add(MetadataExclusion.from_mvn_exclusion(e))
return cls(mvn_dep.groupId, mvn_dep.artifactId,
@@ -145,4 +145,4 @@ class MetadataDependency(ObjectBinding):
classifier=mvn_dep.classifier,
optional=mvn_dep.optional,
requestedVersion=mvn_dep.version,
- exclusions=exclusions)
+ exclusions=sorted(exclusions))
--
2.42.0