63 lines
2.7 KiB
Diff
63 lines
2.7 KiB
Diff
From d458bce49270bccfa40e9c4e288b3c9550aff741 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
|
Date: Wed, 4 Oct 2023 04:07:58 +0200
|
|
Subject: [PATCH 5/5] 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 <msrb@redhat.com>
|
|
|
|
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 = "<?xml version='1.0' encoding='UTF-8'?>\n"
|
|
result_pom += "<project xmlns=\"http://maven.apache.org/POM/4.0.0\">\n"
|
|
result_pom += " <modelVersion>4.0.0</modelVersion>\n"
|
|
- result_pom += (" <groupId>{0}</groupId>\n" ).format(uart.groupId)
|
|
- result_pom += (" <artifactId>{0}</artifactId>\n" ).format(uart.artifactId)
|
|
- result_pom += (" <version>{0}</version>\n").format(uart.version)
|
|
+ result_pom += (" <groupId>{0}</groupId>\n" ).format(mvn_art.groupId)
|
|
+ result_pom += (" <artifactId>{0}</artifactId>\n" ).format(mvn_art.artifactId)
|
|
+ result_pom += (" <version>{0}</version>\n").format(mvn_art.version)
|
|
|
|
if hasattr(uart, "packaging") and uart.packaging != 'jar':
|
|
result_pom += (" <packaging>{0}</packaging>\n").format(uart.packaging)
|
|
if hasattr(uart, "extension") and uart.extension != 'jar':
|
|
result_pom += (" <extension>{0}</extension>\n").format(uart.extension)
|
|
- if hasattr(uart, "classifier") and uart.classifiler != '':
|
|
+ if hasattr(uart, "classifier") and uart.classifier != '':
|
|
result_pom += (" <classifier>{0}</classifier>\n").format(uart.classifier)
|
|
|
|
- mvn_deps = gather_dependencies(pom_path)
|
|
if mvn_deps:
|
|
result_pom += " <dependencies>\n"
|
|
for d in mvn_deps:
|
|
--
|
|
2.42.0
|
|
|