From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 22 Mar 2023 08:32:09 +0000 (+0100)
Subject: Can override common version per descriptor
X-Git-Tag: v2.3.5~24
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=b79ddea755458e61e8f6841826f434d3b219dcd5;p=cc0%2Fargeo-build.git

Can override common version per descriptor
---

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 6cfd3d4..0848c60 100644
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -404,7 +404,12 @@ public class Repackage {
 				}
 				String m2Coordinates = fileProps.getProperty(ARGEO_ORIGIN_M2.toString());
 				M2Artifact artifact = new M2Artifact(m2Coordinates);
-				artifact.setVersion(m2Version);
+				if (artifact.getVersion() == null) {
+					artifact.setVersion(m2Version);
+				} else {
+					logger.log(WARNING, p.getFileName() + " : Using version " + artifact.getVersion()
+							+ " specified in descriptor rather than " + m2Version + " specified in " + COMMON_BND);
+				}
 
 				// prepare manifest entries
 				Properties mergeProps = new Properties();