Merge pull request #94 from rnc/master

Preserve empty elements
release-engineering · Oct 18, 2013 · bb8a219 · bb8a219
2 parents bcde901 + 191ab5a
commit bb8a219
Showing 1 changed file with 5 additions and 23 deletions.
diff --git a/src/main/java/com/redhat/rcm/version/util/PomUtils.java b/src/main/java/com/redhat/rcm/version/util/PomUtils.java
@@ -19,18 +19,15 @@
 package com.redhat.rcm.version.util;
 
 import static java.io.File.separatorChar;
-import static org.apache.commons.lang.StringUtils.isEmpty;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.Writer;
-import java.util.Enumeration;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Properties;
 import java.util.Set;
 
 import org.apache.maven.mae.project.key.ProjectKey;
@@ -43,31 +40,29 @@
 import org.codehaus.plexus.util.IOUtil;
 import org.codehaus.plexus.util.WriterFactory;
 import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.jdom.Attribute;
 import org.jdom.Comment;
 import org.jdom.Document;
 import org.jdom.Element;
 import org.jdom.JDOMException;
 import org.jdom.Namespace;
+import org.jdom.Text;
 import org.jdom.filter.ContentFilter;
 import org.jdom.input.SAXBuilder;
 import org.jdom.output.Format;
 import org.jdom.output.Format.TextMode;
 import org.jdom.output.XMLOutputter;
 import org.jdom.xpath.XPath;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import com.redhat.rcm.version.VManException;
 import com.redhat.rcm.version.mgr.session.VersionManagerSession;
 
 public final class PomUtils
 {
-
     private static final Logger logger = LoggerFactory.getLogger( PomUtils.class );
 
-    private static final String DUMMY_PROPERTY_VALUE = "NOT_SET";
-
     private PomUtils()
     {
     }
@@ -118,7 +113,8 @@ public static File writeModifiedPom( final Model model, final File pom, final Pr
                                         .setTextMode( TextMode.PRESERVE )
                                         .setLineSeparator( System.getProperty( "line.separator" ) )
                                         .setOmitDeclaration( false )
-                                        .setOmitEncoding( false );
+                                        .setOmitEncoding( false )
+                                        .setExpandEmptyElements( true );
 
             logger.info( "Writing modified POM:\n\n" + new XMLOutputter( format ).outputString( doc ) );
 
@@ -205,20 +201,6 @@ private static void normalizeModel( final Model model )
         {
             bases.addAll( profiles );
         }
-
-        for ( final ModelBase base : bases )
-        {
-            final Properties p = base.getProperties();
-            for ( final Enumeration<?> e = p.keys(); e.hasMoreElements(); )
-            {
-                final String key = (String) e.nextElement();
-                final String value = p.getProperty( key );
-                if ( isEmpty( value ) )
-                {
-                    p.setProperty( key, DUMMY_PROPERTY_VALUE );
-                }
-            }
-        }
     }
 
     /**