diff --git a/deploySite.sh b/deploySite.sh
index b6517a2..f6c265d 100644
--- a/deploySite.sh
+++ b/deploySite.sh
@@ -19,4 +19,5 @@
 # under the License.
 #
 
-mvn clean site-deploy scm-publish:publish-scm $@
+mvn -Preporting site site:stage $@
+mvn scm-publish:publish-scm $@
diff --git a/maven-plugin-tools-javadoc/pom.xml b/maven-plugin-tools-javadoc/pom.xml
index aed6d58..472ccd0 100644
--- a/maven-plugin-tools-javadoc/pom.xml
+++ b/maven-plugin-tools-javadoc/pom.xml
@@ -44,6 +44,28 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>enforce-bytecode-version</id>
+            <configuration>
+              <rules>
+                <enforceBytecodeVersion>
+                  <excludes>
+                    <exclude>com.sun:tools</exclude>
+                  </excludes>
+                </enforceBytecodeVersion>
+              </rules>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
   <profiles>
     <profile>
       <id>default-tools.jar</id>
diff --git a/pom.xml b/pom.xml
index f72a584..9c8112c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
   <parent>
     <artifactId>maven-parent</artifactId>
     <groupId>org.apache.maven</groupId>
-    <version>23</version>
+    <version>24</version>
     <relativePath>../pom/maven/pom.xml</relativePath>
   </parent>
 
@@ -37,7 +37,7 @@
     The Maven Plugin Tools contains the necessary tools to be able to produce Maven Plugins in scripting languages
     and to generate rebarbative content like descriptor, help and documentation.
   </description>
-  <url>${maven.pluginTools.url}</url>
+  <url>http://maven.apache.org/plugin-tools</url>
   <inceptionYear>2004</inceptionYear>
 
   <mailingLists>
@@ -160,7 +160,7 @@
   <distributionManagement>
     <site>
       <id>apache.website</id>
-      <url>${maven.pluginTools.siteUrlDeployment}</url>
+      <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
     </site>
   </distributionManagement>
 
@@ -169,13 +169,7 @@
     <mavenVersion>2.2.1</mavenVersion>
     <antVersion>1.7.1</antVersion>
     <mavenInvokerPluginVersion>1.8</mavenInvokerPluginVersion>
-
-    <maven.pluginTools.siteFilePath>${maven.site.cache}/maven-scm-${project.version}</maven.pluginTools.siteFilePath>
-    <maven.pluginTools.siteUrlDeployment>file://${maven.pluginTools.siteFilePath}</maven.pluginTools.siteUrlDeployment>
-    <maven.pluginTools.scmPubCheckoutDirectory>${maven.site.cache}/maven-plugin-tools-site-content-${project.version}</maven.pluginTools.scmPubCheckoutDirectory>
-    <maven.pluginTools.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/plugin-tools-archives/plugin-tools-${project.version}</maven.pluginTools.scmPubUrl>
-    <maven.pluginTools.url>http://maven.apache.org/plugin-tools-archives/plugin-tools-${project.version}</maven.pluginTools.url>
-
+    <maven.site.path>plugin-tools-archives/plugin-tools-LATEST</maven.site.path>
   </properties>
 
   <dependencyManagement>
@@ -251,7 +245,7 @@
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
         <artifactId>plexus-utils</artifactId>
-        <version>3.0</version>
+        <version>3.0.15</version>
       </dependency>
       <dependency>
         <groupId>org.codehaus.plexus</groupId>
@@ -343,27 +337,11 @@
   <build>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.5</version>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-scm-publish-plugin</artifactId>
-          <configuration>
-            <checkoutDirectory>${maven.pluginTools.scmPubCheckoutDirectory}</checkoutDirectory>
-            <pubScmUrl>scm:svn:${maven.pluginTools.scmPubUrl}</pubScmUrl>
-            <checkinComment>Apache Maven Plugin Tools site deployment</checkinComment>
-            <content>${maven.pluginTools.siteFilePath}</content>
-            <tryUpdate>true</tryUpdate>
-          </configuration>
-        </plugin>
-        <plugin>
+        <plugin><!-- TODO remove when upgrading maven-parent to 25 -->
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <configuration>
-            <stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugin-tools-${project.version}</stagingSiteURL>
+            <topSiteURL>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</topSiteURL>
           </configuration>
         </plugin>
         <plugin>
@@ -376,7 +354,6 @@
         <plugin>
           <groupId>org.codehaus.plexus</groupId>
           <artifactId>plexus-component-metadata</artifactId>
-          <version>1.5.5</version>
           <executions>
             <execution>
               <goals>
@@ -398,7 +375,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <version>2.9</version>
             <configuration>
               <linksource>true</linksource>
               <links combine.children="append">
@@ -423,7 +399,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jxr-plugin</artifactId>
-            <version>2.3</version>
             <reportSets>
               <reportSet>
                 <id>non-aggregate</id>
@@ -442,7 +417,6 @@
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-checkstyle-plugin</artifactId>
-            <version>2.9.1</version>
             <reportSets>
               <reportSet>
                 <id>non-aggregate</id>
@@ -462,16 +436,5 @@
         </plugins>
       </reporting>
     </profile>
-
-    <profile>
-      <id>site-release</id>
-      <properties>
-        <maven.pluginTools.siteFilePath>${maven.site.cache}/maven-plugin-tools</maven.pluginTools.siteFilePath>
-        <maven.pluginTools.scmPubCheckoutDirectory>${maven.site.cache}/plugin-tools</maven.pluginTools.scmPubCheckoutDirectory>
-        <maven.pluginTools.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/plugin-tools</maven.pluginTools.scmPubUrl>
-        <maven.pluginTools.url>http://maven.apache.org/plugin-tools</maven.pluginTools.url>
-      </properties>
-    </profile>
-
   </profiles>
 </project>