diff --git a/maven-plugin-plugin/pom.xml b/maven-plugin-plugin/pom.xml
index b4eaf7d..67947c9 100644
--- a/maven-plugin-plugin/pom.xml
+++ b/maven-plugin-plugin/pom.xml
@@ -18,33 +18,30 @@
   ~ under the License.
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
   <parent>
     <groupId>org.apache.maven.plugins</groupId>
     <artifactId>maven-plugins</artifactId>
     <version>11</version>
   </parent>
 
-  <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.plugins</groupId>
   <artifactId>maven-plugin-plugin</artifactId>
+  <version>2.4.3</version>
   <packaging>maven-plugin</packaging>
-  <name>Maven Plugin Plugin</name>
-  <version>2.4.3-SNAPSHOT</version>
 
+  <name>Maven Plugin Plugin</name>
   <description>
     The Plugin Plugin is used to create a Maven plugin descriptor for any Mojo's found in the source tree,
     to include in the JAR. It is also used to generate Xdoc files for the Mojos as well as for updating the
     plugin registry, the artifact metadata and a generic help goal.
   </description>
 
-  <prerequisites>
-    <maven>2.0.6</maven>
-  </prerequisites>
-
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-plugin/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-plugin/</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-plugin</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-plugin</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-plugin</url>
   </scm>
   <issueManagement>
     <system>jira</system>
@@ -57,6 +54,16 @@
     </site>
   </distributionManagement>
 
+  <prerequisites>
+    <maven>2.0.6</maven>
+  </prerequisites>
+
+  <properties>
+    <doxiaVersion>1.0-alpha-10</doxiaVersion>
+    <doxia-sitetoolsVersion>1.0-alpha-10</doxia-sitetoolsVersion>
+    <pluginToolsVersion>2.4.3</pluginToolsVersion>
+  </properties>
+
   <!-- Copy from project up -->
   <dependencyManagement>
     <dependencies>
@@ -96,12 +103,6 @@
     </dependencies>
   </dependencyManagement>
 
-  <properties>
-    <doxiaVersion>1.0-alpha-10</doxiaVersion>
-    <doxia-sitetoolsVersion>1.0-alpha-10</doxia-sitetoolsVersion>
-    <pluginToolsVersion>2.4.3-SNAPSHOT</pluginToolsVersion>
-  </properties>
-
   <dependencies>
     <!-- doxia -->
     <dependency>
@@ -285,6 +286,7 @@
               <onlyCurrentVersion>true</onlyCurrentVersion>
               <resolutionIds>Closed</resolutionIds>
               <sortColumnNames>Type,Key</sortColumnNames>
+              <component>13021</component>
             </configuration>
             <reportSets>
               <reportSet>
diff --git a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
index 7a6d884..d6f3abb 100644
--- a/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
+++ b/maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/DescriptorGeneratorMojo.java
@@ -26,7 +26,7 @@ import java.io.File;
 
 /**
  * Generate a plugin descriptor.
- * <p/>
+ * <br/>
  * <b>Note:</b> Phase is after the "compilation" of any scripts.
  *
  * @author <a href="mailto:jason@maven.org">Jason van Zyl</a>
diff --git a/maven-plugin-plugin/src/site/apt/examples/generate-descriptor.apt b/maven-plugin-plugin/src/site/apt/examples/generate-descriptor.apt
index 71bb8c7..7b639f8 100644
--- a/maven-plugin-plugin/src/site/apt/examples/generate-descriptor.apt
+++ b/maven-plugin-plugin/src/site/apt/examples/generate-descriptor.apt
@@ -3,7 +3,7 @@
  ------
  Maria Odea Ching
  ------
- February 2008
+ 2008-02-01
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,9 @@
 ~~ specific language governing permissions and limitations
 ~~ under the License.
 
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
 Configuring Generation of Plugin Descriptor
 
  To configure the generation of the plugin descriptor, add the following to the project's POM:
diff --git a/maven-plugin-plugin/src/site/apt/examples/generate-help.apt b/maven-plugin-plugin/src/site/apt/examples/generate-help.apt
index 1525674..04de885 100644
--- a/maven-plugin-plugin/src/site/apt/examples/generate-help.apt
+++ b/maven-plugin-plugin/src/site/apt/examples/generate-help.apt
@@ -3,7 +3,7 @@
  ------
  Vincent Siveton
  ------
- January 2008
+ 2008-01-01
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,9 @@
 ~~ specific language governing permissions and limitations
 ~~ under the License.
 
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
 Configuring Generation of Help Mojo
 
  To configure the generation of a <<<Help>>> Mojo, add the following to the project's POM:
diff --git a/maven-plugin-plugin/src/site/apt/examples/generate-report.apt b/maven-plugin-plugin/src/site/apt/examples/generate-report.apt
index edbd88c..0de809b 100644
--- a/maven-plugin-plugin/src/site/apt/examples/generate-report.apt
+++ b/maven-plugin-plugin/src/site/apt/examples/generate-report.apt
@@ -3,7 +3,7 @@
  ------
  Vincent Siveton
  ------
- January 2008
+ 2008-01-01
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,9 @@
 ~~ specific language governing permissions and limitations
 ~~ under the License.
 
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
 Configuring Generation of Documentation Reports
 
  To configure the generation of the documentation reports, add the following to the project's POM:
diff --git a/maven-plugin-plugin/src/site/apt/index.apt b/maven-plugin-plugin/src/site/apt/index.apt
index b0bc4dd..3c0391d 100644
--- a/maven-plugin-plugin/src/site/apt/index.apt
+++ b/maven-plugin-plugin/src/site/apt/index.apt
@@ -3,7 +3,7 @@
  ------
  Maria Odea Ching
  ------
- January 2008
+ 2008-01-01
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -23,6 +23,9 @@
 ~~ specific language governing permissions and limitations
 ~~ under the License.
 
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
 Maven Plugin Plugin
 
  The Maven Plugin Plugin is used to create a Maven plugin descriptor for any
diff --git a/maven-plugin-plugin/src/site/apt/multiple-language-support.apt b/maven-plugin-plugin/src/site/apt/multiple-language-support.apt
index a041ac9..43e66e5 100644
--- a/maven-plugin-plugin/src/site/apt/multiple-language-support.apt
+++ b/maven-plugin-plugin/src/site/apt/multiple-language-support.apt
@@ -3,9 +3,9 @@
  ---
  John Casey
  ---
- 09-Feb-2005
+ 2005-02-09
  ---
- 
+
 ~~ Licensed to the Apache Software Foundation (ASF) under one
 ~~ or more contributor license agreements.  See the NOTICE file
 ~~ distributed with this work for additional information
@@ -23,28 +23,31 @@
 ~~ specific language governing permissions and limitations
 ~~ under the License.
 
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
 <<THIS NEEDS REVISION AND CLEANING UP>>
- 
+
 *Abstract
 
   The Plugin Plugin needs to be refactored in order to support multiple mojo
-  implementation languages. This document will detail the steps needed to 
+  implementation languages. This document will detail the steps needed to
   add this functionality.
-  
+
 *Current Status
 
   The Plugin Plugin currently calls out to a set of generators in the
   maven-plugin-tools library, which in turn uses QDox to generate various things
   based on annotations in the java source code.
-  
+
 *Refactored Design
 
   The new design will have a generator-manager which is a component that the
-  plugin mojos will lookup. This component will have access to a mapping of all 
+  plugin mojos will lookup. This component will have access to a mapping of all
   generators and the language they're registered for. It'll iterate through the
   mappings, and extract mojo descriptors from all relevant scripts/sources using
   each language's registered generator. Results from each generator will be
-  centrally aggregated by the generator-manager. After all generators have run, 
+  centrally aggregated by the generator-manager. After all generators have run,
   the generator-manager will call another class (depending on what it's meant to
-  produce) to take all the aggregated mojo descriptors and produce a result 
+  produce) to take all the aggregated mojo descriptors and produce a result
   (such as <<<plugin.xml>>> file for the project).
\ No newline at end of file
diff --git a/maven-plugin-plugin/src/site/apt/usage.apt b/maven-plugin-plugin/src/site/apt/usage.apt
index 681e74d..4957947 100644
--- a/maven-plugin-plugin/src/site/apt/usage.apt
+++ b/maven-plugin-plugin/src/site/apt/usage.apt
@@ -4,7 +4,7 @@
  Maria Odea Ching
  Vincent Siveton
  ------
- January 2008
+ 2008-01-01
  ------
 
 ~~ Licensed to the Apache Software Foundation (ASF) under one
@@ -24,6 +24,9 @@
 ~~ specific language governing permissions and limitations
 ~~ under the License.
 
+~~ NOTE: For help with the syntax of this file, see:
+~~ http://maven.apache.org/doxia/references/apt-format.html
+
 Usage
 
   The Plugin Plugin is generally used for Maven 2 plugins. Its goals are bound to different phases in the build life cycle.
diff --git a/maven-plugin-tools-ant/pom.xml b/maven-plugin-tools-ant/pom.xml
index 7f3dcfb..4320db1 100644
--- a/maven-plugin-tools-ant/pom.xml
+++ b/maven-plugin-tools-ant/pom.xml
@@ -25,13 +25,20 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>2.4.3-SNAPSHOT</version>
+    <version>2.4.3</version>
   </parent>
 
   <artifactId>maven-plugin-tools-ant</artifactId>
+
   <name>Maven Plugin Tool for Ant</name>
   <description>Descriptor extractor for plugins written in Ant.</description>
 
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-ant</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-ant</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-ant</url>
+  </scm>
+
   <dependencies>
     <!-- maven -->
     <dependency>
@@ -53,10 +60,4 @@
       <artifactId>plexus-utils</artifactId>
     </dependency>
   </dependencies>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-ant/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-ant/</url>
-  </scm>
 </project>
diff --git a/maven-plugin-tools-api/pom.xml b/maven-plugin-tools-api/pom.xml
index 6d3b8a8..3162375 100644
--- a/maven-plugin-tools-api/pom.xml
+++ b/maven-plugin-tools-api/pom.xml
@@ -25,13 +25,20 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>2.4.3-SNAPSHOT</version>
+    <version>2.4.3</version>
   </parent>
 
   <artifactId>maven-plugin-tools-api</artifactId>
+
   <name>Maven Plugin Tools APIs</name>
   <description>The Maven Plugin Tools API provides an API to extract information from and generate documentation for Maven Plugins.</description>
 
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-api</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-api</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-api</url>
+  </scm>
+
   <dependencies>
     <!-- maven -->
     <dependency>
@@ -102,12 +109,6 @@
     </dependency>
   </dependencies>
 
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-api/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/</url>
-  </scm>
-
   <profiles>
     <profile>
       <id>reporting</id>
diff --git a/maven-plugin-tools-beanshell/pom.xml b/maven-plugin-tools-beanshell/pom.xml
index 0606496..c9410dd 100644
--- a/maven-plugin-tools-beanshell/pom.xml
+++ b/maven-plugin-tools-beanshell/pom.xml
@@ -25,13 +25,20 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>2.4.3-SNAPSHOT</version>
+    <version>2.4.3</version>
   </parent>
 
   <artifactId>maven-plugin-tools-beanshell</artifactId>
+
   <name>Maven Plugin Tool for Beanshell</name>
   <description>Descriptor extractor for plugins written in Beanshell.</description>
 
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-beanshell</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-beanshell</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-beanshell</url>
+  </scm>
+
   <dependencies>
     <!-- maven -->
     <dependency>
@@ -50,10 +57,4 @@
       <version>1.3.0</version>
     </dependency>
   </dependencies>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-beanshell/</url>
-  </scm>
 </project>
diff --git a/maven-plugin-tools-java/pom.xml b/maven-plugin-tools-java/pom.xml
index 7d01130..7fd1307 100644
--- a/maven-plugin-tools-java/pom.xml
+++ b/maven-plugin-tools-java/pom.xml
@@ -25,13 +25,20 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>2.4.3-SNAPSHOT</version>
+    <version>2.4.3</version>
   </parent>
 
   <artifactId>maven-plugin-tools-java</artifactId>
+
   <name>Maven Plugin Tool for Java</name>
   <description>Descriptor extractor for plugins written in Java.</description>
 
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-java</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-java</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-java</url>
+  </scm>
+
   <dependencies>
     <!-- maven -->
     <dependency>
@@ -70,10 +77,4 @@
       <version>1.6.3</version>
     </dependency>
   </dependencies>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-java/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-java/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-java/</url>
-  </scm>
 </project>
diff --git a/maven-plugin-tools-javadoc/pom.xml b/maven-plugin-tools-javadoc/pom.xml
index cb9c468..eac5204 100644
--- a/maven-plugin-tools-javadoc/pom.xml
+++ b/maven-plugin-tools-javadoc/pom.xml
@@ -25,13 +25,21 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>2.4.3-SNAPSHOT</version>
+    <version>2.4.3</version>
   </parent>
 
   <artifactId>maven-plugin-tools-javadoc</artifactId>
+
   <name>Maven Plugin Tools Javadoc</name>
+  <description>The Maven Plugin Tools Javadoc provides several Javadoc taglets to be used when generating Javadoc.</description>
   <inceptionYear>2008</inceptionYear>
 
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-javadoc</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-javadoc</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-javadoc</url>
+  </scm>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.maven.plugin-tools</groupId>
@@ -39,17 +47,6 @@
     </dependency>
   </dependencies>
 
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
-
   <profiles>
     <profile>
       <id>default-tools.jar</id>
@@ -70,7 +67,7 @@
      </dependencies>
    </profile>
     <profile>
-      <id>integration-tests</id>
+      <id>unit-tests</id>
       <activation>
         <property>
           <name>maven.test.skip</name>
@@ -168,10 +165,4 @@
       </build>
    </profile>
  </profiles>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/</url>
-  </scm>
 </project>
diff --git a/maven-plugin-tools-model/pom.xml b/maven-plugin-tools-model/pom.xml
index 2ff50ef..a1bbc45 100644
--- a/maven-plugin-tools-model/pom.xml
+++ b/maven-plugin-tools-model/pom.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
 <!--
   ~ Licensed to the Apache Software Foundation (ASF) under one
@@ -17,7 +17,7 @@
   ~ KIND, either express or implied.  See the License for the
   ~ specific language governing permissions and limitations
   ~ under the License.
-  -->
+-->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
@@ -25,19 +25,44 @@
   <parent>
     <groupId>org.apache.maven.plugin-tools</groupId>
     <artifactId>maven-plugin-tools</artifactId>
-    <version>2.4.3-SNAPSHOT</version>
+    <version>2.4.3</version>
   </parent>
 
   <artifactId>maven-plugin-tools-model</artifactId>
+
   <name>Maven Plugin Metadata Model</name>
-  <description>The Maven Plugin Metadata Model provides an API to play with the Metadat model.</description>
+  <description>The Maven Plugin Metadata Model provides an API to play with the Metadata model.</description>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-model</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-model</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3/maven-plugin-tools-model</url>
+  </scm>
+
+  <dependencies>
+    <!-- maven -->
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-descriptor</artifactId>
+    </dependency>
+
+    <!-- plexus -->
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+    </dependency>
+  </dependencies>
 
   <build>
     <plugins>
       <plugin>
         <groupId>org.codehaus.modello</groupId>
         <artifactId>modello-maven-plugin</artifactId>
-          <version>1.0-alpha-21</version>
+        <version>1.0-alpha-21</version>
         <configuration>
           <models>
             <model>src/main/mdo/plugin-metadata.mdo</model>
@@ -49,7 +74,7 @@
             <id>site-docs</id>
             <phase>pre-site</phase>
             <goals>
-              <goal>xsd</goal>
+              <goal>xdoc</goal>
             </goals>
           </execution>
           <execution>
@@ -74,28 +99,4 @@
       </plugin>
     </plugins>
   </build>
-
-  <dependencies>
-    <!-- maven -->
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-descriptor</artifactId>
-    </dependency>
-
-    <!-- plexus -->
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-  </dependencies>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-model/</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk/maven-plugin-tools-model/</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-model/</url>
-  </scm>
 </project>
diff --git a/pom.xml b/pom.xml
index 4b773ba..5cb2b84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 
   <groupId>org.apache.maven.plugin-tools</groupId>
   <artifactId>maven-plugin-tools</artifactId>
-  <version>2.4.3-SNAPSHOT</version>
+  <version>2.4.3</version>
   <packaging>pom</packaging>
 
   <name>Maven Plugin Tools</name>
@@ -39,21 +39,6 @@
   <url>http://maven.apache.org/plugin-tools/</url>
   <inceptionYear>2004</inceptionYear>
 
-  <prerequisites>
-    <maven>2.0.6</maven>
-  </prerequisites>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.codehaus.org/browse/MPLUGIN</url>
-  </issueManagement>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/trunk</developerConnection>
-    <url>http://svn.apache.org/viewvc/maven/plugin-tools/trunk</url>
-  </scm>
-
   <mailingLists>
     <mailingList>
       <name>Maven User List</name>
@@ -128,42 +113,9 @@
     </mailingList>
   </mailingLists>
 
-  <distributionManagement>
-    <site>
-      <id>apache.website</id>
-      <url>scp://people.apache.org/www/maven.apache.org/plugin-tools/</url>
-    </site>
-  </distributionManagement>
-
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.4</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.4.3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>2.0-beta-7</version>
-          <configuration>
-            <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugin-tools/${project.artifactId}-${project.version}</stagingSiteURL>
-          </configuration>
-        </plugin>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <configuration>
-            <tagBase>https://svn.apache.org/repos/asf/maven/plugin-tools/tags</tagBase>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
+  <prerequisites>
+    <maven>2.0.6</maven>
+  </prerequisites>
 
   <modules>
     <module>maven-plugin-tools-api</module>
@@ -175,6 +127,27 @@
     <module>maven-plugin-tools-javadoc</module>
   </modules>
 
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugin-tools/tags/maven-plugin-tools-2.4.3</developerConnection>
+    <url>http://svn.apache.org/viewvc/maven/plugin-tools/tags/maven-plugin-tools-2.4.3</url>
+  </scm>
+  <issueManagement>
+    <system>jira</system>
+    <url>http://jira.codehaus.org/browse/MPLUGIN</url>
+  </issueManagement>
+  <distributionManagement>
+    <site>
+      <id>apache.website</id>
+      <url>scp://people.apache.org/www/maven.apache.org/plugin-tools/</url>
+    </site>
+  </distributionManagement>
+
+  <properties>
+    <pluginToolsVersion>2.4.3</pluginToolsVersion>
+    <pluginTestingHarnessVersion>1.2</pluginTestingHarnessVersion>
+  </properties>
+
   <dependencyManagement>
     <dependencies>
       <!-- maven -->
@@ -235,8 +208,33 @@
     </dependency>
   </dependencies>
 
-  <properties>
-    <pluginToolsVersion>2.4.3-SNAPSHOT</pluginToolsVersion>
-    <pluginTestingHarnessVersion>1.2</pluginTestingHarnessVersion>
-  </properties>
+  <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>2.4</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-surefire-plugin</artifactId>
+          <version>2.4.3</version>
+        </plugin>
+        <plugin>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>2.0-beta-7</version>
+          <configuration>
+            <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugin-tools/${project.artifactId}-${project.version}</stagingSiteURL>
+          </configuration>
+        </plugin>
+        <plugin>
+          <artifactId>maven-release-plugin</artifactId>
+          <configuration>
+            <tagBase>https://svn.apache.org/repos/asf/maven/plugin-tools/tags</tagBase>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+  </build>
 </project>