svn commit: r398778 - in /maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase: AbstractRewritePomsPhase.java MapVersionsPhase.java

[br...@apache.org]

Author: brett
Date: Mon May  1 19:17:44 2006
New Revision: 398778

URL: http://svn.apache.org/viewcvs?rev=398778&view=rev
Log:
[MRELEASE-98] remove unneeded todo items

Modified:
    maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java
    maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/MapVersionsPhase.java

Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java?rev=398778&r1=398777&r2=398778&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/AbstractRewritePomsPhase.java Mon May  1 19:17:44 2006
@@ -183,7 +183,7 @@
 
         String projectId = ArtifactUtils.versionlessKey( project.getGroupId(), project.getArtifactId() );
 
-        rewriteVersion( rootElement, namespace, mappedVersions, originalVersions, projectId, project, parentVersion );
+        rewriteVersion( rootElement, namespace, mappedVersions, projectId, project, parentVersion );
 
         rewriteDependencies( project.getDependencies(), rootElement, mappedVersions, originalVersions );
 
@@ -228,11 +228,10 @@
         transformScm( project, rootElement, namespace, releaseConfiguration, projectId, scmRepository );
     }
 
-    private void rewriteVersion( Element rootElement, Namespace namespace, Map mappedVersions, Map originalVersions,
-                                 String projectId, MavenProject project, String parentVersion )
+    private void rewriteVersion( Element rootElement, Namespace namespace, Map mappedVersions, String projectId,
+                                 MavenProject project, String parentVersion )
         throws ReleaseExecutionException
     {
-        // TODO: what about if version is inherited? shouldn't prompt...
         Element versionElement = rootElement.getChild( "version", namespace );
         String version = (String) mappedVersions.get( projectId );
         if ( version == null )

Modified: maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/MapVersionsPhase.java
URL: http://svn.apache.org/viewcvs/maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/MapVersionsPhase.java?rev=398778&r1=398777&r2=398778&view=diff
==============================================================================
--- maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/MapVersionsPhase.java (original)
+++ maven/plugins/trunk/maven-release-plugin/src/main/java/org/apache/maven/plugins/release/phase/MapVersionsPhase.java Mon May  1 19:17:44 2006
@@ -65,7 +65,6 @@
             VersionInfo version = null;
             try
             {
-                // TODO [!]: make sure to test inherited version
                 version = new DefaultVersionInfo( project.getVersion() );
             }
             catch ( VersionParseException e )