--- src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java.sav0	2007-11-22 18:04:28.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/PlexusComponentsReport.java	2007-11-22 18:04:42.000000000 +0100
@@ -27,8 +27,8 @@
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.reporting.AbstractMavenReport;
 import org.apache.maven.reporting.MavenReportException;
-import org.codehaus.doxia.sink.Sink;
-import org.codehaus.doxia.site.renderer.SiteRenderer;
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.doxia.siterenderer.Renderer;
 import org.codehaus.plexus.maven.plugin.report.ComponentSet;
 import org.jdom.Document;
 import org.jdom.JDOMException;
@@ -62,9 +62,9 @@
     private MavenProject project;
 
     /**
-     * @component org.codehaus.doxia.site.renderer.SiteRenderer
+     * @component org.apache.maven.doxia.siterenderer.Renderer
      */
-    private SiteRenderer siteRenderer;
+    private Renderer siteRenderer;
 
     /**
      * @parameter expression="${project.reporting.outputDirectory}
@@ -114,7 +114,7 @@
         return project;
     }
 
-    protected SiteRenderer getSiteRenderer()
+    protected Renderer getSiteRenderer()
     {
         return siteRenderer;
     }
--- src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java.sav1	2007-11-22 18:18:16.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/ComponentSet.java	2007-11-22 18:19:05.000000000 +0100
@@ -17,7 +17,7 @@
  */
 import java.util.List;
 
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.jdom.Element;
 
 /**
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java.sav0	2007-11-22 18:21:17.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Components.java	2007-11-22 18:21:49.000000000 +0100
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.jdom.Element;
 
 import java.util.ArrayList;
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java.sav0	2007-11-22 18:25:57.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Component.java	2007-11-22 18:26:46.000000000 +0100
@@ -17,7 +17,7 @@
  */
 
 import org.jdom.Element;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.codehaus.plexus.util.StringUtils;
 
 import java.util.Iterator;
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java.sav0	2007-11-22 18:29:44.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Configuration.java	2007-11-22 18:30:22.000000000 +0100
@@ -25,7 +25,7 @@
 package org.codehaus.plexus.maven.plugin.report;
 
 import org.jdom.Element;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 
 /**
  * @author <a href="mailto:trygvis@inamo.no">Trygve Laugst&oslash;l</a>
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java.sav0	2007-11-22 18:31:57.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirements.java	2007-11-22 18:32:14.000000000 +0100
@@ -25,7 +25,7 @@
 package org.codehaus.plexus.maven.plugin.report;
 
 import org.jdom.Element;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 
 import java.util.Iterator;
 import java.util.List;
--- src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java.sav0	2007-11-22 18:34:25.000000000 +0100
+++ src/main/java/org/codehaus/plexus/maven/plugin/report/Requirement.java	2007-11-22 18:34:45.000000000 +0100
@@ -25,7 +25,7 @@
 package org.codehaus.plexus.maven.plugin.report;
 
 import org.jdom.Element;
-import org.codehaus.doxia.sink.Sink;
+import org.apache.maven.doxia.sink.Sink;
 import org.codehaus.plexus.util.StringUtils;
 
 /**