Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update javapackages-tools to version 6.2.0 / rev 39 via SR 1110919
https://build.opensuse.org/request/show/1110919 by user fstrba + anag+factory More reproducible
- Loading branch information
1 parent
bb5e887
commit be5423c
Showing
6 changed files
with
107 additions
and
0 deletions.
There are no files selected for viewing
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
52 changes: 52 additions & 0 deletions
52
packages/j/javapackages-tools/0003-Reproducible-exclusions-order-in-maven-metadata.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| From 66ba33a8c28497e01eddcb0cd17fbe324674eabc 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/metadata/dependency.py | 4 ++-- | ||
| python/javapackages/metadata/exclusion.py | 9 +++++++++ | ||
| 2 files changed, 11 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/python/javapackages/metadata/dependency.py b/python/javapackages/metadata/dependency.py | ||
| index 1709e1fb..5931134d 100644 | ||
| --- a/python/javapackages/metadata/dependency.py | ||
| +++ b/python/javapackages/metadata/dependency.py | ||
| @@ -46,7 +46,7 @@ class MetadataDependency(ObjectBinding): | ||
| defaults = {'extension': 'jar', | ||
| 'requestedVersion': 'SYSTEM'} | ||
| types = {'optional': str, # todo bool | ||
| - 'exclusions': set([MetadataExclusion])} | ||
| + 'exclusions': list([MetadataExclusion])} | ||
|
|
||
| def is_optional(self): | ||
| if self.optional and self.optional.lower() == "true": | ||
| @@ -145,4 +145,4 @@ class MetadataDependency(ObjectBinding): | ||
| classifier=mvn_dep.classifier, | ||
| optional=mvn_dep.optional, | ||
| requestedVersion=mvn_dep.version, | ||
| - exclusions=exclusions) | ||
| + exclusions=sorted(exclusions)) | ||
| diff --git a/python/javapackages/metadata/exclusion.py b/python/javapackages/metadata/exclusion.py | ||
| index 3152b090..5b9503c0 100644 | ||
| --- a/python/javapackages/metadata/exclusion.py | ||
| +++ b/python/javapackages/metadata/exclusion.py | ||
| @@ -41,6 +41,15 @@ class MetadataExclusion(ObjectBinding): | ||
| element_name = 'exclusion' | ||
| fields = ['groupId', 'artifactId'] | ||
|
|
||
| + def __lt__(self, other): | ||
| + if self.groupId < other.groupId: | ||
| + return True | ||
| + if self.groupId > other.groupId: | ||
| + return False | ||
| + if self.artifactId < other.artifactId: | ||
| + return True | ||
| + return False | ||
| + | ||
| def get_mvn_str(self): | ||
| return Printer.get_mvn_str(self.groupId, self.artifactId) | ||
|
|
||
| -- | ||
| 2.42.0 | ||
|
|
28 changes: 28 additions & 0 deletions
28
...ages/j/javapackages-tools/0004-Reproducible-builds-keep-order-of-aliases-and-depend.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From f211da6e4cf216a020b47ccab9b2c7806c5a8a62 Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch> | ||
| Date: Wed, 13 Sep 2023 15:47:54 +0200 | ||
| Subject: [PATCH 4/4] Reproducible builds: keep order of aliases and | ||
| dependencies | ||
|
|
||
| --- | ||
| python/javapackages/metadata/artifact.py | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/python/javapackages/metadata/artifact.py b/python/javapackages/metadata/artifact.py | ||
| index 72e57e62..f5cbf3be 100644 | ||
| --- a/python/javapackages/metadata/artifact.py | ||
| +++ b/python/javapackages/metadata/artifact.py | ||
| @@ -52,8 +52,8 @@ class MetadataArtifact(ObjectBinding): | ||
| 'compatVersions', 'dependencies'] | ||
| defaults = {'extension': 'jar'} | ||
| types = {'compatVersions': set(['version']), | ||
| - 'aliases': set([MetadataAlias]), | ||
| - 'dependencies': set([MetadataDependency]), | ||
| + 'aliases': list([MetadataAlias]), | ||
| + 'dependencies': list([MetadataDependency]), | ||
| 'properties': dict} | ||
|
|
||
| def __init__(self, *args, **kwargs): | ||
| -- | ||
| 2.42.0 | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters