simplify svnpub sub configuration: just use mvn site-deploy is easier and as usual :-)

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

diff --git a/archiva-docs/deploySite.sh b/archiva-docs/deploySite.sh
deleted file mode 100644 (file)
index 9ba6df0..0000000
--- a/archiva-docs/deploySite.sh
+++ /dev/null
@@ -1 +0,0 @@
-mvn clean site-deploy && mvn scm-publish:publish-scm 

diff --git a/archiva-docs/pom.xml b/archiva-docs/pom.xml
index 6484f600e93650b6bee67d38b8a52d82b459ac0d..3cff952fecb62ff4257a1bca8e4fb5abba2be9fb 100644 (file)
--- a/archiva-docs/pom.xml
+++ b/archiva-docs/pom.xml
@@ -37,10 +37,6 @@
   <build>
     <pluginManagement>
       <plugins>
-        <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-site-plugin</artifactId>
-        </plugin>
         <plugin>
           <groupId>org.apache.rat</groupId>
           <artifactId>apache-rat-plugin</artifactId>
@@ -56,7 +52,6 @@
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-scm-publish-plugin</artifactId>
           <configuration>
-            <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/docs/${project.version}</pubScmUrl>
             <checkinComment>Apache Archiva Versionned docs for ${project.version}</checkinComment>
           </configuration>
         </plugin>
@@ -64,15 +59,26 @@
     </pluginManagement>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-site-plugin</artifactId>
         <executions>
           <execution>
-            <id>site</id>
+            <id>site-generate-resources</id>
             <phase>generate-resources</phase>
             <goals>
               <goal>site</goal>
             </goals>
           </execution>
+          <execution>
+            <id>stage-for-scm-publish</id>
+            <phase>post-site</phase>
+            <goals>
+              <goal>stage</goal>
+            </goals>
+            <configuration>
+              <skipDeploy>false</skipDeploy>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -115,7 +121,7 @@
   <distributionManagement>
     <site>
       <id>apache.website</id>
-      <url>${siteUrlDeployment}</url>
+      <url>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/docs/${project.version}</url>
     </site>
   </distributionManagement>