Can override common version per descriptor

[cc0/argeo-build.git] / src / org / argeo / build / Repackage.java

diff --git a/src/org/argeo/build/Repackage.java b/src/org/argeo/build/Repackage.java
index 6cfd3d48aedc0ce469b21b1c9f1e85dca2943b98..0848c603875b45ba2eb8725008ee57f84f634e64 100644 (file)
--- 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();