simplify site deployment

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

diff --git a/archiva-modules/deploySite.sh b/archiva-modules/deploySite.sh
index c876c99d61bc850b7bdcc4913ac97cc592f80660..44a13e0e9437925b7101875cf18c21d3e0795568 100644 (file)
--- a/archiva-modules/deploySite.sh
+++ b/archiva-modules/deploySite.sh
@@ -1 +1 @@
-mvn clean site-deploy scm-publish:publish-scm $@
+mvn clean site site:stage -Preporting scm-publish:publish-scm $@

diff --git a/archiva-modules/pom.xml b/archiva-modules/pom.xml
index 0af6f5499ec93a6c8215ea6cb1eddc1768198450..d6ac479912a20354e543615cb5616d7417f1c6e5 100644 (file)
--- a/archiva-modules/pom.xml
+++ b/archiva-modules/pom.xml
@@ -32,7 +32,7 @@
   <properties>
     <siteFilePath>${user.home}/archiva-sites/archiva-ref-${project.version}/</siteFilePath>
     <siteUrlDeployment>file://${siteFilePath}</siteUrlDeployment>
-    <scmPubCheckoutDirectory>${user.home}/archiva-sites/archiva-ref-${project.version}-content</scmPubCheckoutDirectory>
+    <scmPubCheckoutDirectory>${basedir}/.site-content</scmPubCheckoutDirectory>
   </properties>
 
   <modules>
@@ -53,7 +53,7 @@
           <configuration>
             <pubScmUrl>scm:svn:https://svn.apache.org/repos/asf/archiva/site-content/ref/${project.version}</pubScmUrl>
             <checkinComment>Apache Archiva Versionned ref for ${project.version}</checkinComment>
-            <content>${siteFilePath}</content>
+            <content>${project.build.directory}/staging</content>
           </configuration>
         </plugin>
       </plugins>
@@ -83,13 +83,6 @@
           <includeTestSourceDirectory>true</includeTestSourceDirectory>
           <configLocation>config/maven_checks.xml</configLocation>
         </configuration>
-        <reportSets>
-          <reportSet>
-            <reports>
-              <report>checkstyle-aggregate</report>
-            </reports>
-          </reportSet>
-        </reportSets>
       </plugin>
       <plugin>
         <!-- No need for the standard project reports -->
@@ -168,6 +161,30 @@
     </plugins>
   </reporting>
 
+  <profiles>
+    <profile>
+      <id>reporting</id>
+      <reporting>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <version>${checkstyleVersion}</version>
+            <inherited>false</inherited>
+            <reportSets>
+              <reportSet>
+                <reports>
+                  <report>checkstyle-aggregate</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+  </profiles>
+
+
 
   <distributionManagement>
     <site>