From ccc8f25d37a24ea1a392fe01543af5dc66258d7511a96e3be4879e89c33a942c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 11 Sep 2023 16:46:53 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/javapackages-tools?expand=0&rev=128 --- ...e-exclusions-order-in-maven-metadata.patch | 25 +++++++++++++++++++ javapackages-tools.changes | 7 ++++++ javapackages-tools.spec | 2 ++ 3 files changed, 34 insertions(+) create mode 100644 0003-Reproducible-exclusions-order-in-maven-metadata.patch diff --git a/0003-Reproducible-exclusions-order-in-maven-metadata.patch b/0003-Reproducible-exclusions-order-in-maven-metadata.patch new file mode 100644 index 0000000..61d8c8c --- /dev/null +++ b/0003-Reproducible-exclusions-order-in-maven-metadata.patch @@ -0,0 +1,25 @@ +From 790780dfcce03b998ba20f9ef19a8a1222a71295 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= +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 + diff --git a/javapackages-tools.changes b/javapackages-tools.changes index a8a7f86..fd774a3 100644 --- a/javapackages-tools.changes +++ b/javapackages-tools.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Sep 11 16:45:42 UTC 2023 - Fridrich Strba + +- 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 diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 6fa92f2..15175c9 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -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 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