merge from archiva-1.3.x

git-svn-id: https://svn.apache.org/repos/asf/archiva/tags/archiva-1.3.6@1429774 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml
index 584089278156172f93cf3f29173121b285286fcb..f39c35cba50e9d0cbfc1df286e12f67a8e561dde 100644 (file)
--- a/archiva-docs/pom.xml
+++ b/archiva-docs/pom.xml
@@ -83,7 +83,7 @@
   <distributionManagement>
     <site>
       <id>apache.website</id>
-      <url>${siteBaseDeployment}/docs/${project.version}</url>
+      <url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/docs/${project.version}</url>
     </site>
   </distributionManagement>
 
@@ -94,17 +94,22 @@
       <build>
         <plugins>
           <plugin>
-            <artifactId>maven-site-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>deploy</id>
-                <phase>deploy</phase>
-                <goals>
-                  <goal>deploy</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+            <groupId>org.apache.maven.plugins</groupId>                         
+            <artifactId>maven-scm-publish-plugin</artifactId>                   
+            <configuration>                                                     
+              <checkinComment>Apache Archiva Versioned docs for ${project.version}</checkinComment>
+              <content>${project.build.directory}/site</content>
+            </configuration>                                                    
+            <executions>                                                        
+              <execution>                                                       
+                <id>scm-publish</id>                                            
+                <phase>deploy</phase>                                      
+                <goals>                                                         
+                  <goal>publish-scm</goal>                                      
+                </goals>                                                        
+              </execution>                                                      
+            </executions>                                                       
+          </plugin>                                                
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-enforcer-plugin</artifactId>