commit e917a76d8b3742f80556519399a468e5066b748e
author Daniele Moro <daniele@opennetworking.org> Tue Dec 03 11:50:31 2019 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Thu Dec 05 18:51:21 2019 +0000
tree 9684e15ad0b1e62ed537f8b91e78516d55d071e4
parent 35fd94cfaf4071514ec15215daaba04512fb427f

Fixed bug in generating configuration properties

Now the comment for OSGi component property can span multiple lines.

Change-Id: Ieb8985726e694d9ca8422bf437e3527a43f96c64

tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosCfgMojo.java

diff --git a/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosCfgMojo.java b/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosCfgMojo.java
index 0077ac9..60d5f63 100644
--- a/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosCfgMojo.java
+++ b/tools/package/maven-plugin/src/main/java/org/onosproject/maven/OnosCfgMojo.java
@@ -156,7 +156,8 @@
                 String desc = description(javaClass, name);
 
                 if (desc != null) {
-                    String line = name + SEP + type + SEP + def + SEP + desc;
+                    String cleanedDesc = desc.trim().replace("\n", " ").replace("  ", " ");
+                    String line = name + SEP + type + SEP + def + SEP + cleanedDesc;
                     getLog().info("Processing property " + line + " ...");
                     lines.add(line + "\n");
                 }