diff --git a/deploySite.sh b/deploySite.sh
index 894a2f1..776a5e2 100755
--- a/deploySite.sh
+++ b/deploySite.sh
@@ -27,12 +27,13 @@
 THIS_DIR=$(dirname $0)
 THIS_DIR=$(readlink -f ${THIS_DIR})
 CONTENT_DIR=".site-content"
+BRANCH="asf-staging-3.0"
 
 SUB_DIR="components"
 
 if [ -d "${CONTENT_DIR}/.git" ]; then
   git -C "${CONTENT_DIR}" fetch origin
-  git -C "${CONTENT_DIR}" reset --hard origin/master
+  git -C "${CONTENT_DIR}" reset --hard origin/${BRANCH}
 fi
 
 echo ">>>> Creating site and reports <<<<" 
@@ -55,7 +56,7 @@
   echo "> Aborting now"
   echo "> Running git reset in .site-content directory" 
   git -C "${CONTENT_DIR}" fetch origin
-  git -C "${CONTENT_DIR}" reset --hard origin/master
+  git -C "${CONTENT_DIR}" reset --hard origin/${BRANCH}
   echo ">>>> Finished <<<<"
 fi
 
diff --git a/expression-evaluator/pom.xml b/expression-evaluator/pom.xml
index 120320d..0c98640 100644
--- a/expression-evaluator/pom.xml
+++ b/expression-evaluator/pom.xml
@@ -52,6 +52,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${javadocPluginVersion}</version>
         <inherited>false</inherited>
         <reportSets>
           <reportSet>
diff --git a/git-sparse-checkout-pattern b/git-sparse-checkout-pattern
index b24177f..3d1d2f2 100644
--- a/git-sparse-checkout-pattern
+++ b/git-sparse-checkout-pattern
@@ -1 +1 @@
-/redback/components
+/components
diff --git a/graph/pom.xml b/graph/pom.xml
index 9f3d051..3d265f2 100644
--- a/graph/pom.xml
+++ b/graph/pom.xml
@@ -49,6 +49,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${javadocPluginVersion}</version>
         <inherited>false</inherited>
         <reportSets>
           <reportSet>
diff --git a/pom.xml b/pom.xml
index 486876e..a39ca59 100644
--- a/pom.xml
+++ b/pom.xml
@@ -50,7 +50,7 @@
 
 
   <properties>
-    <site.staging.base>${project.basedir}</site.staging.base>
+    <site.staging.base>${project.basedir}/target/staging/components</site.staging.base>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <webUrl>https://archiva.apache.org/components</webUrl>
     <scmPubCheckoutDirectory>${basedir}/.site-content</scmPubCheckoutDirectory>
@@ -272,18 +272,10 @@
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-scm-publish-plugin</artifactId>
-          <configuration>
-            <checkinComment>${project.name}</checkinComment>
-          </configuration>
-        </plugin>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-site-plugin</artifactId>
           <configuration>
             <skipDeploy>true</skipDeploy>
           </configuration>
-
           <dependencies>
             <dependency>
               <groupId>org.asciidoctor</groupId>
@@ -293,6 +285,30 @@
           </dependencies>
         </plugin>
 
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>${javadocPluginVersion}</version>
+          <configuration>
+            <notimestamp>true</notimestamp>
+            <javadocVersion>${javaFullVersion}</javadocVersion>
+            <source>${compiler.source}</source>
+            <doclint>none</doclint>
+            <detectLinks>true</detectLinks>
+            <detectJavaApiLink>true</detectJavaApiLink>
+            <linksource>true</linksource>
+            <show>protected</show>
+            <quiet>true</quiet>
+            <tags>
+              <tag>
+                <name>todo</name>
+                <placement>a</placement>
+                <head>To Do:</head>
+              </tag>
+            </tags>
+          </configuration>
+        </plugin>
+
       </plugins>
     </pluginManagement>
     <plugins>
@@ -336,10 +352,11 @@
         <artifactId>maven-scm-publish-plugin</artifactId>
         <inherited>false</inherited>
         <configuration>
-          <checkinComment>Apache Archiva versioned module docs for ${project.version}</checkinComment>
+          <checkinComment>Apache Archiva Component docs for ${project.version}</checkinComment>
           <skipDeletedFiles>true</skipDeletedFiles>
           <content>${project.build.directory}/staging</content>
           <tryUpdate>true</tryUpdate>
+          <scmBranch>asf-staging-3.0</scmBranch>
           <!--
                     <ignorePathsToDelete>
                       <path>%regex[^(?!docs/).*$]</path>
@@ -370,6 +387,7 @@
           <inputEncoding>UTF-8</inputEncoding>
           <outputEncoding>UTF-8</outputEncoding>
           <skipDeploy>true</skipDeploy>
+          <stagingDirectory>${site.staging.base}/target/staging/components</stagingDirectory>
           <asciidoc>
             <!-- optional site-wide AsciiDoc attributes -->
             <attributes>
@@ -417,20 +435,11 @@
           <javadocVersion>${javaFullVersion}</javadocVersion>
           <source>${compiler.source}</source>
           <doclint>none</doclint>
-          <links>
-            <link>https://docs.oracle.com/javase/8/docs/api</link>
-            <link>http://commons.apache.org/collections/apidocs-COLLECTIONS_3_0/</link>
-            <link>http://commons.apache.org/dbcp/apidocs/</link>
-            <link>http://commons.apache.org/fileupload/apidocs/</link>
-            <link>http://commons.apache.org/httpclient/apidocs/</link>
-            <link>http://commons.apache.org/logging/apidocs/</link>
-            <link>http://commons.apache.org/pool/apidocs/</link>
-            <link>http://logging.apache.org/log4j/${log4j.version}/apidocs/</link>
-            <link>http://jakarta.apache.org/regexp/apidocs/</link>
-          </links>
-
+          <detectLinks>true</detectLinks>
+          <detectJavaApiLink>true</detectJavaApiLink>
           <linksource>true</linksource>
-          <show>private</show>
+          <show>protected</show>
+          <quiet>true</quiet>
           <tags>
             <tag>
               <name>todo</name>
@@ -456,19 +465,6 @@
     <profile>
       <id>release</id>
       <build>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-site-plugin</artifactId>
-              <inherited>true</inherited>
-              <configuration>
-                <skipDeploy>true</skipDeploy>
-                <stagingDirectory>${site.staging.base}/target/staging/components/</stagingDirectory>
-              </configuration>
-            </plugin>
-          </plugins>
-        </pluginManagement>
         <plugins>
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
diff --git a/spring-apacheds/pom.xml b/spring-apacheds/pom.xml
index 580c6ab..a482de2 100644
--- a/spring-apacheds/pom.xml
+++ b/spring-apacheds/pom.xml
@@ -127,6 +127,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${javadocPluginVersion}</version>
         <inherited>false</inherited>
         <reportSets>
           <reportSet>
diff --git a/spring-cache/pom.xml b/spring-cache/pom.xml
index 7ca2764..0d594af 100644
--- a/spring-cache/pom.xml
+++ b/spring-cache/pom.xml
@@ -55,6 +55,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${javadocPluginVersion}</version>
         <inherited>false</inherited>
         <reportSets>
           <reportSet>
diff --git a/spring-cache/spring-cache-api/pom.xml b/spring-cache/spring-cache-api/pom.xml
index e790b69..fe8a9aa 100644
--- a/spring-cache/spring-cache-api/pom.xml
+++ b/spring-cache/spring-cache-api/pom.xml
@@ -32,7 +32,7 @@
 
   <name>Archiva Components :: Spring Cache API</name>
   <properties>
-    <site.staging.base>${project.parent.basedir}</site.staging.base>
+    <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
   <description>Common Cache API.</description>
 
diff --git a/spring-cache/spring-cache-providers/pom.xml b/spring-cache/spring-cache-providers/pom.xml
index 720e372..76ab972 100644
--- a/spring-cache/spring-cache-providers/pom.xml
+++ b/spring-cache/spring-cache-providers/pom.xml
@@ -30,7 +30,7 @@
   <packaging>pom</packaging>
   <description>Commons Cache API Providers Parent Pom.</description>
   <properties>
-    <site.staging.base>${project.parent.basedir}</site.staging.base>
+    <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
   <url>${webUrl}/spring-cache/${project.artifactId}</url>
 
diff --git a/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml b/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
index 9b14020..6733e69 100644
--- a/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
+++ b/spring-cache/spring-cache-providers/spring-cache-ehcache/pom.xml
@@ -33,7 +33,7 @@
 
   <description>Commons Cache API : ehcache implementation.</description>
   <properties>
-    <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+    <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
 
   <url>${webUrl}/spring-cache/spring-cache-providers/${project.artifactId}</url>
diff --git a/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml b/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
index 1c97186..9faaf25 100644
--- a/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
+++ b/spring-cache/spring-cache-providers/spring-cache-hashmap/pom.xml
@@ -34,7 +34,7 @@
 
   <description>Commons Cache API : simple in memory HashMap implementation.</description>
   <properties>
-    <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
+    <site.staging.base>${project.parent.parent.parent.basedir}</site.staging.base>
   </properties>
 
   <url>${webUrl}/spring-cache/spring-cache-providers/${project.artifactId}</url>
diff --git a/spring-cache/spring-cache-test/pom.xml b/spring-cache/spring-cache-test/pom.xml
index 0d4898b..0d83c98 100644
--- a/spring-cache/spring-cache-test/pom.xml
+++ b/spring-cache/spring-cache-test/pom.xml
@@ -31,7 +31,7 @@
 
   <description>Commons Test Cache API.</description>
   <properties>
-    <site.staging.base>${project.parent.basedir}</site.staging.base>
+    <site.staging.base>${project.parent.parent.basedir}</site.staging.base>
   </properties>
 
   <url>${webUrl}/spring-cache/${project.artifactId}</url>
diff --git a/spring-quartz/pom.xml b/spring-quartz/pom.xml
index c50d27d..ad4d11f 100644
--- a/spring-quartz/pom.xml
+++ b/spring-quartz/pom.xml
@@ -110,6 +110,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${javadocPluginVersion}</version>
         <inherited>false</inherited>
         <reportSets>
           <reportSet>
diff --git a/spring-registry/pom.xml b/spring-registry/pom.xml
index f4e2ddb..7e250bc 100644
--- a/spring-registry/pom.xml
+++ b/spring-registry/pom.xml
@@ -89,6 +89,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${javadocPluginVersion}</version>
         <inherited>false</inherited>
         <reportSets>
           <reportSet>
diff --git a/spring-taskqueue/pom.xml b/spring-taskqueue/pom.xml
index 6446680..49a9c46 100644
--- a/spring-taskqueue/pom.xml
+++ b/spring-taskqueue/pom.xml
@@ -99,6 +99,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
+        <version>${javadocPluginVersion}</version>
         <inherited>false</inherited>
         <reportSets>
           <reportSet>