Make output less verbose

[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..1ea7d536531ea298a0783463f471a4cd0ac4ac09 100644 (file)
--- a/src/org/argeo/build/Repackage.java
+++ b/src/org/argeo/build/Repackage.java
@@ -15,6 +15,7 @@ import static org.argeo.build.Repackage.ManifestHeader.ARGEO_ORIGIN_M2_MERGE;
 import static org.argeo.build.Repackage.ManifestHeader.ARGEO_ORIGIN_M2_REPO;
 import static org.argeo.build.Repackage.ManifestHeader.ARGEO_ORIGIN_NO_METADATA_GENERATION;
 import static org.argeo.build.Repackage.ManifestHeader.ARGEO_ORIGIN_URI;
+import static org.argeo.build.Repackage.ManifestHeader.AUTOMATIC_MODULE_NAME;
 import static org.argeo.build.Repackage.ManifestHeader.BUNDLE_LICENSE;
 import static org.argeo.build.Repackage.ManifestHeader.BUNDLE_SYMBOLICNAME;
 import static org.argeo.build.Repackage.ManifestHeader.BUNDLE_VERSION;
@@ -404,7 +405,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();
@@ -1114,6 +1120,9 @@ public class Repackage {
                        if (wasDifferent && !keepPrevious) {
                                if (IMPORT_PACKAGE.toString().equals(key) || EXPORT_PACKAGE.toString().equals(key))
                                        logger.log(TRACE, () -> file.getFileName() + ": " + key + " was modified");
+                               else if (BUNDLE_SYMBOLICNAME.toString().equals(key) || AUTOMATIC_MODULE_NAME.toString().equals(key))
+                                       logger.log(DEBUG,
+                                                       file.getFileName() + ": " + key + " was " + previousValue + ", overridden with " + value);
                                else
                                        logger.log(WARNING,
                                                        file.getFileName() + ": " + key + " was " + previousValue + ", overridden with " + value);