diff --git a/maven.xml b/maven.xml
index c864121ad..6d0a8dd4e 100644
--- a/maven.xml
+++ b/maven.xml
@@ -109,98 +109,6 @@
         tofile="${jardir__}/${testfwkName}.jar" />
   </postGoal>
 
-  <!-- ============== JAVADOC PREVIOUS VERSIONS ================== -->
-  <postGoal name="javadoc:generate">
-<!-- This is a postGoal because we need data from the javadoc plugin which I can't get another way -->
-<!--    description="Retrieves a tagged version of the source and generates the javadoc"-->
-
-    <j:if test="${context.getVariable('collections.javadoc.tag') == null}">
-      <ant:echo message="The collections.javadoc.tag property must be set for javadoc:tag" />
-    </j:if>
-    <j:if test="${context.getVariable('collections.javadoc.tag') != null}">
-      <ant:echo message="Generate javadoc for ${collections.javadoc.tag}" />
-      <!-- not in javadoc plugin, so have to setup properties -->
-      <j:set var="maven.javadoc.destdir" value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.destdir')}" />
-      <j:set var="maven.javadoc.stylesheet" value="${pom.getPluginContext('maven-javadoc-plugin').getVariable('maven.javadoc.stylesheet')}" />
-      
-      <j:set var="collections.javadoc.tag.destdir" value="${maven.javadoc.destdir}-${collections.javadoc.tag}"/>
-      <j:set var="collections.javadoc.tag.stylesheet" value="${maven.javadoc.stylesheet}"/>
-      
-      <j:set var="taggedBaseDir" value="${maven.build.dir}/javadoc/${collections.javadoc.tag}" />
-      <ant:mkdir dir="${taggedBaseDir}" />
-      <maven:makeRelativePath var="relativeSrcDir" basedir="${basedir}" path="${pom.build.sourceDirectory}" />
-      <util:replace var="relativeSrcDir" oldChar="\" newChar="/" value="${relativeSrcDir}" />
-      <j:set var="taggedSourceDir" value="${taggedBaseDir}/${pom.repository.cvsModule}/${relativeSrcDir}"/>
-      <ant:cvs
-          cvsRoot="${pom.repository.cvsRoot}"
-          package="${pom.repository.cvsModule}/${relativeSrcDir}"
-          dest="${taggedBaseDir}"
-          tag="${collections.javadoc.tag}" />    
-          
-      <ant:mkdir dir="${collections.javadoc.tag.destdir}" />
-      <ant:tstamp>
-         <ant:format property="currentYear" pattern="yyyy"/>
-      </ant:tstamp>
-      <ant:tstamp>
-        <j:choose>
-          <j:when test="${pom.inceptionYear.equals(currentYear)}">
-            <ant:format property="year" pattern="yyyy"/>
-          </j:when>
-          <j:otherwise>
-            <ant:format property="year" pattern="${pom.inceptionYear}-yyyy"/>
-          </j:otherwise>
-        </j:choose>
-      </ant:tstamp>
-      <j:set var="copyright" value="Copyright &amp;copy; ${year} ${pom.organization.name}. All Rights Reserved." />
-        
-      <ant:javadoc
-        packagenames="${pom.package}.*"
-        destdir="${collections.javadoc.tag.destdir}"
-        sourcepath="${taggedSourceDir}"
-        access="${collections.javadoc.tag.access}"
-        author="true"
-        version="true"
-        use="true"
-        windowtitle="${collections.javadoc.tag.windowtitle}"
-        doctitle="${collections.javadoc.tag.windowtitle}"
-        bottom="${copyright}"
-        stylesheetfile="${maven.javadoc.stylesheet}">
-        
-        <j:if test="${context.getVariable('collections.javadoc.tag.overview') != null}">
-          <ant:setProperty name="overview" value="${collections.javadoc.tag.overview}" />
-        </j:if>
-
-      </ant:javadoc>
-    </j:if>
-  </postGoal>
-
-  <postGoal name="site:run-reports"><!-- OLD MAVEN -->
-    <j:set var="collections.javadoc.tag" value="COLLECTIONS_2_1_1" />
-    <j:set var="collections.javadoc.tag.windowtitle" value="Collections 2.1.1 release API" />
-    <attainGoal name="javadoc:generate" />
-    <j:set var="collections.javadoc.tag" value="COLLECTIONS_3_0" />
-    <j:set var="collections.javadoc.tag.windowtitle" value="Collections 3.0 release API" />
-    <j:set var="collections.javadoc.tag.overview" value="src/java/org/apache/commons/collections/overview.html" />
-    <attainGoal name="javadoc:generate" />
-    <j:set var="collections.javadoc.tag" value="COLLECTIONS_3_1" />
-    <j:set var="collections.javadoc.tag.windowtitle" value="Collections 3.1 release API" />
-    <j:set var="collections.javadoc.tag.overview" value="src/java/org/apache/commons/collections/overview.html" />
-    <attainGoal name="javadoc:generate" />
-  </postGoal>
-  <postGoal name="site:generate"><!-- NEW MAVEN -->
-    <j:set var="collections.javadoc.tag" value="COLLECTIONS_2_1_1" />
-    <j:set var="collections.javadoc.tag.windowtitle" value="Collections 2.1.1 release API" />
-    <attainGoal name="javadoc:generate" />
-    <j:set var="collections.javadoc.tag" value="COLLECTIONS_3_0" />
-    <j:set var="collections.javadoc.tag.windowtitle" value="Collections 3.0 release API" />
-    <j:set var="collections.javadoc.tag.overview" value="src/java/org/apache/commons/collections/overview.html" />
-    <attainGoal name="javadoc:generate" />
-    <j:set var="collections.javadoc.tag" value="COLLECTIONS_3_1" />
-    <j:set var="collections.javadoc.tag.windowtitle" value="Collections 3.1 release API" />
-    <j:set var="collections.javadoc.tag.overview" value="src/java/org/apache/commons/collections/overview.html" />
-    <attainGoal name="javadoc:generate" />
-  </postGoal>
-  
   <!-- ============== DIST ================== -->
   <postGoal name="dist:prepare-bin-filesystem">
     <j:set var="maven.dist.bin.assembly.dir" value="${pom.getPluginContext('maven-dist-plugin').getVariable('maven.dist.bin.assembly.dir')}" />