svn commit: r1479005 - in /archiva/trunk/archiva-modules: deploySite.sh pom.xml

[ol...@apache.org]

Author: olamy
Date: Fri May  3 23:30:53 2013
New Revision: 1479005

URL: http://svn.apache.org/r1479005
Log:
simplify site deployment

Modified:
    archiva/trunk/archiva-modules/deploySite.sh
    archiva/trunk/archiva-modules/pom.xml

Modified: archiva/trunk/archiva-modules/deploySite.sh
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/deploySite.sh?rev=1479005&r1=1479004&r2=1479005&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/deploySite.sh (original)
+++ archiva/trunk/archiva-modules/deploySite.sh Fri May  3 23:30:53 2013
@@ -1 +1 @@
-mvn clean site-deploy scm-publish:publish-scm $@
+mvn clean site site:stage -Preporting scm-publish:publish-scm $@

Modified: archiva/trunk/archiva-modules/pom.xml
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/pom.xml?rev=1479005&r1=1479004&r2=1479005&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/pom.xml (original)
+++ archiva/trunk/archiva-modules/pom.xml Fri May  3 23:30:53 2013
@@ -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>