fix site deployment

git-svn-id: https://svn.apache.org/repos/asf/maven/release/trunk@1425361 13f79535-47bb-0310-9956-ffa450edef68

deploySite.bat

@@ -17,4 +17,4 @@
 @REM under the License.
 @REM ----------------------------------------------------------------------------
 
-mvn clean site site:stage scm-publish:publish-scm %*
+mvn clean site-deploy scm-publish:publish-scm %*

deploySite.sh

@@ -19,4 +19,4 @@
 # under the License.
 #
 
-mvn clean site site:stage scm-publish:publish-scm $@
+mvn clean site-deploy scm-publish:publish-scm $@

pom.xml

@@ -64,14 +64,18 @@
   <properties>
     <scmVersion>1.8</scmVersion>
     <mavenVersion>2.2.1</mavenVersion>
+
     <maven.site.cache>${user.home}/maven-sites</maven.site.cache>
-    <maven.site.path>${project.artifactId}-archives/${project.artifactId}-${project.version}</maven.site.path>
+    <maven.release.siteFilePath>${maven.site.cache}/maven-release-${project.version}</maven.release.siteFilePath>
+    <maven.release.siteUrlDeployment>file://${maven.release.siteFilePath}</maven.release.siteUrlDeployment>
+    <maven.release.scmPubCheckoutDirectory>${maven.site.cache}/maven-release-site-content-${project.version}</maven.release.scmPubCheckoutDirectory>
+    <maven.release.scmPubUrl>https://svn.apache.org/repos/infra/websites/production/maven/content/maven-release-archives/maven-release-${project.version}</maven.release.scmPubUrl>
   </properties>
 
   <distributionManagement>
     <site>
       <id>apache.website</id>
-      <url>scm:svn:https://svn.apache.org/repos/infra/websites/production/maven/content/${maven.site.path}</url>
+      <url>${maven.release.siteUrlDeployment}</url>
     </site>
   </distributionManagement>
 
@@ -113,7 +117,10 @@
           <artifactId>maven-scm-publish-plugin</artifactId>
           <version>1.0-beta-2</version>
           <configuration>
-            <checkoutDirectory>${maven.site.cache}/${maven.site.path}</checkoutDirectory>
+            <checkoutDirectory>${maven.release.scmPubCheckoutDirectory}</checkoutDirectory>
+            <pubScmUrl>scm:svn:${maven.release.scmPubUrl}</pubScmUrl>
+            <checkinComment>Apache Maven Release site deployment</checkinComment>
+            <content>${maven.release.siteFilePath}</content>
             <tryUpdate>true</tryUpdate>
           </configuration>
         </plugin>