diff --git a/maven-release-manager/src/main/mdo/release-descriptor.mdo b/maven-release-manager/src/main/mdo/release-descriptor.mdo
index 7a8686820..723870055 100644
--- a/maven-release-manager/src/main/mdo/release-descriptor.mdo
+++ b/maven-release-manager/src/main/mdo/release-descriptor.mdo
@@ -503,7 +503,7 @@
           <type>boolean</type>
           <defaultValue>false</defaultValue>
           <description>
-            NOTE : currently only implemented with svn scm. Enable a workaround to prevent issue due to svn client > 1.5.0
+            NOTE : currently only implemented with svn scm. Enable a workaround to prevent issue due to svn client &amp;gt; 1.5.0
             (http://jira.codehaus.org/browse/SCM-406)
           </description>
         </field>
@@ -669,8 +669,8 @@
     /**
      * Method addReleaseVersion.
      * 
-     * @param key
-     * @param value
+     * @param projectId
+     * @param version
      */
     public void addReleaseVersion( String projectId, String version )
     {
@@ -689,8 +689,8 @@
     /**
      * Method addDevelopmentVersion.
      * 
-     * @param key
-     * @param value
+     * @param projectId
+     * @param version
      */
     public void addDevelopmentVersion( String projectId, String version )
     {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchEquals.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchEquals.java
index 79840d4b5..31404a85f 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchEquals.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchEquals.java
@@ -23,7 +23,7 @@
 import org.mockito.ArgumentMatcher;
 
 /**
- * JMock constraint to compare tags since it has no equals method.
+ * Mockito constraint to compare tags since it has no equals method.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
  */
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchParametersEquals.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchParametersEquals.java
index 88c049762..e6aea940f 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchParametersEquals.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmBranchParametersEquals.java
@@ -24,6 +24,8 @@
 import org.mockito.ArgumentMatcher;
 
 /**
+ * Mockito constraint to compare tags since it has no equals method.
+ * 
  * @author <a href="mailto:olamy@apache.org">olamy</a>
  */
 public class IsScmBranchParametersEquals implements ArgumentMatcher<ScmBranchParameters>
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
index 51f32a02b..6f0a6b35f 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmFileSetEquals.java
@@ -25,10 +25,9 @@
 import org.mockito.ArgumentMatcher;
 
 /**
- * JMock constraint to compare file sets since it has no equals method.
+ * Mockito constraint to compare file sets since it has no equals method.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @todo add an equals() method
  */
 public class IsScmFileSetEquals implements ArgumentMatcher<ScmFileSet>
 {
@@ -55,4 +54,6 @@ public boolean matches( ScmFileSet argument )
             throw new RuntimeException(e.getMessage(), e);
         }
     }
+    
+    
 }
\ No newline at end of file
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java
index c55924787..6affb41f8 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagEquals.java
@@ -23,10 +23,9 @@
 import org.mockito.ArgumentMatcher;
 
 /**
- * JMock constraint to compare tags since it has no equals method.
+ * Mockito constraint to compare tags since it has no equals method.
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @todo add an equals() method
  */
 public class IsScmTagEquals implements ArgumentMatcher<ScmTag>
 {
diff --git a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java
index 12a2f521e..629f7d63d 100644
--- a/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java
+++ b/maven-release-manager/src/test/java/org/apache/maven/shared/release/phase/IsScmTagParametersEquals.java
@@ -23,6 +23,8 @@
 import org.mockito.ArgumentMatcher;
 
 /**
+ * Mockito constraint to compare tags since it has no equals method.
+ * 
  * @author <a href="mailto:olamy@apache.org">olamy</a>
  */
 public class IsScmTagParametersEquals implements ArgumentMatcher<ScmTagParameters>
diff --git a/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/FlatMultiModuleMavenProjectStub.java b/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/FlatMultiModuleMavenProjectStub.java
index afb33f87b..44ff46869 100644
--- a/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/FlatMultiModuleMavenProjectStub.java
+++ b/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/FlatMultiModuleMavenProjectStub.java
@@ -28,10 +28,10 @@
 import org.apache.maven.model.Scm;
 
 /**
- * Stub for a MavenProject with a flat structure.
- * <p/>
- * TODO: shouldn't need to do this, but the "stub" in the harness just throws away values you set.
- * Just overriding the ones I need for this plugin.
+ * <p>Stub for a MavenProject with a flat structure.</p>
+ * 
+ * <p>TODO: shouldn't need to do this, but the "stub" in the harness just throws away values you set.
+ * Just overriding the ones I need for this plugin.</p>
  *
  * @author <a href="mailto:oching@apache.org">Maria Odea Ching</a>
  */
diff --git a/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/MavenProjectStub.java b/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/MavenProjectStub.java
index 63eefa4d0..8e377b798 100644
--- a/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/MavenProjectStub.java
+++ b/maven-release-plugin/src/test/java/org/apache/maven/plugins/release/stubs/MavenProjectStub.java
@@ -23,13 +23,12 @@
 import org.apache.maven.model.Model;
 
 /**
- * Stub for MavenProject.
- * <p/>
- * TODO: shouldn't need to do this, but the "stub" in the harness just throws away values you set.
- * Just overriding the ones I need for this plugin.
+ * <p>Stub for MavenProject.</p>
+ * 
+ * <p>TODO: shouldn't need to do this, but the "stub" in the harness just throws away values you set.
+ * Just overriding the ones I need for this plugin.</p>
  *
  * @author <a href="mailto:brett@apache.org">Brett Porter</a>
- * @noinspection ClassNameSameAsAncestorName
  */
 public class MavenProjectStub
     extends org.apache.maven.plugin.testing.stubs.MavenProjectStub