pool/javapackages-tools
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1109307 from Java:packages

Browse Source 
Cleanup and use our patches as they are integrated in upstream

OBS-URL: https://build.opensuse.org/request/show/1109307
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/javapackages-tools?expand=0&rev=38
This commit is contained in:
Ana Guerrero 2023-09-10 11:09:22 +00:00 committed by Git OBS Bridge
commit c5e72e40c1
4 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
0001-Make-the-alias-generation-reproducible.patch → 0001-Make-maven_depmap-order-of-aliases-reproducible.patch
View File

@ -1,7 +1,7 @@
From 88ca6f13c707652c9992e9f7f4b86c5bdc198d03 Mon Sep 17 00:00:00 2001
From 5cc434bdeffbee25158ae2bdcda08f4b07610f7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Sun, 3 Sep 2023 01:03:26 +0200
Subject: [PATCH] Make the alias generation reproducible
Date: Mon, 4 Sep 2023 16:14:43 +0200
Subject: [PATCH 1/2] Make maven_depmap order of aliases reproducible
---
java-utils/maven_depmap.py | 2 +-
@ -21,5 +21,5 @@ index 6a0520fa..4bfb877d 100644
alias.extension = artifact.extension
result.append(alias)
--
2.41.0
2.42.0

25
0002-Do-not-bomb-on-relativePath-construct.patch Normal file
View File

@ -0,0 +1,25 @@
From d124f4d16883d74cdf8ab9064667e128a3695230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
Date: Mon, 4 Sep 2023 22:44:10 +0200
Subject: [PATCH 2/2] Do not bomb on <relativePath/> construct
---
java-utils/mvn_artifact.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
index a45946cd..b7520528 100644
--- a/java-utils/mvn_artifact.py
+++ b/java-utils/mvn_artifact.py
@@ -167,7 +167,7 @@ def gather_dependencies(pom_path):
parent = pom.parent
while parent:
ppom = None
- if parent.relativePath:
+ if hasattr(parent, 'relativePath') and parent.relativePath:
try:
ppom_path = os.path.join(os.path.dirname(curr_pom._path),
parent.relativePath)
--
2.42.0

12
javapackages-tools.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Tue Sep 5 11:40:09 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Modified patch:
* 0001-Make-the-alias-generation-reproducible.patch ->
0001-Make-maven_depmap-order-of-aliases-reproducible.patch
+ replace by the version of patch integrated by upstream
- Added patch:
* 0002-Do-not-bomb-on-relativePath-construct.patch
+ integrated patch fixing parent recursion with empty
<relativePath/> element
-------------------------------------------------------------------
Sat Sep 2 23:07:32 UTC 2023 - Fridrich Strba <fstrba@suse.com>

6
javapackages-tools.spec
View File

@ -45,8 +45,10 @@ Patch1: python-optional.patch
#PATCH-FIX-SUSE: SUSE did not bump epoch of openjdk packages, whereas Fedora did
# Avoid generating unresolvable requires
Patch2: suse-no-epoch.patch
#PATCH-FIX-SUSE: Let maven_depmap.py generate reproducible list of aliases
Patch3: 0001-Make-the-alias-generation-reproducible.patch
#PATCH-FIX-UPSTREAM: Make maven_depmap order of aliases reproducible
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
BuildRequires: asciidoc
BuildRequires: fdupes
BuildRequires: perl