You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2016/05/07 08:24:17 UTC

svn commit: r1742690 - in /maven/release/trunk/maven-release-manager/src: main/java/org/apache/maven/shared/release/phase/ main/java/org/apache/maven/shared/release/transform/jdom/ test/java/org/apache/maven/shared/release/transform/jdom/

Author: rfscholte
Date: Sat May  7 08:24:17 2016
New Revision: 1742690

URL: http://svn.apache.org/viewvc?rev=1742690&view=rev
Log:
[MRELEASE-952] Replace JDom as XML transformer
Support JDomModel.setVersion(), which also contains logic to ignore the version if value is the same as the parentVersion


Modified:
    maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
    maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java
    maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomModelTest.java

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java?rev=1742690&r1=1742689&r2=1742690&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/phase/AbstractRewritePomsPhase.java Sat May  7 08:24:17 2016
@@ -67,7 +67,6 @@ 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.filter.ElementFilter;
 import org.jdom.input.SAXBuilder;
@@ -324,7 +323,7 @@ public abstract class AbstractRewritePom
 
         String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
 
-        rewriteVersion( rootElement, namespace, mappedVersions, projectId, project, parentVersion );
+        rewriteVersion( new JDomModel( rootElement ), mappedVersions, projectId, project, parentVersion );
 
         List<Element> roots = new ArrayList<Element>();
         roots.add( rootElement );
@@ -394,35 +393,17 @@ public abstract class AbstractRewritePom
     }
 
 
-    private void rewriteVersion( Element rootElement, Namespace namespace, Map<String, String> mappedVersions,
-                                 String projectId, MavenProject project, String parentVersion )
+    private void rewriteVersion( Model modelTarget, Map<String, String> mappedVersions, String projectId,
+                                 MavenProject project, String parentVersion )
         throws ReleaseFailureException
     {
-        Element versionElement = rootElement.getChild( "version", namespace );
         String version = mappedVersions.get( projectId );
         if ( version == null )
         {
             throw new ReleaseFailureException( "Version for '" + project.getName() + "' was not mapped" );
         }
 
-        if ( versionElement == null )
-        {
-            if ( !version.equals( parentVersion ) )
-            {
-                // we will add this after artifactId, since it was missing but different from the inherited version
-                Element artifactIdElement = rootElement.getChild( "artifactId", namespace );
-                int index = rootElement.indexOf( artifactIdElement );
-
-                versionElement = new Element( "version", namespace );
-                versionElement.setText( version );
-                rootElement.addContent( index + 1, new Text( "\n  " ) );
-                rootElement.addContent( index + 2, versionElement );
-            }
-        }
-        else
-        {
-            JDomUtils.rewriteValue( versionElement, version );
-        }
+        modelTarget.setVersion( version );
     }
 
     private String rewriteParent( MavenProject project, Model targetModel, Map<String, String> mappedVersions,

Modified: maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java?rev=1742690&r1=1742689&r2=1742690&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java (original)
+++ maven/release/trunk/maven-release-manager/src/main/java/org/apache/maven/shared/release/transform/jdom/JDomModel.java Sat May  7 08:24:17 2016
@@ -24,6 +24,7 @@ import org.apache.maven.model.Parent;
 import org.apache.maven.model.Scm;
 import org.jdom.Document;
 import org.jdom.Element;
+import org.jdom.Text;
 
 /**
  * JDom implementation of poms PROJECT element
@@ -48,7 +49,7 @@ public class JDomModel extends Model
     @Override
     public Parent getParent()
     {
-        Element elm = project.getChild( "parent", project.getNamespace() );
+        Element elm = getParentElement();
         if ( elm == null )
         {
             return null;
@@ -59,6 +60,11 @@ public class JDomModel extends Model
             return new JDomParent( elm );
         }
     }
+
+    private Element getParentElement()
+    {
+        return project.getChild( "parent", project.getNamespace() );
+    }
     
     @Override
     public void setScm( Scm scm )
@@ -96,4 +102,41 @@ public class JDomModel extends Model
             return new JDomScm( elm );
         }
     }
+    
+    @Override
+    public void setVersion( String version )
+    {
+        Element versionElement = project.getChild( "version", project.getNamespace() );
+        
+        String parentVersion;
+        Element parent = getParentElement();
+        if ( parent != null )
+        {
+            parentVersion = parent.getChildTextTrim( "version", project.getNamespace() );
+        }
+        else
+        {
+            parentVersion = null;
+        }
+        
+        if ( versionElement == null )
+        {
+            if ( !version.equals( parentVersion ) )
+            {
+                // we will add this after artifactId, since it was missing but different from the inherited version
+                Element artifactIdElement = project.getChild( "artifactId", project.getNamespace() );
+                int index = project.indexOf( artifactIdElement );
+
+                versionElement = new Element( "version", project.getNamespace() );
+                versionElement.setText( version );
+                project.addContent( index + 1, new Text( "\n  " ) );
+                project.addContent( index + 2, versionElement );
+            }
+        }
+        else
+        {
+            JDomUtils.rewriteValue( versionElement, version );
+        }
+
+    }
 }

Modified: maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomModelTest.java
URL: http://svn.apache.org/viewvc/maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomModelTest.java?rev=1742690&r1=1742689&r2=1742690&view=diff
==============================================================================
--- maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomModelTest.java (original)
+++ maven/release/trunk/maven-release-manager/src/test/java/org/apache/maven/shared/release/transform/jdom/JDomModelTest.java Sat May  7 08:24:17 2016
@@ -18,14 +18,18 @@ package org.apache.maven.shared.release.
  * specific language governing permissions and limitations
  * under the License.
  */
+
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 
 import java.io.StringReader;
 
 import org.apache.maven.model.Model;
+import org.apache.maven.model.Parent;
 import org.apache.maven.model.Scm;
 import org.jdom.Document;
+import org.jdom.Element;
 import org.jdom.input.SAXBuilder;
 import org.junit.Test;
 
@@ -56,5 +60,40 @@ public class JDomModelTest
         assertNull( model.getScm() );
     }
     
+    @Test
+    public void testSetVersion() throws Exception
+    {
+        String content = "<project></project>";
+        Element projectElm = builder.build( new StringReader( content ) ).getRootElement();
+        Model model = new JDomModel( projectElm );
+        assertNull( model.getVersion() );
+
+        model.setVersion( "VERSION" );
+        assertEquals( "VERSION", getVersion( projectElm ) );
+        
+        model.setVersion( null );
+        assertNull( model.getVersion() );
+        
+        // inherit from parent
+        // this business logic might need to moved.
+        content = "<project><parent><version>PARENT_VERSION</version></parent></project>";
+        projectElm = builder.build( new StringReader( content ) ).getRootElement();
+        model = new JDomModel( projectElm );
+        assertNull( model.getVersion() );
+
+        model.setVersion( "PARENT_VERSION" );
+        assertNull( getVersion( projectElm ) );
+
+        model.setVersion( "VERSION" );
+        assertEquals( "VERSION", getVersion( projectElm ) );
+        
+        model.setVersion( null );
+        assertNull( model.getVersion() );
+    }
+    
+    private String getVersion( Element projectElm )
+    {
+        return projectElm.getChildText( "version", projectElm.getNamespace() );
+    }
 
 }