svn commit: r544023 - in /maven/shared/trunk/maven-model-converter/src: main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java test/java/org/apache/maven/model/converter/PomV3ToV4TranslatorTest.java

[epunzalan]

Author: epunzalan
Date: Sun Jun  3 17:56:24 2007
New Revision: 544023

URL: http://svn.apache.org/viewvc?view=rev&rev=544023
Log:
[MNG-2100] Convert v3 pom <properties> section

Modified:
    
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java
    
maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/PomV3ToV4TranslatorTest.java

Modified: 
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java?view=diff&rev=544023&r1=544022&r2=544023
==============================================================================
--- 
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java
 (original)
+++ 
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java
 Sun Jun  3 17:56:24 2007
@@ -98,6 +98,8 @@
 
             PomKey pomKey = new PomKey( groupId, artifactId, version );
 
+            Properties properties = v3Model.getProperties();
+
             warnOfUnsupportedMainModelElements( v3Model );
 
             Model model = new Model();
@@ -132,6 +134,8 @@
             model.setScm( translateScm( v3Model ) );
             model.setUrl( v3Model.getUrl() );
 
+            model.setProperties( properties );
+
             model.setVersion( version );
 
             return model;
@@ -194,11 +198,6 @@
         }
 
         Properties v3ModelProperties = v3Model.getProperties();
-
-        if ( v3ModelProperties != null && !v3ModelProperties.isEmpty() )
-        {
-            warnings.add( "Ignoring <properties/> section. It is not supported 
in v4 POMs." );
-        }
 
         if ( StringUtils.isNotEmpty( v3Model.getPackage() ) )
         {

Modified: 
maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/PomV3ToV4TranslatorTest.java
URL: 
http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/PomV3ToV4TranslatorTest.java?view=diff&rev=544023&r1=544022&r2=544023
==============================================================================
--- 
maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/PomV3ToV4TranslatorTest.java
 (original)
+++ 
maven/shared/trunk/maven-model-converter/src/test/java/org/apache/maven/model/converter/PomV3ToV4TranslatorTest.java
 Sun Jun  3 17:56:24 2007
@@ -28,6 +28,7 @@
 import org.codehaus.plexus.PlexusTestCase;
 
 import java.util.Arrays;
+import java.util.Properties;
 
 public class PomV3ToV4TranslatorTest
     extends PlexusTestCase
@@ -52,6 +53,20 @@
 
         v3Model = new org.apache.maven.model.v3_0_0.Model();
         v3Model.setBuild( new org.apache.maven.model.v3_0_0.Build() );
+    }
+
+    public void testShouldConvertPropertiesSection()
+        throws Exception
+    {
+        Properties properties = new Properties();
+        properties.setProperty( "Name", "Value" );
+
+        v3Model.setProperties( properties );
+
+        Model result = translator.translate( v3Model );
+
+        assertNotNull( result.getProperties() );
+        assertEquals( "check properties if converted properly", properties, 
result.getProperties() );
     }
 
     public void testConvertedEmptyResourceDirectory()