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

0003-Reproducible-exclusions-order-in-maven-metadata.patch

@@ -1,14 +1,15 @@
-From 790780dfcce03b998ba20f9ef19a8a1222a71295 Mon Sep 17 00:00:00 2001
+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 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ python/javapackages/maven/dependency.py    | 6 +++---
+ python/javapackages/metadata/dependency.py | 4 ++--
+ 2 files changed, 5 insertions(+), 5 deletions(-)
 
 diff --git a/python/javapackages/maven/dependency.py b/python/javapackages/maven/dependency.py
-index 8b92327c..189a9ff7 100644
+index 8b92327c..534a631e 100644
 --- a/python/javapackages/maven/dependency.py
 +++ b/python/javapackages/maven/dependency.py
 @@ -100,7 +100,7 @@ class Dependency(AbstractArtifact):
@@ -20,6 +21,43 @@ index 8b92327c..189a9ff7 100644
                  exc_root.insert(len(exc_root), exc.get_xml_element())
              xml_root.insert(len(root), exc_root)
  
+@@ -127,7 +127,7 @@ class Dependency(AbstractArtifact):
+         excnodes = xmlnode.findall("{*}exclusions/{*}exclusion")
+ 
+         exclusions = []
+-        for exc in [Exclusion.from_xml_element(x) for x in excnodes]:
++        for exc in [Exclusion.from_xml_element(x) for x in sorted(excnodes)]:
+             exclusions.append(exc)
+ 
+         return cls(parts["groupId"],
+@@ -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
++++ 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,
+@@ -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