diff --git a/0001-Interpolate-properties-also-in-the-current-artifact.patch b/0001-Interpolate-properties-also-in-the-current-artifact.patch new file mode 100644 index 0000000..c4cfe8b --- /dev/null +++ b/0001-Interpolate-properties-also-in-the-current-artifact.patch @@ -0,0 +1,62 @@ +From d458bce49270bccfa40e9c4e288b3c9550aff741 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fridrich=20=C5=A0trba?= +Date: Wed, 4 Oct 2023 04:07:58 +0200 +Subject: [PATCH] Interpolate properties also in the current artifact + +--- + java-utils/install_pom.py | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) + +diff --git a/java-utils/install_pom.py b/java-utils/install_pom.py +index e0282773..5f9fd741 100644 +--- a/java-utils/install_pom.py ++++ b/java-utils/install_pom.py +@@ -31,6 +31,7 @@ + # Authors: Michal Srb + + from javapackages.maven.pom import POM, PomLoadingException ++from javapackages.maven.artifact import Artifact + + from javapackages.xmvn.xmvn_resolve import (XMvnResolve, ResolutionRequest, + XMvnResolveException) +@@ -164,7 +165,7 @@ def gather_dependencies(pom_path): + # only deps with scope "compile" or "runtime" are interesting + deps = [x for x in deps if x.scope in ["", "compile", "runtime"]] + +- return deps ++ return deps, props + + + def _get_dependencies(pom): +@@ -215,21 +216,23 @@ def _main(): + if uart.packaging and uart.packaging.lower() == 'pom': + tree = ElementTree.parse(args[0]) + else: ++ mvn_deps, props = gather_dependencies(pom_path) ++ mvn_art = Artifact.from_mvn_str(str(uart)) ++ mvn_art.interpolate(props) + result_pom = "\n" + result_pom += "\n" + result_pom += " 4.0.0\n" +- result_pom += (" {0}\n" ).format(uart.groupId) +- result_pom += (" {0}\n" ).format(uart.artifactId) +- result_pom += (" {0}\n").format(uart.version) ++ result_pom += (" {0}\n" ).format(mvn_art.groupId) ++ result_pom += (" {0}\n" ).format(mvn_art.artifactId) ++ result_pom += (" {0}\n").format(mvn_art.version) + + if hasattr(uart, "packaging") and uart.packaging != 'jar': + result_pom += (" {0}\n").format(uart.packaging) + if hasattr(uart, "extension") and uart.extension != 'jar': + result_pom += (" {0}\n").format(uart.extension) +- if hasattr(uart, "classifier") and uart.classifiler != '': ++ if hasattr(uart, "classifier") and uart.classifier != '': + result_pom += (" {0}\n").format(uart.classifier) + +- mvn_deps = gather_dependencies(pom_path) + if mvn_deps: + result_pom += " \n" + for d in mvn_deps: +-- +2.42.0 + diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 5a71b47..e13c857 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -53,6 +53,7 @@ Patch4: 0002-Do-not-bomb-on-relativePath-construct.patch Patch5: 0003-Reproducible-exclusions-order-in-maven-metadata.patch #PATCH-FIX-UPSTREAM: make the aliases and dependencies lists so that the order is kept Patch6: 0004-Reproducible-builds-keep-order-of-aliases-and-depend.patch +Patch7: 0001-Interpolate-properties-also-in-the-current-artifact.patch BuildRequires: asciidoc BuildRequires: fdupes BuildRequires: perl